Merge pull request #2429 from rhc54/topic/nvd

Always build pgpu/pnet components if PMIx supports them

Author: rhc54

config/Makefile.am

@@ -27,7 +27,6 @@
 #
 
 EXTRA_DIST = \
-	pmix_get_version.sh \
 	distscript.sh \
 	getdate.sh \
     pmix_check_alps.m4 \
@@ -40,7 +39,6 @@ EXTRA_DIST = \
 	pmix_check_ident.m4 \
     pmix_check_jansson.m4 \
     pmix_check_lustre.m4 \
-    pmix_check_ofi.m4 \
     pmix_check_os_flavors.m4 \
 	pmix_check_package.m4 \
     pmix_check_pthread_pids.m4 \
@@ -68,6 +66,7 @@ EXTRA_DIST = \
 	pmix_setup_libev.m4 \
 	pmix_setup_libevent.m4 \
 	pmix_setup_wrappers.m4 \
+    pmix_summary.m4 \
 	pmix_try_assemble.m4 \
 	pmix.m4 \
 	mca_library_paths.txt \

config/pmix.m4

@@ -825,20 +825,6 @@ AC_DEFUN([PMIX_SETUP_CORE],[
 
     PMIX_CHECK_CURL
 
-    ##################################
-    # OFI (for Transports)
-    ##################################
-    pmix_show_title "OFI"
-
-    PMIX_CHECK_OFI
-
-    ##################################
-    # CUDA (for GPUs)
-    ##################################
-    pmix_show_title "CUDA"
-
-    PMIX_CHECK_CUDA
-
     ##################################
     # MCA
     ##################################

config/pmix_check_cuda.m4

@@ -17,15 +17,15 @@
 
 # MCA_pmix_pgpu_amd_CONFIG(prefix, [action-if-found], [action-if-not-found])
 # --------------------------------------------------------
-# check if CUDA support can be found.  runs action-if-found if there is
-# support, otherwise executes action-if-not-found
 AC_DEFUN([MCA_pmix_pgpu_amd_CONFIG],[
     AC_CONFIG_FILES([src/mca/pgpu/amd/Makefile])
 
-    AS_IF([test "$pmix_cuda_happy" = "yes"],
-          [$1],
-          [$2])
+    AS_IF([test "yes" = "no"],
+          [$1
+           pmix_pgpu_amd_happy=yes],
+          [$2
+           pmix_pgpu_amd_happy=no])
 
-    PMIX_SUMMARY_ADD([[GPUs]],[[AMD]],[pgpu_amd],[$pmix_cuda_happy])])])
+    PMIX_SUMMARY_ADD([[GPUs]],[[AMD]],[pgpu_amd],[$pmix_pgpu_amd_happy])])])
 ])
 

config/pmix_check_ofi.m4

@@ -24,10 +24,12 @@ AC_DEFUN([MCA_pmix_pgpu_intel_CONFIG],[
 
 # eventually need to check for L0 library
 
-    AS_IF([test "yes" = "yes"],
-          [$1],
-          [$2])
+    AS_IF([test "yes" = "no"],
+          [$1
+          pmix_pgpu_intel_happy=yes],
+          [$2
+           pmix_pgpu_intel_happy=no])
 
-    PMIX_SUMMARY_ADD([[GPUs]],[[Intel]],[pgpu_intel],[yes])
+    PMIX_SUMMARY_ADD([[GPUs]],[[Intel]],[pgpu_intel],[$pmix_pgpu_intel_happy])
 ])