From d399619c95e1f3d523c6d0dcd9bcf292a0fbc5b4 Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Thu, 6 Jun 2024 22:23:55 +0000 Subject: [PATCH 1/7] Update spack submodule url to point to rickgrubin-noaa fork --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index a69f3e4f1..72af82e03 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "spack"] path = spack - url = https://github.com/jcsda/spack + url = https://github.com/rickgrubin-noaa/spack branch = spack-stack-dev [submodule "doc/CMakeModules"] path = doc/CMakeModules From 8b0ca460666a63d4ac8315260e1a785532a437b8 Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Fri, 7 Jun 2024 08:34:17 -0600 Subject: [PATCH 2/7] Update .gitmodules Remove spurious tab --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 72af82e03..241d94a69 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "spack"] path = spack - url = https://github.com/rickgrubin-noaa/spack + url = https://github.com/rickgrubin-noaa/spack branch = spack-stack-dev [submodule "doc/CMakeModules"] path = doc/CMakeModules From c8cabc6b252943419fc153a00e9de2ade3bf6e1b Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Wed, 7 Aug 2024 23:16:56 +0000 Subject: [PATCH 3/7] update spack --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index 642300875..5d06b616e 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 642300875b30056d530f63e9a620428fda00f301 +Subproject commit 5d06b616e417d26f1ae638cbe7885094a15f00ea From b01db63f9c36fd671d58a8e18e8bbcae0d4a34c1 Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Tue, 22 Apr 2025 11:24:39 -0500 Subject: [PATCH 4/7] set spack point to JCSDA --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 241d94a69..a69f3e4f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "spack"] path = spack - url = https://github.com/rickgrubin-noaa/spack + url = https://github.com/jcsda/spack branch = spack-stack-dev [submodule "doc/CMakeModules"] path = doc/CMakeModules From 316a8029c5813bf5feeef3dec528df6322e85bf8 Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Fri, 18 Jul 2025 15:14:20 +0000 Subject: [PATCH 5/7] Updates on gaea-c6 for new CPE --- configs/sites/tier1/gaea-c6/compilers.yaml | 43 +++++++++++++++++-- configs/sites/tier1/gaea-c6/packages_gcc.yaml | 18 ++++++++ .../sites/tier1/gaea-c6/packages_oneapi.yaml | 42 ++++++++++++++++++ 3 files changed, 99 insertions(+), 4 deletions(-) create mode 100644 configs/sites/tier1/gaea-c6/packages_gcc.yaml create mode 100644 configs/sites/tier1/gaea-c6/packages_oneapi.yaml diff --git a/configs/sites/tier1/gaea-c6/compilers.yaml b/configs/sites/tier1/gaea-c6/compilers.yaml index 774275d9f..b87cf979c 100644 --- a/configs/sites/tier1/gaea-c6/compilers.yaml +++ b/configs/sites/tier1/gaea-c6/compilers.yaml @@ -1,4 +1,31 @@ compilers: +- compiler: + spec: oneapi@2024.2.1 + paths: + cc: cc + cxx: CC + f77: ftn + fc: ftn + flags: {} + operating_system: sles15 + target: x86_64 + modules: + - PrgEnv-intel/8.6.0 + - intel/2024.2 + - craype/2.7.34 + - cray-libsci/24.11.0 + - libfabric/1.20.1 + environment: + prepend_path: + LD_LIBRARY_PATH: '/opt/cray/libfabric/1.20.1/lib64:/opt/cray/pe/libsci/24.07.0/INTEL/2023.2/x86_64/lib:/usr/lib64/gcc/x86_64-suse-linux/12:/opt/intel/oneapi/compiler/2024.2/lib' + set: + # OpenSUSE on Gaea C6 sets CONFIG_SITE so + # Automake-based builds are installed in lib64 + # which confuses some packages. + CONFIG_SITE: '' + #extra_rpaths: [] + extra_rpaths: + - /opt/intel/oneapi/compiler/2024.2/lib - compiler: spec: intel@2023.2.0 paths: @@ -11,6 +38,7 @@ compilers: cxxflags: "-gxx-name=/usr/bin/g++-12 -gcc-name=/usr/bin/gcc-12 -static-libstdc++" fflags: "-gcc-name=/usr/bin/gcc-12" operating_system: sles15 + target: x86_64 modules: - PrgEnv-intel/8.5.0 - intel-classic/2023.2.0 @@ -34,10 +62,17 @@ compilers: fc: /usr/bin/gfortran-12 flags: {} operating_system: sles15 + target: x86_64 modules: - - PrgEnv-gnu/8.5.0 + - PrgEnv-gnu/8.6.0 - gcc-native/12.3 - - craype/2.7.30 - - libfabric/1.20.1 + - craype/2.7.34 + - libfabric/1.20.1 + - cray-libsci/24.11.0 + - libfabric/1.20.1 environment: {} - extra_rpaths: [] + prepend_path: + LD_LIBRARY_PATH: '/opt/cray/libfabric/1.20.1/lib64:/opt/cray/pe/libsci/24.07.0/INTEL/2023.2/x86_64/lib:/usr/lib64/gcc/x86_64-suse-linux/12:/opt/intel/oneapi/compiler/2024.2/lib' + #extra_rpaths: [] + extra_rpaths: + - /opt/intel/oneapi/compiler/2024.2/lib diff --git a/configs/sites/tier1/gaea-c6/packages_gcc.yaml b/configs/sites/tier1/gaea-c6/packages_gcc.yaml new file mode 100644 index 000000000..f7cc32465 --- /dev/null +++ b/configs/sites/tier1/gaea-c6/packages_gcc.yaml @@ -0,0 +1,18 @@ +packages: + all: + compiler:: [gcc@12.3.0] + providers: + mpi:: [cray-mpich@8.1.32] + mpi: + buildable: False + cray-mpich: + externals: + - spec: cray-mpich@8.1.32 + prefix: /opt/cray/pe/mpich/8.1.32/ofi/gnu/12.3 + modules: + - craype-network-ofi + - cray-mpich/8.1.32 + gcc-runtime: + externals: + - spec: gcc-runtime@12.3.0%gcc@12.3.0 + prefix: /usr diff --git a/configs/sites/tier1/gaea-c6/packages_oneapi.yaml b/configs/sites/tier1/gaea-c6/packages_oneapi.yaml new file mode 100644 index 000000000..30956be86 --- /dev/null +++ b/configs/sites/tier1/gaea-c6/packages_oneapi.yaml @@ -0,0 +1,42 @@ +packages: + all: + compiler:: [oneapi@2024.2.1, gcc@12.3.0] + providers: + mpi:: [cray-mpich@8.1.32] + blas:: [openblas] + fftw-api:: [fftw] + lapack:: [openblas] + +### MPI, Python, MKL + mpi: + buildable: False + cray-mpich: + buildable: False + externals: + - spec: cray-mpich@8.1.32%oneapi@2024.2.1 ~wrappers + prefix: /opt/cray/pe/mpich/8.1.32/ofi/intel/2022.1 + modules: + - cray-mpich/8.1.32 + - craype-network-ofi + intel-oneapi-runtime: + buildable: False + externals: + - spec: intel-oneapi-runtime@2024.2.1%oneapi@2024.2.1 + prefix: /opt/intel/oneapi/compiler/2024.2 + intel-oneapi-mkl: + buildable: False + +### Modification of common packages + bison: + require: + - '%gcc' + ectrans: + require:: + - '@1.2.0 ~mkl +fftw' + gsibec: + require:: + - '@1.2.1 ~mkl' + py-numpy: + require:: + - '@1.26' + - '^openblas' From 1d50e9c8a6dc046080f9b76b06508cd8e08698b3 Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Mon, 21 Jul 2025 16:02:34 +0000 Subject: [PATCH 6/7] Use MKL --- configs/sites/tier1/gaea-c6/packages_oneapi.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/sites/tier1/gaea-c6/packages_oneapi.yaml b/configs/sites/tier1/gaea-c6/packages_oneapi.yaml index 30956be86..63189597a 100644 --- a/configs/sites/tier1/gaea-c6/packages_oneapi.yaml +++ b/configs/sites/tier1/gaea-c6/packages_oneapi.yaml @@ -3,9 +3,6 @@ packages: compiler:: [oneapi@2024.2.1, gcc@12.3.0] providers: mpi:: [cray-mpich@8.1.32] - blas:: [openblas] - fftw-api:: [fftw] - lapack:: [openblas] ### MPI, Python, MKL mpi: @@ -25,6 +22,9 @@ packages: prefix: /opt/intel/oneapi/compiler/2024.2 intel-oneapi-mkl: buildable: False + externals: + - spec: intel-oneapi-mkl@2023.2.0%oneapi@2024.2.1 + prefix: /opt/intel/oneapi ### Modification of common packages bison: @@ -32,7 +32,7 @@ packages: - '%gcc' ectrans: require:: - - '@1.2.0 ~mkl +fftw' + - '@1.2.0 +mkl ~fftw' gsibec: require:: - '@1.2.1 ~mkl' From 08724bc5b120462eed683ce3402b8450bfae3599 Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Wed, 30 Jul 2025 16:50:57 +0000 Subject: [PATCH 7/7] Clean up compilers.yaml --- configs/sites/tier1/gaea-c6/compilers.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/configs/sites/tier1/gaea-c6/compilers.yaml b/configs/sites/tier1/gaea-c6/compilers.yaml index b87cf979c..86025058a 100644 --- a/configs/sites/tier1/gaea-c6/compilers.yaml +++ b/configs/sites/tier1/gaea-c6/compilers.yaml @@ -23,7 +23,6 @@ compilers: # Automake-based builds are installed in lib64 # which confuses some packages. CONFIG_SITE: '' - #extra_rpaths: [] extra_rpaths: - /opt/intel/oneapi/compiler/2024.2/lib - compiler: @@ -73,6 +72,5 @@ compilers: environment: {} prepend_path: LD_LIBRARY_PATH: '/opt/cray/libfabric/1.20.1/lib64:/opt/cray/pe/libsci/24.07.0/INTEL/2023.2/x86_64/lib:/usr/lib64/gcc/x86_64-suse-linux/12:/opt/intel/oneapi/compiler/2024.2/lib' - #extra_rpaths: [] extra_rpaths: - /opt/intel/oneapi/compiler/2024.2/lib