prov/util: Remove old util collective implementation

The header ofi_coll.h is kept under include for now. It could be moved under prov/coll once the reference in util_ep.c is removed. Signed-off-by: Jianxin Xiong <[email protected]>
pmem · Nov 29, 2022 · b2b43b0 · b2b43b0
1 parent 8143b68
commit b2b43b0
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 1,564 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -85,7 +85,6 @@ common_srcs =				\
 	prov/util/src/rocr_mem_monitor.c \
 	prov/util/src/ze_mem_monitor.c \
 	prov/util/src/cuda_ipc_monitor.c \
-	prov/util/src/util_coll.c	\
 	prov/coll/src/coll_attr.c	\
 	prov/coll/src/coll_av.c		\
 	prov/coll/src/coll_av_set.c	\

diff --git a/include/ofi_coll.h b/include/ofi_coll.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Intel Corporation, Inc.  All rights reserved.
+ * Copyright (c) 2019-2022 Intel Corporation, Inc.  All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -42,7 +42,6 @@
 
 #define OFI_WORLD_GROUP_ID 0
 #define OFI_MAX_GROUP_ID 256
-#define OFI_COLL_TAG_FLAG (1ULL << 63)
 
 enum util_coll_op_type {
 	UTIL_COLL_JOIN_OP,
@@ -163,39 +162,4 @@ struct util_coll_operation {
 	uint64_t			flags;
 };
 
-int ofi_query_collective(struct fid_domain *domain, enum fi_collective_op coll,
-			 struct fi_collective_attr *attr, uint64_t flags);
-
-int ofi_join_collective(struct fid_ep *ep, fi_addr_t coll_addr,
-			const struct fid_av_set *set, uint64_t flags,
-			struct fid_mc **mc, void *context);
-
-int ofi_av_set(struct fid_av *av, struct fi_av_set_attr *attr,
-	       struct fid_av_set **av_set_fid, void *context);
-
-ssize_t ofi_ep_barrier(struct fid_ep *ep, fi_addr_t coll_addr, void *context);
-
-ssize_t ofi_ep_allreduce(struct fid_ep *ep, const void *buf, size_t count, void *desc,
-			 void *result, void *result_desc, fi_addr_t coll_addr,
-			 enum fi_datatype datatype, enum fi_op op, uint64_t flags,
-			 void *context);
-
-ssize_t ofi_ep_allgather(struct fid_ep *ep, const void *buf, size_t count, void *desc,
-			 void *result, void *result_desc, fi_addr_t coll_addr,
-			 enum fi_datatype datatype, uint64_t flags, void *context);
-
-ssize_t ofi_ep_scatter(struct fid_ep *ep, const void *buf, size_t count, void *desc,
-		       void *result, void *result_desc, fi_addr_t coll_addr,
-		       fi_addr_t root_addr, enum fi_datatype datatype, uint64_t flags,
-		       void *context);
-
-ssize_t ofi_ep_broadcast(struct fid_ep *ep, void *buf, size_t count, void *desc,
-			 fi_addr_t coll_addr, fi_addr_t root_addr,
-			 enum fi_datatype datatype, uint64_t flags, void *context);
-
-ssize_t ofi_coll_ep_progress(struct fid_ep *ep);
-
-void ofi_coll_handle_xfer_comp(uint64_t tag, void *ctx);
-
-
 #endif // _OFI_COLL_H_
diff --git a/libfabric.vcxproj b/libfabric.vcxproj
@@ -759,7 +759,6 @@
     <ClCompile Include="prov\util\src\util_av.c" />
     <ClCompile Include="prov\util\src\util_buf.c" />
     <ClCompile Include="prov\util\src\util_cntr.c" />
-    <ClCompile Include="prov\util\src\util_coll.c" />
     <ClCompile Include="prov\util\src\util_cq.c" />
     <ClCompile Include="prov\util\src\util_domain.c" />
     <ClCompile Include="prov\util\src\util_ep.c" />

diff --git a/libfabric.vcxproj.filters b/libfabric.vcxproj.filters
@@ -498,9 +498,6 @@
     <ClCompile Include="prov\util\src\util_cntr.c">
       <Filter>Source Files\prov\util</Filter>
     </ClCompile>
-    <ClCompile Include="prov\util\src\util_coll.c">
-      <Filter>Source Files\prov\util</Filter>
-    </ClCompile>
     <ClCompile Include="prov\util\src\util_atomic.c">
       <Filter>Source Files\prov\util</Filter>
     </ClCompile>

diff --git a/prov/psm3/Makefile.am b/prov/psm3/Makefile.am
@@ -60,7 +60,6 @@ common_srcs = \
 	util/src/util_attr.c \
 	util/src/util_av.c \
 	util/src/util_buf.c \
-	util/src/util_coll.c \
 	util/src/util_cq.c \
 	util/src/util_cntr.c \
 	util/src/util_domain.c \