Fixing iboffload compilation issues on some MLNX platforms (on behalf of Joshua Ladd). Refs trac:3243

This commit was SVN r27120.

The following Trac tickets were found above:
  Ticket 3243 --> https://svn.open-mpi.org/trac/ompi/ticket/3243

ompi/mca/bcol/iboffload/bcol_iboffload_component.c

@@ -298,7 +298,8 @@ static int iboffload_release_devices(void)
     OBJ_DESTRUCT(devs);
 
     /* release device list */
-    ibv_free_device_list_compat(cm->ib_devs);
+    /*ibv_free_device_list_compat(cm->ib_devs);*/
+    ompi_ibv_free_device_list(cm->ib_devs);
     cm->ib_devs = NULL;
 
     IBOFFLOAD_VERBOSE(10, ("All devices destroyed.\n"));
@@ -316,7 +317,8 @@ static int iboffload_load_devices(void)
     IBOFFLOAD_VERBOSE(10, ("Entering to iboffload_load_devices"));
 
     /* Get list of devices */
-    cm->ib_devs = ibv_get_device_list_compat(&num_devs);
+    /*cm->ib_devs = ibv_get_device_list_compat(&num_devs);*/
+    cm->ib_devs = ompi_ibv_get_device_list(&num_devs);
     if (0 == num_devs || NULL == cm->ib_devs) {
         IBOFFLOAD_ERROR(("No IB devices found"));
         /* No hca error*/

ompi/mca/bcol/iboffload/bcol_iboffload_frag.c

@@ -45,7 +45,7 @@ OBJ_CLASS_INSTANCE(
         frag_constructor,
         NULL);
 
-
+#if 0
 static mca_bcol_iboffload_frag_t*
     mca_bcol_iboffload_get_ml_frag_calc(mca_bcol_iboffload_module_t *iboffload,
                                     mca_bcol_iboffload_collreq_t *coll_request,
@@ -82,6 +82,8 @@ static mca_bcol_iboffload_frag_t*
 
     return fragment;
 }
+#endif
+
 
 static mca_bcol_iboffload_frag_t *
 mca_bcol_iboffload_get_packed_frag(mca_bcol_iboffload_module_t *iboffload,
@@ -125,6 +127,7 @@ mca_bcol_iboffload_get_packed_frag(mca_bcol_iboffload_module_t *iboffload,
     return frag;
 }
 
+#if 0
 static mca_bcol_iboffload_frag_t *
 mca_bcol_iboffload_get_calc_frag(mca_bcol_iboffload_module_t *iboffload, int qp_index,
                                  struct mca_bcol_iboffload_collreq_t *coll_request)
@@ -163,6 +166,7 @@ mca_bcol_iboffload_get_calc_frag(mca_bcol_iboffload_module_t *iboffload, int qp_
 
     return frag;
 }
+#endif
 
 mca_bcol_iboffload_frag_t*
 mca_bcol_iboffload_get_send_frag(mca_bcol_iboffload_collreq_t *coll_request,
@@ -213,24 +217,24 @@ mca_bcol_iboffload_get_send_frag(mca_bcol_iboffload_collreq_t *coll_request,
             IBOFFLOAD_VERBOSE(10, ("Getting MCA_BCOL_IBOFFLOAD_SEND_FRAG_CONVERT"));
             frag = mca_bcol_iboffload_get_packed_frag(iboffload, destination,
                          qp_index, len, &coll_request->send_convertor);
-
+#if 0
         break;
         case MCA_BCOL_IBOFFLOAD_SEND_FRAG_CALC:
             IBOFFLOAD_VERBOSE(10, ("Getting MCA_BCOL_IBOFFLOAD_SEND_FRAG_CALC"));
             frag = mca_bcol_iboffload_get_calc_frag(iboffload, qp_index, coll_request);
-
+#endif
         break;
         case MCA_BCOL_IBOFFLOAD_SEND_FRAG_ML:
             IBOFFLOAD_VERBOSE(10, ("Getting MCA_BCOL_IBOFFLOAD_SEND_FRAG_ML"));
             frag = mca_bcol_iboffload_get_ml_frag(
                   iboffload, qp_index, len, coll_request->buffer_info[buf_index].lkey,
                   (uint64_t)(uintptr_t) coll_request->buffer_info[buf_index].buf + src_offset);
-
+#if 0
         break;
         case MCA_BCOL_IBOFFLOAD_SEND_FRAG_ML_CALC:
             frag = mca_bcol_iboffload_get_ml_frag_calc(iboffload, coll_request, len, src_offset);
             IBOFFLOAD_VERBOSE(10, ("Getting MCA_BCOL_IBOFFLOAD_SEND_FRAG_ML_CALC"));
-
+#endif
         break;
         default:
             IBOFFLOAD_VERBOSE(10, ("Getting default"));

ompi/mca/bcol/iboffload/bcol_iboffload_module.c

@@ -32,7 +32,7 @@
 #include "ompi/mca/bcol/base/base.h"
 #include "ompi/mca/mpool/base/base.h"
 #include "ompi/communicator/communicator.h"
-#include "ompi/mca/mpool/rdma/mpool_rdma.h"
+#include "ompi/mca/mpool/grdma/mpool_grdma.h"
 #include "ompi/mca/coll/ml/coll_ml_allocation.h"
 #include "ompi/mca/common/netpatterns/common_netpatterns.h"
 
@@ -728,10 +728,10 @@ static void load_func(mca_bcol_base_module_t *super)
 
     super->bcol_function_init_table[BCOL_BARRIER] = mca_bcol_iboffload_barrier_register;
     super->bcol_function_init_table[BCOL_BCAST] = mca_bcol_iboffload_bcast_register;
-    super->bcol_function_init_table[BCOL_ALLTOALL] = mca_bcol_iboffload_alltoall_register;
-    super->bcol_function_init_table[BCOL_ALLGATHER] = mca_bcol_iboffload_allgather_register;
+    /*super->bcol_function_init_table[BCOL_ALLTOALL] = mca_bcol_iboffload_alltoall_register;*/
+    /*super->bcol_function_init_table[BCOL_ALLGATHER] = mca_bcol_iboffload_allgather_register;*/
     super->bcol_function_init_table[BCOL_SYNC] = mca_bcol_iboffload_memsync_register;
-    super->bcol_function_init_table[BCOL_ALLREDUCE] = mca_bcol_iboffload_allreduce_register;
+    /*super->bcol_function_init_table[BCOL_ALLREDUCE] = mca_bcol_iboffload_allreduce_register;*/
 
     super->bcol_memory_init = mca_bcol_iboffload_init_buffer_memory;
 

ompi/mca/sbgp/ibnet/sbgp_ibnet_component.c

@@ -524,7 +524,7 @@ static int ibnet_load_devices(void)
     IBNET_VERBOSE(7, ("Entering to ibnet_load_devices"));
 
     /* Get list of devices */
-    ib_devs = ibv_get_device_list_compat(&num_devs);
+    ib_devs = ompi_ibv_get_device_list(&num_devs);
 
     if(0 == num_devs || NULL == ib_devs) {
         IBNET_VERBOSE(10, ("No ib devices found"));
@@ -550,7 +550,7 @@ static int ibnet_load_devices(void)
         /* Maybe need to add error here*/
     }
 
-    ibv_free_device_list_compat(ib_devs);
+    ompi_ibv_free_device_list(ib_devs);
 
     return OMPI_SUCCESS;
 }