mpiext/affinity: #if OPAL_HAVE_HWLOC most parts of the code

that allow this extension to compile if configure'd with --without-hwloc

Author: ggouaillardet

ompi/mpiext/affinity/c/mpiext_affinity_str.c

@@ -38,12 +38,14 @@ static const char FUNC_NAME[] = "OMPI_Affinity";
 static const char ompi_nobind_str[] = "Open MPI did not bind this process";
 static const char not_bound_str[] = "Not bound (i.e., bound to all processors)";
 
+#if OPAL_HAVE_HWLOC
 static int get_rsrc_ompi_bound(char str[OMPI_AFFINITY_STRING_MAX]);
 static int get_rsrc_current_binding(char str[OMPI_AFFINITY_STRING_MAX]);
 static int get_rsrc_exists(char str[OMPI_AFFINITY_STRING_MAX]);
 static int get_layout_ompi_bound(char str[OMPI_AFFINITY_STRING_MAX]);
 static int get_layout_current_binding(char str[OMPI_AFFINITY_STRING_MAX]);
 static int get_layout_exists(char str[OMPI_AFFINITY_STRING_MAX]);
+#endif /* OPAL_HAVE_HWLOC */
 
 /*---------------------------------------------------------------------------*/
 
@@ -52,19 +54,25 @@ int OMPI_Affinity_str(ompi_affinity_fmt_t fmt_type,
                       char current_binding[OMPI_AFFINITY_STRING_MAX],
                       char exists[OMPI_AFFINITY_STRING_MAX])
 {
+#if OPAL_HAVE_HWLOC
     int ret;
+#endif /* OPAL_HAVE_HWLOC */
 
     memset(ompi_bound, 0, OMPI_AFFINITY_STRING_MAX);
     memset(current_binding, 0, OMPI_AFFINITY_STRING_MAX);
 
     /* If we have no hwloc support, return nothing */
-    if (NULL == opal_hwloc_topology) {
+#if OPAL_HAVE_HWLOC
+    if (NULL == opal_hwloc_topology)
+#endif /* OPAL_HAVE_HWLOC */
+   {
         strncpy(ompi_bound, "Not supported", OMPI_AFFINITY_STRING_MAX);
         strncpy(current_binding, "Not supported", OMPI_AFFINITY_STRING_MAX);
         strncpy(exists, "Not supported", OMPI_AFFINITY_STRING_MAX);
         return MPI_SUCCESS;
     }
 
+#if OPAL_HAVE_HWLOC
     /* Otherwise, return useful information */
     switch (fmt_type) {
     case OMPI_AFFINITY_RSRC_STRING_FMT:
@@ -86,8 +94,10 @@ int OMPI_Affinity_str(ompi_affinity_fmt_t fmt_type,
     }
 
     return MPI_SUCCESS;
+#endif /* OPAL_HAVE_HWLOC */
 }
 
+#if OPAL_HAVE_HWLOC
 /*---------------------------------------------------------------------------*/
 
 /*
@@ -275,7 +285,7 @@ static int get_rsrc_exists(char str[OMPI_AFFINITY_STRING_MAX])
                 }
             }
         }
-    }
+    } 
 
     return OMPI_SUCCESS;
 }
@@ -418,3 +428,4 @@ static int get_layout_exists(char str[OMPI_AFFINITY_STRING_MAX])
 
     return OMPI_SUCCESS;
 }
+#endif /* OPAL_HAVE_HWLOC */