Merge pull request pmodels#7357 from hzhou/2503_fix_vcis

ch4: remove netmod api init_vcis

Approved-by: Ken Raffenetti

Author: hzhou

src/mpid/ch4/ch4_api.txt

@@ -40,8 +40,6 @@ Non Native API:
   mpi_finalize_hook : int
       NM : void
      SHM : void
-  init_vcis: int
-      NM : num_vcis, num_vcis_actual
   post_init : int
       NM : void
      SHM : void

src/mpid/ch4/netmod/ofi/ofi_vci.c

@@ -33,6 +33,7 @@ int MPIDI_OFI_vci_init(void)
 }
 
 /* Address exchange within comm and setup multiple vcis */
+static int init_vcis(int num_vcis, int *num_vcis_actual);
 static int addr_exchange_all_ctx(MPIR_Comm * comm, int *all_num_vcis);
 
 int MPIDI_OFI_comm_set_vcis(MPIR_Comm * comm, int num_vcis, int *all_num_vcis)
@@ -41,7 +42,7 @@ int MPIDI_OFI_comm_set_vcis(MPIR_Comm * comm, int num_vcis, int *all_num_vcis)
 
     /* set up local vcis */
     int num_vcis_actual;
-    mpi_errno = MPIDI_OFI_init_vcis(num_vcis, &num_vcis_actual);
+    mpi_errno = init_vcis(num_vcis, &num_vcis_actual);
     MPIR_ERR_CHECK(mpi_errno);
 
     /* gather the number of remote vcis */
@@ -71,12 +72,12 @@ int MPIDI_OFI_comm_set_vcis(MPIR_Comm * comm, int num_vcis, int *all_num_vcis)
     goto fn_exit;
 }
 
-/* MPIDI_OFI_init_vcis: locally create multiple vcis */
+/* init_vcis: locally create multiple vcis */
 
 static int check_num_nics(void);
 static int setup_additional_vcis(void);
 
-int MPIDI_OFI_init_vcis(int num_vcis, int *num_vcis_actual)
+static int init_vcis(int num_vcis, int *num_vcis_actual)
 {
     int mpi_errno = MPI_SUCCESS;
 

src/mpid/ch4/netmod/ucx/ucx_init.c

@@ -286,13 +286,6 @@ int MPIDI_UCX_init_world(void)
     goto fn_exit;
 }
 
-int MPIDI_UCX_init_vcis(int num_vcis, int *num_vcis_actual)
-{
-    int mpi_errno = MPI_SUCCESS;
-    *num_vcis_actual = num_vcis;
-    return mpi_errno;
-}
-
 /* static functions for MPIDI_UCX_post_init */
 static void flush_cb(void *request, ucs_status_t status)
 {