From d399619c95e1f3d523c6d0dcd9bcf292a0fbc5b4 Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Thu, 6 Jun 2024 22:23:55 +0000 Subject: [PATCH 01/12] 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 02/12] 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 03/12] 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 04/12] 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 05/12] 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 06/12] 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 bf841204bd31a0b45c95e792d6dba10828f9338b Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Wed, 18 Feb 2026 19:05:35 +0000 Subject: [PATCH 07/12] remove references to GNU libs and headers --- configs/sites/tier1/ursa/packages_oneapi-2025.2.1-hpcx.yaml | 5 ----- configs/sites/tier1/ursa/packages_oneapi-2025.2.1.yaml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/configs/sites/tier1/ursa/packages_oneapi-2025.2.1-hpcx.yaml b/configs/sites/tier1/ursa/packages_oneapi-2025.2.1-hpcx.yaml index c6a237d32..afa6be6d3 100644 --- a/configs/sites/tier1/ursa/packages_oneapi-2025.2.1-hpcx.yaml +++ b/configs/sites/tier1/ursa/packages_oneapi-2025.2.1-hpcx.yaml @@ -25,11 +25,6 @@ packages: environment: prepend_path: LD_LIBRARY_PATH: '/usr/lib:/usr/lib64' - PATH: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin - CPATH: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/include - extra_rpaths: - - /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/lib - - /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/lib64 intel-oneapi-mkl: buildable: False externals: diff --git a/configs/sites/tier1/ursa/packages_oneapi-2025.2.1.yaml b/configs/sites/tier1/ursa/packages_oneapi-2025.2.1.yaml index 2b2ea531c..9f887da79 100644 --- a/configs/sites/tier1/ursa/packages_oneapi-2025.2.1.yaml +++ b/configs/sites/tier1/ursa/packages_oneapi-2025.2.1.yaml @@ -18,11 +18,6 @@ packages: environment: prepend_path: LD_LIBRARY_PATH: '/usr/lib:/usr/lib64' - PATH: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/bin - CPATH: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/include - extra_rpaths: - - /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/lib - - /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/lib64 intel-oneapi-mpi: buildable: False externals: From 8f014e41baeec28fe597580b325d39aed3c8d036 Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Wed, 18 Feb 2026 14:50:02 -0600 Subject: [PATCH 08/12] use EPIC-installed oneapi compilers --- .../tier1/orion/packages_oneapi-2025.3.1.yaml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/configs/sites/tier1/orion/packages_oneapi-2025.3.1.yaml b/configs/sites/tier1/orion/packages_oneapi-2025.3.1.yaml index 4d7713b32..7b2a374b6 100644 --- a/configs/sites/tier1/orion/packages_oneapi-2025.3.1.yaml +++ b/configs/sites/tier1/orion/packages_oneapi-2025.3.1.yaml @@ -14,22 +14,18 @@ packages: buildable: false externals: - spec: intel-oneapi-compilers@2025.3.1 - prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj + #prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj + prefix: /work2/noaa/epic/rgrubin/oneapi modules: - intel-oneapi-compilers/2025.3.1 extra_attributes: compilers: - c: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj/compiler/2025.3/bin/icx - cxx: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj/compiler/2025.3/bin/icpx - fortran: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj/compiler/2025.3/bin/ifx + c: /apps/contrib/spack-stack/installs/oneapi-2025.3.1/compiler/2025.3/bin/icx + cxx: /apps/contrib/spack-stack/installs/oneapi-2025.3.1/compiler/2025.3/bin/icpx + fortran: /apps/contrib/spack-stack/installs/oneapi-2025.3.1/compiler/2025.3/bin/ifx environment: prepend_path: LD_LIBRARY_PATH: '/usr/lib:/usr/lib64' - PATH: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/bin - CPATH: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/include - extra_rpaths: - - /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/lib - - /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/lib64 intel-oneapi-mkl: buildable: false externals: From d038ba707dc37d3999269ec5ffe9a3230b18590c Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Wed, 18 Feb 2026 15:01:04 -0600 Subject: [PATCH 09/12] fix mirrors.yaml syntax --- configs/sites/tier1/orion/mirrors.yaml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/configs/sites/tier1/orion/mirrors.yaml b/configs/sites/tier1/orion/mirrors.yaml index 97f382e8e..1ffcf0299 100644 --- a/configs/sites/tier1/orion/mirrors.yaml +++ b/configs/sites/tier1/orion/mirrors.yaml @@ -1,18 +1,2 @@ mirrors: - local-source: - fetch: - url: file:///work/noaa/epic/role-epic/spack-stack/source-cache - access_pair: - - null - - null - access_token: null - profile: null - endpoint_url: null - push: - url: file:///work/noaa/epic/role-epic/spack-stack/source-cache - access_pair: - - null - - null - access_token: null - profile: null - endpoint_url: null + local-source: file:///work/noaa/epic/role-epic/spack-stack/source-cache From 00b95221990b5316e54ca722fda30e65e4987cba Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Wed, 18 Feb 2026 15:57:44 -0600 Subject: [PATCH 10/12] add hercules configs --- configs/sites/tier1/hercules/mirrors.yaml | 18 +--------------- .../hercules/packages_oneapi-2025.3.1.yaml | 21 +++++++------------ configs/sites/tier1/orion/modules.yaml | 2 -- .../tier1/orion/packages_oneapi-2025.3.1.yaml | 3 +-- 4 files changed, 10 insertions(+), 34 deletions(-) diff --git a/configs/sites/tier1/hercules/mirrors.yaml b/configs/sites/tier1/hercules/mirrors.yaml index 97f382e8e..1ffcf0299 100644 --- a/configs/sites/tier1/hercules/mirrors.yaml +++ b/configs/sites/tier1/hercules/mirrors.yaml @@ -1,18 +1,2 @@ mirrors: - local-source: - fetch: - url: file:///work/noaa/epic/role-epic/spack-stack/source-cache - access_pair: - - null - - null - access_token: null - profile: null - endpoint_url: null - push: - url: file:///work/noaa/epic/role-epic/spack-stack/source-cache - access_pair: - - null - - null - access_token: null - profile: null - endpoint_url: null + local-source: file:///work/noaa/epic/role-epic/spack-stack/source-cache diff --git a/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml b/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml index 8c0ee42a1..a9e75a280 100644 --- a/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml +++ b/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml @@ -14,22 +14,17 @@ packages: buildable: false externals: - spec: intel-oneapi-compilers@2025.3.1 - prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj + prefix: /apps/contrib/spack-stack/installs/oneapi-2025.3.1 modules: - intel-oneapi-compilers/2025.3.1 extra_attributes: compilers: - c: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj/compiler/2025.3/bin/icx - cxx: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj/compiler/2025.3/bin/icpx - fortran: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj/compiler/2025.3/bin/ifx + c: /apps/contrib/spack-stack/installs/oneapi-2025.3.1/compiler/2025.3/bin/icx + cxx: /apps/contrib/spack-stack/installs/oneapi-2025.3.1/compiler/2025.3/bin/icpx + fortran: /apps/contrib/spack-stack/installs/oneapi-2025.3.1/compiler/2025.3/bin/ifx environment: prepend_path: LD_LIBRARY_PATH: '/usr/lib:/usr/lib64' - PATH: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/bin - CPATH: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/include - extra_rpaths: - - /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/lib - - /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/lib64 intel-oneapi-mkl: buildable: false externals: @@ -48,11 +43,11 @@ packages: buildable: false externals: - spec: gcc@12.2.0 languages:='c,c++' - prefix: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo + prefix: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3 modules: - gcc/12.2.0 extra_attributes: compilers: - c: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/bin/gcc - cxx: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/bin/g++ - fortran: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/bin/gfortran + c: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/bin/gcc + cxx: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/bin/g++ + fortran: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/bin/gfortran diff --git a/configs/sites/tier1/orion/modules.yaml b/configs/sites/tier1/orion/modules.yaml index 6f37dae97..4e9771f38 100644 --- a/configs/sites/tier1/orion/modules.yaml +++ b/configs/sites/tier1/orion/modules.yaml @@ -2,5 +2,3 @@ modules: default: enable:: - lmod - lmod: - - openssl diff --git a/configs/sites/tier1/orion/packages_oneapi-2025.3.1.yaml b/configs/sites/tier1/orion/packages_oneapi-2025.3.1.yaml index 7b2a374b6..a9e75a280 100644 --- a/configs/sites/tier1/orion/packages_oneapi-2025.3.1.yaml +++ b/configs/sites/tier1/orion/packages_oneapi-2025.3.1.yaml @@ -14,8 +14,7 @@ packages: buildable: false externals: - spec: intel-oneapi-compilers@2025.3.1 - #prefix: /apps/spack-managed-x86_64_v3-v1.0/gcc-11.3.1/intel-oneapi-compilers-2025.3.1-oxnnvyk4v5pxrvckkrvnfg3o7gx6tymj - prefix: /work2/noaa/epic/rgrubin/oneapi + prefix: /apps/contrib/spack-stack/installs/oneapi-2025.3.1 modules: - intel-oneapi-compilers/2025.3.1 extra_attributes: From b12f88c5629934268e260fa5bae7eede38ab0b70 Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Fri, 20 Feb 2026 11:55:48 -0600 Subject: [PATCH 11/12] site package config updates --- configs/sites/tier1/hercules/packages_gcc-12.2.0.yaml | 2 +- .../sites/tier1/hercules/packages_oneapi-2025.3.1.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/sites/tier1/hercules/packages_gcc-12.2.0.yaml b/configs/sites/tier1/hercules/packages_gcc-12.2.0.yaml index 7c0ba5253..16d6c4153 100644 --- a/configs/sites/tier1/hercules/packages_gcc-12.2.0.yaml +++ b/configs/sites/tier1/hercules/packages_gcc-12.2.0.yaml @@ -6,7 +6,7 @@ packages: openmpi: buildable: False externals: - - spec: openmpi@4.1.4 + - spec: openmpi@4.1.4 ~internal-hwloc +two_level_namespace prefix: /apps/spack-managed/gcc-11.3.1/openmpi-4.1.4-zabolhazla2ahsroedlyt2pu4mkp7o3q modules: - openmpi/4.1.4 diff --git a/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml b/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml index a9e75a280..3bc4ee3cc 100644 --- a/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml +++ b/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml @@ -43,11 +43,11 @@ packages: buildable: false externals: - spec: gcc@12.2.0 languages:='c,c++' - prefix: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3 + prefix: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo modules: - gcc/12.2.0 extra_attributes: compilers: - c: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/bin/gcc - cxx: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/bin/g++ - fortran: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-xy5rpremb5ln7puuq7it42fiqqhmvfe3/bin/gfortran + c: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/bin/gcc + cxx: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/bin/g++ + fortran: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/gfortran From 4649979395c125611dbfc7e45b2f8ff28c1ff7ef Mon Sep 17 00:00:00 2001 From: Rick Grubin Date: Fri, 20 Feb 2026 19:37:44 +0000 Subject: [PATCH 12/12] add bin dir for gfortran --- configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml b/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml index 3bc4ee3cc..e7c885bdf 100644 --- a/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml +++ b/configs/sites/tier1/hercules/packages_oneapi-2025.3.1.yaml @@ -50,4 +50,4 @@ packages: compilers: c: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/bin/gcc cxx: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/bin/g++ - fortran: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/gfortran + fortran: /apps/spack-managed/gcc-11.3.1/gcc-12.2.0-7cu3qahzhsxpauy4jlnsbcqmlbkxbbbo/bin/gfortran