diff --git a/.gitmodules b/.gitmodules index 2f6cb0566..4dbd9f15c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,12 @@ [submodule "spack"] path = spack - url = https://github.com/jcsda/spack - branch = spack-stack-dev + #url = https://github.com/jcsda/spack + #branch = spack-stack-dev + url = https://github.com/AlexanderHrabski-NOAA/spack + branch = update-spack-from-develop [submodule "repos/builtin"] path = repos/builtin - url = https://github.com/jcsda/spack-packages - branch = spack-stack-dev + #url = https://github.com/jcsda/spack-packages + #branch = spack-stack-dev + url = https://github.com/climbfuji/spack-packages + branch = feature/upd_spst_dev_from_upstream_20260602 diff --git a/configs/common/config.yaml b/configs/common/config.yaml index 178980d1c..856e36861 100644 --- a/configs/common/config.yaml +++ b/configs/common/config.yaml @@ -1,5 +1,9 @@ # Set package and module installation directories config: + # Old installer - needed for py-pynacl amongst others + # https://github.com/spack/spack-packages/issues/5106 + installer: old + install_hash_length: 7 install_tree: root: $env/install diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index bf657fb73..d1bd0f998 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -387,6 +387,10 @@ packages: py-cartopy: require: - +plotting + # See py-pycparser + py-click: + require: + - '@8.1.8' # Pin py-colorama to avoid duplicate packages, hopefully can be removed soon py-colorama: require: @@ -429,6 +433,15 @@ packages: py-poetry-core: require: - '@1.7' + # See py-pycparser + py-pooch: + require: + - '@1.7.0' + # Need older version of py-pycparser until we can update setuputils to >= 77 ? + # https://github.com/pydata/xarray/issues/10588 + py-pycparser: + require: + - '@2.21' # Need at least py-pygithub@2.7 for self-hosted runner management py-pygithub: require: @@ -437,6 +450,10 @@ packages: py-pyogrio: require: - '@0.9.0' + # See py-pycparser + py-pyparsing: + require: + - '@3.1.2' # To avoid duplicate packages py-python-dateutil: require: @@ -454,6 +471,10 @@ packages: py-setuptools: require: - '@73.0.1' + # See py-pycparser + py-sphinxcontrib-bibtex: + require: + - '@2.5.0' py-torch: require: - +custom-protobuf @@ -466,7 +487,7 @@ packages: # To avoid duplicate packages py-versioneer: require: - - '@0.29' + - '@=0.28' # On a per-site basis, either set qt to buildable: false # or add requirement to build with gcc for Intel oneAPI qt: diff --git a/configs/sites/tier1/atlantis/packages_clang-22.1.0.yaml b/configs/sites/tier1/atlantis/packages_clang-22.1.0.yaml index 71e1ffc18..e4d82ce5e 100644 --- a/configs/sites/tier1/atlantis/packages_clang-22.1.0.yaml +++ b/configs/sites/tier1/atlantis/packages_clang-22.1.0.yaml @@ -31,4 +31,5 @@ packages: - spec: openmpi@4.1.8 ~internal-hwloc +two_level_namespace prefix: /gpfs/neptune/spack-stack/openmpi-4.1.8/llvm-22.1.0 modules: + - llvm/22.1.0 - openmpi/4.1.8 diff --git a/configs/sites/tier1/atlantis/packages_gcc-13.4.0.yaml b/configs/sites/tier1/atlantis/packages_gcc-13.4.0.yaml index f679ce2bf..e2ad853d7 100644 --- a/configs/sites/tier1/atlantis/packages_gcc-13.4.0.yaml +++ b/configs/sites/tier1/atlantis/packages_gcc-13.4.0.yaml @@ -25,4 +25,5 @@ packages: - spec: openmpi@4.1.8 ~internal-hwloc +two_level_namespace prefix: /gpfs/neptune/spack-stack/openmpi-4.1.8/gcc-13.4.0 modules: + - gcc/13.4.0 - openmpi/4.1.8 diff --git a/configs/sites/tier1/atlantis/packages_oneapi-2024.2.1.yaml b/configs/sites/tier1/atlantis/packages_oneapi-2024.2.1.yaml index 2399b9d46..204dcedc0 100644 --- a/configs/sites/tier1/atlantis/packages_oneapi-2024.2.1.yaml +++ b/configs/sites/tier1/atlantis/packages_oneapi-2024.2.1.yaml @@ -47,6 +47,9 @@ packages: - spec: intel-oneapi-mpi@2021.13 prefix: /cm/shared/apps/intel/oneapi-2024.2.1 modules: + - intel-oneapi-2024.2.1 + - tbb/2021.13 + - compiler-rt/2024.2.1 - mpi/2021.13 - slurm intel-oneapi-mkl: @@ -54,3 +57,8 @@ packages: externals: - spec: intel-oneapi-mkl@2024.2 prefix: /cm/shared/apps/intel/oneapi-2024.2.1 + modules: + - intel-oneapi-2024.2.1 + - tbb/2021.13 + - compiler-rt/2024.2.1 + - mkl/2024.2 diff --git a/configs/sites/tier1/atlantis/packages_oneapi-2025.3.0.yaml b/configs/sites/tier1/atlantis/packages_oneapi-2025.3.0.yaml index a284b3a2e..73d9d4dd1 100644 --- a/configs/sites/tier1/atlantis/packages_oneapi-2025.3.0.yaml +++ b/configs/sites/tier1/atlantis/packages_oneapi-2025.3.0.yaml @@ -47,6 +47,9 @@ packages: - spec: intel-oneapi-mpi@2021.17 prefix: /gpfs/neptune/spack-stack/oneapi-2025.3.0 modules: + - umf/1.0.2 + - tbb/2022.3 + - compiler-rt/2025.3.0 - mpi/2021.17 - slurm intel-oneapi-mkl: @@ -55,4 +58,7 @@ packages: - spec: intel-oneapi-mkl@2025.3 prefix: /gpfs/neptune/spack-stack/oneapi-2025.3.0 modules: + - umf/1.0.2 + - tbb/2022.3 + - compiler-rt/2025.3.0 - mkl/2025.3 diff --git a/repos/builtin b/repos/builtin index beebc2fa3..8635bd92b 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit beebc2fa33f45e9f050f613a53528f7566598062 +Subproject commit 8635bd92bdb4493d87ee1de84b4e48fdd8cd0265 diff --git a/repos/spack_stack/spack_repo/spack_stack/packages/dev_utils_env/package.py b/repos/spack_stack/spack_repo/spack_stack/packages/dev_utils_env/package.py index 942be7994..fae034918 100644 --- a/repos/spack_stack/spack_repo/spack_stack/packages/dev_utils_env/package.py +++ b/repos/spack_stack/spack_repo/spack_stack/packages/dev_utils_env/package.py @@ -31,7 +31,7 @@ class DevUtilsEnv(BundlePackage): # Scalasca/ScoreP depends_on("scalasca", when="+scalasca", type="run") - depends_on("cube +gui", when="+scalasca", type="run") + depends_on("cube", when="+scalasca", type="run") # Miscellaneous depends_on("bats", type="run") diff --git a/spack b/spack index 324bf79a3..6fb75bd0c 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit 324bf79a31704dbc68fafc9e4a053aa4c60019ea +Subproject commit 6fb75bd0c607b5148c3a126301bc7a9e13b86b26