ch4/ofi: gather vci init in MPIDI_OFI_vci_init

Author: hzhou

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

@@ -707,15 +707,16 @@ int MPIDI_OFI_init_local(int *tag_bits)
     mpi_errno = ofi_pvar_init();
     MPIR_ERR_CHECK(mpi_errno);
 
+    mpi_errno = MPIDI_OFI_vci_init();
+    MPIR_ERR_CHECK(mpi_errno);
+
     /* -------------------------------- */
     /* Set up the libfabric provider(s) */
     /* -------------------------------- */
 
     /* WB TODO - I assume that after this function is done, there will be an array of providers in
      * MPIDI_OFI_global.prov_use that will map to the VNI contexts below. We can also use it to
      * generate the addresses in the business card exchange. */
-    MPIDI_OFI_global.num_nics = 1;
-
     struct fi_info *prov = NULL;
     mpi_errno = MPIDI_OFI_find_provider(&prov);
     MPIR_ERR_CHECK(mpi_errno);

src/mpid/ch4/netmod/ofi/ofi_init.h

@@ -11,6 +11,7 @@ int MPIDI_OFI_get_required_version(void);
 int MPIDI_OFI_find_provider(struct fi_info **prov_out);
 void MPIDI_OFI_find_provider_cleanup(void);
 int MPIDI_OFI_init_multi_nic(struct fi_info *prov);
+int MPIDI_OFI_vci_init(void);
 
 /* set hints based on MPIDI_OFI_global.settings */
 int MPIDI_OFI_init_hints(struct fi_info *hints);

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

@@ -7,6 +7,13 @@
 #include "ofi_impl.h"
 #include "ofi_init.h"
 
+int MPIDI_OFI_vci_init(void)
+{
+    MPIDI_OFI_global.num_nics = 1;
+    MPIDI_OFI_global.num_vcis = 1;
+    return MPI_SUCCESS;
+}
+
 /* Address exchange within comm and setup multiple vcis */
 static int addr_exchange_all_ctx(MPIR_Comm * comm);