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 68fad26071167514c5f431f0e3958e220fca3433 Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Tue, 12 Aug 2025 11:45:53 -0500 Subject: [PATCH 5/7] update spack submodule pointer --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index 43381fe76..e5820edc4 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 43381fe761f7280ac91fbdda462f86a062979843 +Subproject commit e5820edc45514037d68700fcb3af346f993bd80e From 244f947a187accac900b9dc612b077697383be8f Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Mon, 25 Aug 2025 15:58:45 -0500 Subject: [PATCH 6/7] update spack --- spack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spack b/spack index e4724c3d7..b3fad4c1c 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit e4724c3d7952434f55f95b45a2276dec03c92949 +Subproject commit b3fad4c1c4803a83aa9cd2161003833ca721cf21 From 34e97b6e78bca227cf52780c5cb8b50e0ea04540 Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Wed, 4 Mar 2026 15:35:17 +0000 Subject: [PATCH 7/7] update to compilers@2025.3.1 and mpi@2021.17 --- .../ursa/packages_oneapi-2025.3.1-hpcx.yaml | 46 +++++++++++++++++ .../tier1/ursa/packages_oneapi-2025.3.1.yaml | 51 +++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 configs/sites/tier1/ursa/packages_oneapi-2025.3.1-hpcx.yaml create mode 100644 configs/sites/tier1/ursa/packages_oneapi-2025.3.1.yaml diff --git a/configs/sites/tier1/ursa/packages_oneapi-2025.3.1-hpcx.yaml b/configs/sites/tier1/ursa/packages_oneapi-2025.3.1-hpcx.yaml new file mode 100644 index 000000000..f5c0c6c8f --- /dev/null +++ b/configs/sites/tier1/ursa/packages_oneapi-2025.3.1-hpcx.yaml @@ -0,0 +1,46 @@ +packages: + mpi: + buildable: False + require: + - hpcx-mpi@2.18.1 + hpcx-mpi: + buildable: False + externals: + - spec: hpcx-mpi@2.18.1 + prefix: /apps/hpcx-v2.18.1-gcc-mlnx_ofed-redhat9-cuda12-x86_64/ompi-mt-oneapi2025 + modules: + - hpc-x/2.18.1-mt-oneapi2025 + intel-oneapi-compilers: + buildable: False + externals: + - spec: intel-oneapi-compilers@2025.3.1 + prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2025.3.1-yqgrg5v3jonwexcjwd3xu3rzvwcp4ejk + modules: + - intel-oneapi-compilers/2025.3.1 + extra_attributes: + compilers: + c: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2025.3.1-yqgrg5v3jonwexcjwd3xu3rzvwcp4ejk/compiler/2025.3/bin/icx + cxx: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2025.3.1-yqgrg5v3jonwexcjwd3xu3rzvwcp4ejk/compiler/2025.3/bin/icpx + fortran: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2025.3.1-yqgrg5v3jonwexcjwd3xu3rzvwcp4ejk/compiler/2025.3/bin/ifx + environment: + prepend_path: + LD_LIBRARY_PATH: '/usr/lib:/usr/lib64' + intel-oneapi-mkl: + buildable: False + externals: + - spec: intel-oneapi-mkl@2025.3 + prefix: /apps/spack-2024-12/linux-rocky9-x86_64/oneapi-2025.3.1/intel-oneapi-mkl-2025.3.0-z5owhveid7qlq4erbay2seqzs65y3etu + modules: + - intel-oneapi-mkl/2025.3.0 + gcc: + buildable: False + externals: + - spec: gcc@12.4.0 languages:='c,c++' + prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj + modules: + - gcc/12.4.0 + extra_attributes: + compilers: + c: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/gcc + cxx: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/g++ + fortran: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/gfortran diff --git a/configs/sites/tier1/ursa/packages_oneapi-2025.3.1.yaml b/configs/sites/tier1/ursa/packages_oneapi-2025.3.1.yaml new file mode 100644 index 000000000..216a7fdd3 --- /dev/null +++ b/configs/sites/tier1/ursa/packages_oneapi-2025.3.1.yaml @@ -0,0 +1,51 @@ +packages: + mpi: + buildable: False + require: + - intel-oneapi-mpi@2021.17 + intel-oneapi-compilers: + buildable: False + externals: + - spec: intel-oneapi-compilers@2025.3.1 + prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2025.3.1-yqgrg5v3jonwexcjwd3xu3rzvwcp4ejk + modules: + - intel-oneapi-compilers/2025.3.1 + extra_attributes: + compilers: + c: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2025.3.1-yqgrg5v3jonwexcjwd3xu3rzvwcp4ejk/compiler/2025.3/bin/icx + cxx: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2025.3.1-yqgrg5v3jonwexcjwd3xu3rzvwcp4ejk/compiler/2025.3/bin/icpx + fortran: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2025.3.1-yqgrg5v3jonwexcjwd3xu3rzvwcp4ejk/compiler/2025.3/bin/ifx + environment: + prepend_path: + LD_LIBRARY_PATH: '/usr/lib:/usr/lib64' + intel-oneapi-mpi: + buildable: False + externals: + - spec: intel-oneapi-mpi@2021.17 + prefix: /apps/spack-2024-12/linux-rocky9-x86_64/oneapi-2025.3.1/intel-oneapi-mpi-2021.17.1-emmz2zv6lx5ypzmlc3csouqffu7mwnwr + modules: + - intel-oneapi-mpi/2021.17.1 + intel-oneapi-mkl: + buildable: False + externals: + - spec: intel-oneapi-mkl@2025.3 + prefix: /apps/spack-2024-12/linux-rocky9-x86_64/oneapi-2025.3.1/intel-oneapi-mkl-2025.3.0-z5owhveid7qlq4erbay2seqzs65y3etu + modules: + - intel-oneapi-mkl/2025.3.0 + intel-oneapi-tbb: + buildable: False + externals: + - spec: intel-oneapi-tbb@2021.12 + prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-tbb-2021.12.0-grcsmccjpm3trn6rgtyq76kdxks6ygzm + gcc: + buildable: False + externals: + - spec: gcc@12.4.0 languages:='c,c++' + prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj + modules: + - gcc/12.4.0 + extra_attributes: + compilers: + c: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/gcc + cxx: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/g++ + fortran: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin/gfortran