From dbbe646cac9bce1a41240a951541f5630d754def4241d5a58cbb9add9785fd80 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 24 Mar 2023 08:15:37 +0000 Subject: [PATCH] Accepting request 1074094 from home:eeich:branches:network:cluster - run-find-external.sh: Extend the range of versions of mpich and mvapich2 to be searched for when asking Spack to look for external packages (bsc#1208751). OBS-URL: https://build.opensuse.org/request/show/1074094 OBS-URL: https://build.opensuse.org/package/show/network:cluster/spack?expand=0&rev=65 --- run-find-external.sh.in | 4 ++-- spack.changes | 7 +++++++ spack.spec | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/run-find-external.sh.in b/run-find-external.sh.in index b767ce7..5983dd4 100644 --- a/run-find-external.sh.in +++ b/run-find-external.sh.in @@ -68,8 +68,8 @@ addpath mypath /usr/lib64/mpi/gcc/mpich/bin addpath mypath /usr/lib/hpc/gnu*/mpi/openmpi/4.*/bin addpath mypath /usr/lib/hpc/gnu*/mpi/openmpi/3.*/bin addpath mypath /usr/lib/hpc/gnu*/mpi/openmpi/2.*/bin -addpath mypath /usr/lib/hpc/gnu*/mpi/mpich/3.*/bin -addpath mypath /usr/lib/hpc/gnu*/mpi/mvapich2/2.*/bin +addpath mypath /usr/lib/hpc/gnu*/mpi/mpich/[0-9].*/bin +addpath mypath /usr/lib/hpc/gnu*/mpi/mvapich2/[0-9].*/bin addpath cpath /usr/lib/hpc/compiler/gnu/*/bin # test if we can run as nobody diff --git a/spack.changes b/spack.changes index 3032e6f..cdff6fb 100644 --- a/spack.changes +++ b/spack.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Mar 23 09:59:40 UTC 2023 - Egbert Eich + +- run-find-external.sh: Extend the range of versions of mpich + and mvapich2 to be searched for when asking Spack to look + for external packages (bsc#1208751). + ------------------------------------------------------------------- Wed Mar 8 19:54:55 UTC 2023 - Egbert Eich diff --git a/spack.spec b/spack.spec index ffc7a2e..2a49c67 100644 --- a/spack.spec +++ b/spack.spec @@ -36,7 +36,7 @@ ExclusiveArch: do_not_build %define spack_trigger_recommended_compilers gcc gcc-c++ gcc-fortran # packages recognized by spack, but not recommended -%define spack_trigger_packages ghostscript go fish fzf hugo java-11-openjdk-devel java-14-openjdk-devel java-15-openjdk-devel java-16-openjdk-devel java-1_8_0-openjdk-devel ruby openmpi1-devel openmpi2-devel openmpi3-devel openmpi4-devel openmpi1-gnu-hpc-devel openmpi2-gnu-hpc-devel openmpi3-gnu-hpc-devel openmpi4-gnu-hpc-devel mvapich2-devel mpich-devel +%define spack_trigger_packages ghostscript go fish fzf hugo java-11-openjdk-devel java-14-openjdk-devel java-15-openjdk-devel java-16-openjdk-devel java-1_8_0-openjdk-devel ruby openmpi1-devel openmpi2-devel openmpi3-devel openmpi4-devel openmpi1-gnu-hpc-devel openmpi2-gnu-hpc-devel openmpi3-gnu-hpc-devel openmpi4-gnu-hpc-devel mpich-gnu-hpc-devel mvapich2-devel mpich-devel %define spack_trigger_compilers gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc7-c++ gcc8-c++ gcc9-c++ gcc10-c++ gcc11-c++ gcc12-c++ gcc7-fortran gcc8-fortran gcc9-fortran gcc10-fortran gcc11-fortran gcc12-fortran