From 09e6a0056a45729b3e98117a6c4c41a875dcc39c Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Thu, 8 Feb 2024 10:44:36 +0100 Subject: [PATCH 1/3] Fix operating system on Chrysalis --- mache/spack/chrysalis_gnu_openmpi.yaml | 2 +- mache/spack/chrysalis_intel_impi.yaml | 2 +- mache/spack/chrysalis_intel_openmpi.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mache/spack/chrysalis_gnu_openmpi.yaml b/mache/spack/chrysalis_gnu_openmpi.yaml index 4c249c46..7f6e9403 100644 --- a/mache/spack/chrysalis_gnu_openmpi.yaml +++ b/mache/spack/chrysalis_gnu_openmpi.yaml @@ -136,7 +136,7 @@ spack: f77: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/gcc-9.2.0-ugetvbp/bin/gfortran fc: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/gcc-9.2.0-ugetvbp/bin/gfortran flags: {} - operating_system: centos8 + operating_system: rhel8 target: x86_64 modules: [] environment: {} diff --git a/mache/spack/chrysalis_intel_impi.yaml b/mache/spack/chrysalis_intel_impi.yaml index c24d2953..b075f4d5 100644 --- a/mache/spack/chrysalis_intel_impi.yaml +++ b/mache/spack/chrysalis_intel_impi.yaml @@ -136,7 +136,7 @@ spack: f77: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/intel-20.0.4-kodw73g/compilers_and_libraries_2020.4.304/linux/bin/intel64/ifort fc: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/intel-20.0.4-kodw73g/compilers_and_libraries_2020.4.304/linux/bin/intel64/ifort flags: {} - operating_system: centos8 + operating_system: rhel8 target: x86_64 modules: [] environment: {} diff --git a/mache/spack/chrysalis_intel_openmpi.yaml b/mache/spack/chrysalis_intel_openmpi.yaml index 9dd01c1c..012f9284 100644 --- a/mache/spack/chrysalis_intel_openmpi.yaml +++ b/mache/spack/chrysalis_intel_openmpi.yaml @@ -136,7 +136,7 @@ spack: f77: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/intel-20.0.4-kodw73g/compilers_and_libraries_2020.4.304/linux/bin/intel64/ifort fc: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/intel-20.0.4-kodw73g/compilers_and_libraries_2020.4.304/linux/bin/intel64/ifort flags: {} - operating_system: centos8 + operating_system: rhel8 target: x86_64 modules: [] environment: {} From c16fbff56eef95e07b253d90408d6c29b8637aa9 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Thu, 8 Feb 2024 11:02:20 +0100 Subject: [PATCH 2/3] Add system gmake on Chrysalis --- mache/spack/chrysalis_gnu_openmpi.yaml | 5 +++++ mache/spack/chrysalis_intel_impi.yaml | 5 +++++ mache/spack/chrysalis_intel_openmpi.yaml | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/mache/spack/chrysalis_gnu_openmpi.yaml b/mache/spack/chrysalis_gnu_openmpi.yaml index 7f6e9403..2a8d45c2 100644 --- a/mache/spack/chrysalis_gnu_openmpi.yaml +++ b/mache/spack/chrysalis_gnu_openmpi.yaml @@ -42,6 +42,11 @@ spack: - spec: diffutils@3.7 prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.2.0/diffutils-3.7-nnauuo4 buildable: false + gmake: + externals: + - spec: gmake@4.2.1 + prefix: /usr + buildable: false libiconv: externals: - spec: libiconv@1.16 diff --git a/mache/spack/chrysalis_intel_impi.yaml b/mache/spack/chrysalis_intel_impi.yaml index b075f4d5..5d2b7357 100644 --- a/mache/spack/chrysalis_intel_impi.yaml +++ b/mache/spack/chrysalis_intel_impi.yaml @@ -42,6 +42,11 @@ spack: - spec: diffutils@3.7 prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/diffutils-3.7-bml5fc4 buildable: false + gmake: + externals: + - spec: gmake@4.2.1 + prefix: /usr + buildable: false libiconv: externals: - spec: libiconv@1.16 diff --git a/mache/spack/chrysalis_intel_openmpi.yaml b/mache/spack/chrysalis_intel_openmpi.yaml index 012f9284..225a2d09 100644 --- a/mache/spack/chrysalis_intel_openmpi.yaml +++ b/mache/spack/chrysalis_intel_openmpi.yaml @@ -42,6 +42,11 @@ spack: - spec: diffutils@3.7 prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/diffutils-3.7-bml5fc4 buildable: false + gmake: + externals: + - spec: gmake@4.2.1 + prefix: /usr + buildable: false libiconv: externals: - spec: libiconv@1.16 From c1e32ed505ea28dd6248261777418686c8773694 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Thu, 8 Feb 2024 11:08:02 +0100 Subject: [PATCH 3/3] Add system findutils on Chrysalis --- mache/spack/chrysalis_gnu_openmpi.yaml | 5 +++++ mache/spack/chrysalis_intel_impi.yaml | 5 +++++ mache/spack/chrysalis_intel_openmpi.yaml | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/mache/spack/chrysalis_gnu_openmpi.yaml b/mache/spack/chrysalis_gnu_openmpi.yaml index 2a8d45c2..c9561ec6 100644 --- a/mache/spack/chrysalis_gnu_openmpi.yaml +++ b/mache/spack/chrysalis_gnu_openmpi.yaml @@ -42,6 +42,11 @@ spack: - spec: diffutils@3.7 prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.2.0/diffutils-3.7-nnauuo4 buildable: false + findutils: + externals: + - spec: findutils@4.6.0 + prefix: /usr + buildable: false gmake: externals: - spec: gmake@4.2.1 diff --git a/mache/spack/chrysalis_intel_impi.yaml b/mache/spack/chrysalis_intel_impi.yaml index 5d2b7357..d154426d 100644 --- a/mache/spack/chrysalis_intel_impi.yaml +++ b/mache/spack/chrysalis_intel_impi.yaml @@ -42,6 +42,11 @@ spack: - spec: diffutils@3.7 prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/diffutils-3.7-bml5fc4 buildable: false + findutils: + externals: + - spec: findutils@4.6.0 + prefix: /usr + buildable: false gmake: externals: - spec: gmake@4.2.1 diff --git a/mache/spack/chrysalis_intel_openmpi.yaml b/mache/spack/chrysalis_intel_openmpi.yaml index 225a2d09..3fd830a8 100644 --- a/mache/spack/chrysalis_intel_openmpi.yaml +++ b/mache/spack/chrysalis_intel_openmpi.yaml @@ -42,6 +42,11 @@ spack: - spec: diffutils@3.7 prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/diffutils-3.7-bml5fc4 buildable: false + findutils: + externals: + - spec: findutils@4.6.0 + prefix: /usr + buildable: false gmake: externals: - spec: gmake@4.2.1