Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion checkout-versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions repo/lammps/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rfhaque Is this expected to be necessary?


flag_handler = build_system_flags

Expand Down
7 changes: 7 additions & 0 deletions repo/raja/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 3 additions & 1 deletion repo/sparta-snl/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rfhaque Is this expected to be necessary?


depends_on("jpeg", when="+jpeg")
depends_on("libpng", when="+png")

Expand Down
6 changes: 0 additions & 6 deletions systems/lanl-venado/system.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,6 @@ def compute_compilers_section(self):
"[email protected]",
"/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"
Expand Down
7 changes: 0 additions & 7 deletions systems/llnl-elcapitan/system.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand All @@ -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)
Expand Down
17 changes: 0 additions & 17 deletions systems/llnl-sierra/system.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -469,7 +463,6 @@ def compute_compilers_section(self):
"[email protected]",
"/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"],
)
Expand All @@ -482,7 +475,6 @@ def compute_compilers_section(self):
"[email protected]",
"/usr/tce/packages/xl/xl-2023.06.28-cuda-11.8.0-gcc-11.2.1/",
{"c": "xlc", "cxx": "xlC", "fortran": "xlf"},
flags=flags,
)
],
)
Expand All @@ -495,7 +487,6 @@ def compute_compilers_section(self):
"[email protected]",
"/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"],
)
],
Expand All @@ -508,7 +499,6 @@ def compute_compilers_section(self):
"[email protected]",
"/usr/tce/packages/xl/xl-2022.08.19/",
{"c": "xlc", "cxx": "xlC", "fortran": "xlf"},
flags=flags,
modules=cuda_modules + ["xl/2022.08.19"],
)
],
Expand All @@ -521,24 +511,18 @@ def compute_compilers_section(self):
"[email protected]",
"/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",
[
compiler_def(
"[email protected]",
"/usr/tce/packages/clang/clang-ibm-16.0.6-cuda-11.8.0-gcc-11.2.1/",
{"c": "clang", "cxx": "clang++"},
flags=custom_flags,
)
],
)
Expand All @@ -549,7 +533,6 @@ def compute_compilers_section(self):
"[email protected] languages:=c,c++,fortran",
"/usr/tce/packages/gcc/gcc-11.2.1/",
{"c": "gcc", "cxx": "g++", "fortran": "gfortran"},
flags=custom_flags,
)
],
)
Expand Down
7 changes: 0 additions & 7 deletions systems/snl-eldorado/system.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand All @@ -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)
Expand Down
Loading