Skip to content

Commit 2c2a7ce

Browse files
committed
Always build pgpu/pnet components if PMIx supports them
Only disable the ones where support has not been implemented. Each component already checks to see if local hardware matching the vendor is present and disables itself at runtime if not, so we don't need to protect it at configure. Signed-off-by: Ralph Castain <rhc@pmix.org>
1 parent 1a566b9 commit 2c2a7ce

File tree

15 files changed

+39
-425
lines changed

15 files changed

+39
-425
lines changed

config/Makefile.am

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#
2828

2929
EXTRA_DIST = \
30-
pmix_get_version.sh \
3130
distscript.sh \
3231
getdate.sh \
3332
pmix_check_alps.m4 \
@@ -40,7 +39,6 @@ EXTRA_DIST = \
4039
pmix_check_ident.m4 \
4140
pmix_check_jansson.m4 \
4241
pmix_check_lustre.m4 \
43-
pmix_check_ofi.m4 \
4442
pmix_check_os_flavors.m4 \
4543
pmix_check_package.m4 \
4644
pmix_check_pthread_pids.m4 \
@@ -68,6 +66,7 @@ EXTRA_DIST = \
6866
pmix_setup_libev.m4 \
6967
pmix_setup_libevent.m4 \
7068
pmix_setup_wrappers.m4 \
69+
pmix_summary.m4 \
7170
pmix_try_assemble.m4 \
7271
pmix.m4 \
7372
mca_library_paths.txt \

config/pmix.m4

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -825,20 +825,6 @@ AC_DEFUN([PMIX_SETUP_CORE],[
825825

826826
PMIX_CHECK_CURL
827827

828-
##################################
829-
# OFI (for Transports)
830-
##################################
831-
pmix_show_title "OFI"
832-
833-
PMIX_CHECK_OFI
834-
835-
##################################
836-
# CUDA (for GPUs)
837-
##################################
838-
pmix_show_title "CUDA"
839-
840-
PMIX_CHECK_CUDA
841-
842828
##################################
843829
# MCA
844830
##################################

config/pmix_check_cuda.m4

Lines changed: 0 additions & 54 deletions
This file was deleted.

config/pmix_check_ofi.m4

Lines changed: 0 additions & 198 deletions
This file was deleted.

config/pmix_check_psm2.m4

Lines changed: 0 additions & 54 deletions
This file was deleted.

src/mca/pgpu/amd/configure.m4

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
# MCA_pmix_pgpu_amd_CONFIG(prefix, [action-if-found], [action-if-not-found])
1919
# --------------------------------------------------------
20-
# check if CUDA support can be found. runs action-if-found if there is
21-
# support, otherwise executes action-if-not-found
2220
AC_DEFUN([MCA_pmix_pgpu_amd_CONFIG],[
2321
AC_CONFIG_FILES([src/mca/pgpu/amd/Makefile])
2422

25-
AS_IF([test "$pmix_cuda_happy" = "yes"],
26-
[$1],
27-
[$2])
23+
AS_IF([test "yes" = "no"],
24+
[$1
25+
pmix_pgpu_amd_happy=yes],
26+
[$2
27+
pmix_pgpu_amd_happy=no])
2828

29-
PMIX_SUMMARY_ADD([[GPUs]],[[AMD]],[pgpu_amd],[$pmix_cuda_happy])])])
29+
PMIX_SUMMARY_ADD([[GPUs]],[[AMD]],[pgpu_amd],[$pmix_pgpu_amd_happy])])])
3030
])
3131

src/mca/pgpu/intel/configure.m4

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ AC_DEFUN([MCA_pmix_pgpu_intel_CONFIG],[
2424

2525
# eventually need to check for L0 library
2626

27-
AS_IF([test "yes" = "yes"],
28-
[$1],
29-
[$2])
27+
AS_IF([test "yes" = "no"],
28+
[$1
29+
pmix_pgpu_intel_happy=yes],
30+
[$2
31+
pmix_pgpu_intel_happy=no])
3032

31-
PMIX_SUMMARY_ADD([[GPUs]],[[Intel]],[pgpu_intel],[yes])
33+
PMIX_SUMMARY_ADD([[GPUs]],[[Intel]],[pgpu_intel],[$pmix_pgpu_intel_happy])
3234
])
3335

0 commit comments

Comments
 (0)