hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mvapich2@2.3.7-1: add torque patch (#39027)

Browse source
This commit is contained in:
eugeneswalker 2023-07-24 12:56:32 -07:00 committed by GitHub
parent 3ad65bbfc1
commit fde1954c13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
var/spack/repos/builtin/packages/mvapich2/fix-torque.patch Normal file
View file

@ -0,0 +1,27 @@
diff -ruN spack-src/src/pm/hydra/configure.ac spack-src-patched/src/pm/hydra/configure.ac
--- spack-src/src/pm/hydra/configure.ac 2022-05-16 16:58:22.000000000 +0000
+++ spack-src-patched/src/pm/hydra/configure.ac 2023-07-20 15:23:21.802299913 +0000
@@ -306,15 +306,16 @@
available_launchers="$available_launchers pbs"
PAC_APPEND_FLAG([-ltorque],[WRAPPER_LIBS])
fi
- PAC_SET_HEADER_LIB_PATH(pbs)
PAC_PUSH_FLAG(LIBS)
- PAC_CHECK_HEADER_LIB(tm.h, pbs, tm_init, have_pbs_launcher=yes,
+ if test "have_pbs_launcher" = "no" ; then
+ PAC_CHECK_HEADER_LIB(tm.h, pbs, tm_init, have_pbs_launcher=yes,
have_pbs_launcher=no)
- PAC_POP_FLAG(LIBS)
- if test "$have_pbs_launcher" = "yes" ; then
- available_launchers="$available_launchers pbs"
- PAC_APPEND_FLAG([-lpbs],[WRAPPER_LIBS])
- AC_DEFINE(HAVE_PBS_PRO, 1, [Define if PBS Pro support is enabled])
+ PAC_POP_FLAG(LIBS)
+ if test "$have_pbs_launcher" = "yes" ; then
+ available_launchers="$available_launchers pbs"
+ PAC_APPEND_FLAG([-lpbs],[WRAPPER_LIBS])
+ AC_DEFINE(HAVE_PBS_PRO, 1, [Define if PBS Pro support is enabled])
+ fi
fi
available_rmks="$available_rmks pbs"
;;

3
var/spack/repos/builtin/packages/mvapich2/package.py
View file

@ -117,6 +117,7 @@ class Mvapich2(AutotoolsPackage):
values=auto_or_any_combination_of("lustre", "gpfs", "nfs", "ufs"), values=auto_or_any_combination_of("lustre", "gpfs", "nfs", "ufs"),
) )
depends_on("automake@1.15", type="build") # needed for torque patch
depends_on("findutils", type="build") depends_on("findutils", type="build")
depends_on("bison", type="build") depends_on("bison", type="build")
depends_on("pkgconfig", type="build") depends_on("pkgconfig", type="build")
@ -139,6 +140,8 @@ class Mvapich2(AutotoolsPackage):
conflicts("fabrics=psm2", when="@:2.1") # psm2 support was added at version 2.2 conflicts("fabrics=psm2", when="@:2.1") # psm2 support was added at version 2.2
patch("fix-torque.patch", when="@2.3.7-1")
filter_compiler_wrappers("mpicc", "mpicxx", "mpif77", "mpif90", "mpifort", relative_root="bin") filter_compiler_wrappers("mpicc", "mpicxx", "mpif77", "mpif90", "mpifort", relative_root="bin")
@classmethod @classmethod