Merge pull request #25 from 23-Wzz/huawei

Delete Chenge's MR

Author: ChenQiangFYQ

ompi/mca/coll/ucx/coll_ucx.h

@@ -60,10 +60,8 @@ typedef struct mca_coll_ucx_component {
     bool                      enable_topo_map;
 
     /* UCX global objects */
-    ucp_context_h             ucp_context;
-    ucp_worker_h              ucp_worker;
     ucg_context_h             ucg_context;
-    ucg_group_h               ucg_group;
+    ucg_worker_h              ucg_worker;
     int                       output;
     ucs_list_link_t           group_head;
     char                      **topo_map;
@@ -94,16 +92,37 @@ typedef struct mca_coll_ucx_module {
 } mca_coll_ucx_module_t;
 OBJ_CLASS_DECLARATION(mca_coll_ucx_module_t);
 
+/*
+ * Component-oriented functions for using UCX collectives.
+ */
+int  mca_coll_ucx_open(void);
+int  mca_coll_ucx_close(void);
+int  mca_coll_ucx_init(void);
+void mca_coll_ucx_cleanup(void);
+int  mca_coll_ucx_enable(bool enable);
+int  mca_coll_ucx_progress(void);
+
 /*
  * TESTING PURPOSES: get the worker from the module.
  */
-ucp_worker_h mca_coll_ucx_get_component_worker(void);
+ucg_worker_h mca_coll_ucx_get_component_worker(void);
 
 /*
  * Start persistent collectives from an array of requests.
  */
 int mca_coll_ucx_start(size_t count, ompi_request_t** requests);
 
+/*
+ * Obtain the address for a remote node.
+ */
+ucs_status_t mca_coll_ucx_resolve_address(void *cb_group_obj, ucg_group_member_index_t idx, ucg_address_t **addr,
+                                          size_t *addr_len);
+
+/*
+ * Release an obtained address for a remote node.
+ */
+void mca_coll_ucx_release_address(ucg_address_t *addr);
+
 /*
  * The collective operations themselves.
  */