diff --git a/checkout-versions.yaml b/checkout-versions.yaml index f0cf46aa0..f8b13bd95 100644 --- a/checkout-versions.yaml +++ b/checkout-versions.yaml @@ -5,4 +5,4 @@ versions: ramble: 6b4ecac # develop on 5/06/2025 (newer than 0.6.0 release) spack: a85ec51 # Dec. 1 2025 v1.1.0 - spack-packages: d13c881 # Dec. 3 2025 + spack-packages: 7746ad9 # Jan. 12 2026 diff --git a/repo/lammps/package.py b/repo/lammps/package.py index 08ec824a2..360908792 100644 --- a/repo/lammps/package.py +++ b/repo/lammps/package.py @@ -14,6 +14,9 @@ class Lammps(BuiltinLammps): depends_on("kokkos+openmp cxxstd=17", when="+openmp") depends_on("kokkos+wrapper", when="+cuda") + + # Kokkos 5 not building + depends_on("kokkos@:4", when="@:20250722 +kokkos") flag_handler = build_system_flags diff --git a/repo/raja/package.py b/repo/raja/package.py index 028b12d30..acc239fd5 100644 --- a/repo/raja/package.py +++ b/repo/raja/package.py @@ -9,6 +9,13 @@ class Raja(BuiltinRaja): + version( + "2025.12.0", + tag="v2025.12.0", + commit="e827035c630e71a9358e2f21c2f3cf6fd5fb6605", + submodules=False, + ) + def setup_build_environment(self, env): super().setup_build_environment(env) if "+cuda" in self.spec: diff --git a/repo/sparta-snl/package.py b/repo/sparta-snl/package.py index b34ac171f..08e19efbb 100644 --- a/repo/sparta-snl/package.py +++ b/repo/sparta-snl/package.py @@ -53,7 +53,9 @@ class SpartaSnl(CMakePackage, CudaPackage, ROCmPackage): depends_on("kokkos+openmp cxxstd=17", when="+openmp") depends_on("kokkos+rocm", when="+rocm") depends_on("kokkos+wrapper+cuda cxxstd=17", when="+cuda") - + # Kokkos 5 not building + depends_on("kokkos@:4", when="+kokkos") + depends_on("jpeg", when="+jpeg") depends_on("libpng", when="+png") diff --git a/systems/lanl-venado/system.py b/systems/lanl-venado/system.py index c9f53eda3..f73e98471 100644 --- a/systems/lanl-venado/system.py +++ b/systems/lanl-venado/system.py @@ -185,12 +185,6 @@ def compute_compilers_section(self): "cce@18.0.0", "/opt/cray/pe/cce/18.0.0/", {"c": "cracc", "cxx": "crayCC", "fortran": "crayftn"}, - flags={ - "cflags": "-g -O2 --gcc-toolchain=/usr/projects/hpcsoft/tce/24-07/cos3-aarch64-cc90/compilers/gcc/12.3.0", - "cxxflags": "-g -O2 --gcc-toolchain=/usr/projects/hpcsoft/tce/24-07/cos3-aarch64-cc90/compilers/gcc/12.3.0", - "fflags": "-g -O2 -hnopattern", - "ldflags": "-ldl", - }, env={ "prepend_path": { "LD_LIBRARY_PATH": "/opt/cray/pe/cce/18.0.0/cce/aarch64/lib:/opt/cray/libfabric/1.20.1/lib64:/usr/projects/hpcsoft/tce/24-07/cos3-aarch64-cc90/compilers/gcc/12.3.0/lib:/usr/projects/hpcsoft/tce/24-07/cos3-aarch64-cc90/compilers/gcc/12.3.0/lib64:/opt/cray/pe/gcc-libs" diff --git a/systems/llnl-elcapitan/system.py b/systems/llnl-elcapitan/system.py index 0bbf42678..ec41a2101 100644 --- a/systems/llnl-elcapitan/system.py +++ b/systems/llnl-elcapitan/system.py @@ -744,7 +744,6 @@ def rocm_cce_compiler_cfg(self): f"/opt/rocm-{self.rocm_version}/", {"c": "amdclang", "cxx": "amdclang++", "fortran": "amdflang"}, modules=[f"rocm/{self.rocm_version}"], - flags={"cflags": "-g -O2", "cxxflags": "-g -O2"}, extra_rpaths=list(rpaths), env={ "set": {"RFE_811452_DISABLE": "1"}, @@ -768,12 +767,6 @@ def rocm_cce_compiler_cfg(self): "LD_LIBRARY_PATH": f"/opt/cray/pe/cce/{self.cce_version}/cce/x86_64/lib:/opt/rocm-{self.rocm_version}/lib:/opt/cray/pe/pmi/{self.pmi_version}/lib:/opt/cray/pe/pals/{self.pals_version}/lib" } }, - flags={ - "cflags": "-g -O2", - "cxxflags": "-g -O2 -std=c++14", - "fflags": "-g -O2 -hnopattern", - "ldflags": "-ldl", - }, ) cfgs.append(compiler_section_for("cce", [cce_entry])) return merge_dicts(*cfgs) diff --git a/systems/llnl-sierra/system.py b/systems/llnl-sierra/system.py index feccfb37d..540c7d46f 100644 --- a/systems/llnl-sierra/system.py +++ b/systems/llnl-sierra/system.py @@ -455,12 +455,6 @@ def compute_compilers_section(self): } cuda_modules = cuda_module_map[cuda_ver] - flags = { - "cflags": "-g -O2", - "cxxflags": "-g -O2", - "fflags": "-g -O2", - } - if (compiler, cuda_ver) == ("clang-ibm", "11-8-0"): cfg1 = compiler_section_for( "llvm", @@ -469,7 +463,6 @@ def compute_compilers_section(self): "llvm@16.0.6", "/usr/tce/packages/clang/clang-ibm-16.0.6-cuda-11.8.0-gcc-11.2.1/", {"c": "clang", "cxx": "clang++"}, - flags=flags, modules=cuda_modules + ["clang/ibm-16.0.6-cuda-11.8.0-gcc-11.2.1"], ) @@ -482,7 +475,6 @@ def compute_compilers_section(self): "xl@2023.06.28", "/usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/", {"c": "xlc", "cxx": "xlC", "fortran": "xlf"}, - flags=flags, ) ], ) @@ -495,7 +487,6 @@ def compute_compilers_section(self): "xl@2023.06.28", "/usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/", {"c": "xlc", "cxx": "xlC", "fortran": "xlf"}, - flags=flags, modules=cuda_modules + ["xl/2023.06.28-cuda-11.8.0-gcc-11.2.1"], ) ], @@ -508,7 +499,6 @@ def compute_compilers_section(self): "xl@16.1.1-2022.08.19-cuda10.1.243", "/usr/tce/packages/xl/xl-2022.08.19/", {"c": "xlc", "cxx": "xlC", "fortran": "xlf"}, - flags=flags, modules=cuda_modules + ["xl/2022.08.19"], ) ], @@ -521,16 +511,11 @@ def compute_compilers_section(self): "xl@16.1.1-2022.08.19-cuda11.8.0", "/usr/tce/packages/xl/xl-2022.08.19-cuda-11.8.0/", {"c": "xlc", "cxx": "xlC", "fortran": "xlf"}, - flags=flags, modules=cuda_modules + ["xl/2022.08.19-cuda-11.8.0"], ) ], ) elif (compiler, cuda_ver) == ("clang", "11-8-0"): - custom_flags = { - "cflags": "-g -O2", - "cxxflags": "-g -O2", - } cfg1 = compiler_section_for( "llvm", [ @@ -538,7 +523,6 @@ def compute_compilers_section(self): "llvm@16.0.6", "/usr/tce/packages/clang/clang-ibm-16.0.6-cuda-11.8.0-gcc-11.2.1/", {"c": "clang", "cxx": "clang++"}, - flags=custom_flags, ) ], ) @@ -549,7 +533,6 @@ def compute_compilers_section(self): "gcc@11.2.1 languages:=c,c++,fortran", "/usr/tce/packages/gcc/gcc-11.2.1/", {"c": "gcc", "cxx": "g++", "fortran": "gfortran"}, - flags=custom_flags, ) ], ) diff --git a/systems/snl-eldorado/system.py b/systems/snl-eldorado/system.py index fe9f33c48..f8cf4c06f 100644 --- a/systems/snl-eldorado/system.py +++ b/systems/snl-eldorado/system.py @@ -628,7 +628,6 @@ def rocm_cce_compiler_cfg(self): f"/opt/rocm-{self.rocm_version}/", {"c": "amdclang", "cxx": "amdclang++", "fortran": "amdflang"}, modules=[f"cce/{self.cce_version}"], - flags={"cflags": "-g -O2", "cxxflags": "-g -O2"}, extra_rpaths=list(rpaths), env={ "set": {"RFE_811452_DISABLE": "1"}, @@ -652,12 +651,6 @@ def rocm_cce_compiler_cfg(self): "LD_LIBRARY_PATH": f"/opt/cray/pe/cce/{self.cce_version}/cce/x86_64/lib:/opt/rocm-{self.rocm_version}/lib:/opt/cray/pe/pmi/{self.pmi_version}/lib:/opt/cray/pe/pals/{self.pals_version}/lib" } }, - flags={ - "cflags": "-g -O2", - "cxxflags": "-g -O2 -std=c++14", - "fflags": "-g -O2 -hnopattern", - "ldflags": "-ldl", - }, ) cfgs.append(compiler_section_for("cce", [cce_entry])) return merge_dicts(*cfgs)