Merge pull request open-mpi#12768 from wenduwan/fix_han_large_count

coll/han: post large-count code cleanup and bugfix

ompi/mca/coll/han/Makefile.am

@@ -35,8 +35,7 @@ coll_han_algorithms.c \
 coll_han_dynamic.c \
 coll_han_dynamic_file.c \
 coll_han_topo.c \
-coll_han_subcomms.c \
-coll_han_utils.c
+coll_han_subcomms.c
 
 # Make the output library in this directory, and name it either
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la

ompi/mca/coll/han/coll_han.h

@@ -561,13 +561,6 @@ ompi_coll_han_reorder_gather(const void *sbuf,
                              struct ompi_communicator_t *comm,
                              int * topo);
 
-size_t
-coll_han_utils_gcd(const uint64_t *numerators, const size_t size);
-
-int
-coll_han_utils_create_contiguous_datatype(size_t count, const ompi_datatype_t *oldType,
-                                          ompi_datatype_t **newType);
-
 static inline struct mca_smsc_endpoint_t *mca_coll_han_get_smsc_endpoint (struct ompi_proc_t *proc) {
     extern opal_mutex_t mca_coll_han_lock;
     if (NULL == proc->proc_endpoints[OMPI_PROC_ENDPOINT_TAG_SMSC]) {

ompi/mca/coll/han/coll_han_gatherv.c

@@ -129,7 +129,7 @@ int mca_coll_han_gatherv_intra(const void *sbuf, size_t scount, struct ompi_data
         int need_bounce_buf = 0;
         size_t total_up_rcounts = 0;
         ptrdiff_t *up_displs = NULL;
-        size_t *up_rcounts = NULL, *up_peer_lb = NULL, *up_peer_ub = NULL;
+        size_t *up_rcounts = NULL, *up_peer_ub = NULL;
         ompi_count_array_t up_rcounts_desc;
         ompi_disp_array_t up_displs_desc;
         char *bounce_buf = NULL;
@@ -170,7 +170,7 @@ int mca_coll_han_gatherv_intra(const void *sbuf, size_t scount, struct ompi_data
         }
 
         for (up_peer = 0; up_peer < up_size; ++up_peer) {
-            up_displs[up_peer] = INT_MAX;
+            up_displs[up_peer] = PTRDIFF_MAX;
         }
 
         /* Calculate recv counts for the inter-node gatherv - no need to gather
@@ -273,9 +273,6 @@ int mca_coll_han_gatherv_intra(const void *sbuf, size_t scount, struct ompi_data
         if (up_rcounts) {
             free(up_rcounts);
         }
-        if (up_peer_lb) {
-            free(up_peer_lb);
-        }
         if (up_peer_ub) {
             free(up_peer_ub);
         }

ompi/mca/coll/han/coll_han_scatterv.c

@@ -143,7 +143,7 @@ int mca_coll_han_scatterv_intra(const void *sbuf, ompi_count_array_t scounts, om
         int need_bounce_buf = 0;
         size_t total_up_scounts = 0;
         ptrdiff_t *up_displs = NULL;
-        size_t *up_scounts = NULL, *up_peer_lb = NULL, *up_peer_ub = NULL;
+        size_t *up_scounts = NULL, *up_peer_ub = NULL;
         ompi_count_array_t up_scounts_desc;
         ompi_disp_array_t up_displs_desc;
         char *reorder_sbuf = (char *) sbuf, *bounce_buf = NULL;
@@ -174,7 +174,7 @@ int mca_coll_han_scatterv_intra(const void *sbuf, ompi_count_array_t scounts, om
         }
 
         for (up_peer = 0; up_peer < up_size; ++up_peer) {
-            up_displs[up_peer] = SIZE_MAX;
+            up_displs[up_peer] = PTRDIFF_MAX;
         }
 
         /* Calculate send counts for the inter-node scatterv */
@@ -290,9 +290,6 @@ int mca_coll_han_scatterv_intra(const void *sbuf, ompi_count_array_t scounts, om
         if (up_scounts) {
             free(up_scounts);
         }
-        if (up_peer_lb) {
-            free(up_peer_lb);
-        }
         if (up_peer_ub) {
             free(up_peer_ub);
         }