Compare commits

...

4 Commits

Author SHA1 Message Date
Massimiliano Culpo
0dc6c42156 Limit deepcopy to just the initial "all" section (#37718)
Modifications:
- [x] Limit the scope of the deepcopy when initializing module file writers
2023-05-22 11:52:18 -07:00
eugeneswalker
67d3e79351 tau %oneapi: -Wno-error=implicit-function-declaration 2023-05-22 09:36:03 -07:00
eugeneswalker
3b9fb0d694 legion +rocm: apply patch for --offload-arch (#37775)
* legion +rocm: apply patch for --offload-arch

* constrain to latest version
2023-05-21 07:20:51 -07:00
Robert Underwood
7df3ef4cfd updates for the libpressio ecosystem (#37764)
* updates for the libpressio ecosystem

* [@spackbot] updating style on behalf of robertu94

* style fix: remove FIXME

---------

Co-authored-by: Robert Underwood <runderwood@anl.gov>
Co-authored-by: eugeneswalker <eugenesunsetwalker@gmail.com>
2023-05-21 07:20:47 -07:00
14 changed files with 62 additions and 12 deletions

View File

@ -170,17 +170,12 @@ def merge_config_rules(configuration, spec):
Returns: Returns:
dict: actions to be taken on the spec passed as an argument dict: actions to be taken on the spec passed as an argument
""" """
# Construct a dictionary with the actions we need to perform on the spec passed as a parameter
# Get the top-level configuration for the module type we are using spec_configuration = {}
module_specific_configuration = copy.deepcopy(configuration)
# Construct a dictionary with the actions we need to perform on the spec
# passed as a parameter
# The keyword 'all' is always evaluated first, all the others are # The keyword 'all' is always evaluated first, all the others are
# evaluated in order of appearance in the module file # evaluated in order of appearance in the module file
spec_configuration = module_specific_configuration.pop("all", {}) spec_configuration.update(copy.deepcopy(configuration.get("all", {})))
for constraint, action in module_specific_configuration.items(): for constraint, action in configuration.items():
if spec.satisfies(constraint): if spec.satisfies(constraint):
if hasattr(constraint, "override") and constraint.override: if hasattr(constraint, "override") and constraint.override:
spec_configuration = {} spec_configuration = {}
@ -200,14 +195,14 @@ def merge_config_rules(configuration, spec):
# configuration # configuration
# Hash length in module files # Hash length in module files
hash_length = module_specific_configuration.get("hash_length", 7) hash_length = configuration.get("hash_length", 7)
spec_configuration["hash_length"] = hash_length spec_configuration["hash_length"] = hash_length
verbose = module_specific_configuration.get("verbose", False) verbose = configuration.get("verbose", False)
spec_configuration["verbose"] = verbose spec_configuration["verbose"] = verbose
# module defaults per-package # module defaults per-package
defaults = module_specific_configuration.get("defaults", []) defaults = configuration.get("defaults", [])
spec_configuration["defaults"] = defaults spec_configuration["defaults"] = defaults
return spec_configuration return spec_configuration

View File

@ -0,0 +1,24 @@
diff -ruN spack-src/CMakeLists.txt spack-src-patched/CMakeLists.txt
--- spack-src/CMakeLists.txt 2023-05-18 14:18:00.897162488 -0400
+++ spack-src-patched/CMakeLists.txt 2023-05-18 14:20:09.532413649 -0400
@@ -495,7 +495,7 @@
if("${Legion_HIP_ARCH}" STREQUAL "")
set(HIP_GENCODE "")
else()
- set(HIP_GENCODE "--offload-target=${Legion_HIP_ARCH}")
+ set(HIP_GENCODE "--offload-arch=${Legion_HIP_ARCH}")
endif()
endif()
diff -ruN spack-src/runtime/runtime.mk spack-src-patched/runtime/runtime.mk
--- spack-src/runtime/runtime.mk 2023-05-18 14:18:00.969164248 -0400
+++ spack-src-patched/runtime/runtime.mk 2023-05-18 14:20:51.317470176 -0400
@@ -499,7 +499,7 @@
HIPCC_FLAGS += -O2
endif
ifneq ($(strip $(HIP_ARCH)),)
- HIPCC_FLAGS += --offload-target=$(HIP_ARCH)
+ HIPCC_FLAGS += --offload-arch=$(HIP_ARCH)
endif
LEGION_LD_FLAGS += -lm -L$(HIP_PATH)/lib -lamdhip64
else ifeq ($(strip $(HIP_TARGET)),CUDA)

View File

@ -70,6 +70,9 @@ class Legion(CMakePackage, ROCmPackage):
depends_on("kokkos@3.3.01:~cuda", when="+kokkos~cuda") depends_on("kokkos@3.3.01:~cuda", when="+kokkos~cuda")
depends_on("kokkos@3.3.01:~cuda+openmp", when="+kokkos+openmp") depends_on("kokkos@3.3.01:~cuda+openmp", when="+kokkos+openmp")
# https://github.com/spack/spack/issues/37232#issuecomment-1553376552
patch("hip-offload-arch.patch", when="@23.03.0 +rocm")
# HIP specific # HIP specific
variant( variant(
"hip_hijack", "hip_hijack",

View File

@ -15,6 +15,8 @@ class LibpressioNvcomp(CMakePackage, CudaPackage):
maintainers("robertu94") maintainers("robertu94")
version("0.0.5", sha256="2f2a2567c77db550badaf594cda824fa313470b143f69bcef308eeb80b4876c2")
version("0.0.4", sha256="6ff7d0f3167dead7584c994a6a11782f20eb3dd4844307e4ee8b2aebcd8571e9")
version("0.0.3", sha256="21409d34f9281bfd7b83b74f5f8fc6d34794f3161391405538c060fb59534597") version("0.0.3", sha256="21409d34f9281bfd7b83b74f5f8fc6d34794f3161391405538c060fb59534597")
version("0.0.2", commit="38d7aa7c283681cbe5b7f17b900f72f9f25be51c") version("0.0.2", commit="38d7aa7c283681cbe5b7f17b900f72f9f25be51c")

View File

@ -17,6 +17,8 @@ class LibpressioOpt(CMakePackage):
version("develop", branch="develop") version("develop", branch="develop")
version("sdr-develop", branch="develop", git="git@github.com:szcompressor/SDRFramework") version("sdr-develop", branch="develop", git="git@github.com:szcompressor/SDRFramework")
version("0.15.0", sha256="0f092ae287e555c890d0ab77df83a7acf619a2b05ab104cef8647df4f886d759")
version("0.14.0", sha256="1e8d348f9777f3d49764b22b1f2abefd4b972cb9b1fa27c867373d32c8f1c57d")
version("0.13.5", sha256="cc0e6a46335aa3552b8ab57757d39855f4fba71e661f706ec99519cb2c8a2f3c") version("0.13.5", sha256="cc0e6a46335aa3552b8ab57757d39855f4fba71e661f706ec99519cb2c8a2f3c")
version("0.13.4", sha256="e9f715d11fe3558a31e1d9a939150209449ec8636ded047cb0adcd3db07569ae") version("0.13.4", sha256="e9f715d11fe3558a31e1d9a939150209449ec8636ded047cb0adcd3db07569ae")
version("0.13.3", sha256="98436b7fa6a53dd9cc09a9b978dc81c299501930cb8b844713080fc42d39d173") version("0.13.3", sha256="98436b7fa6a53dd9cc09a9b978dc81c299501930cb8b844713080fc42d39d173")
@ -28,6 +30,8 @@ class LibpressioOpt(CMakePackage):
version("0.11.0", sha256="cebbc512fcaa537d2af1a6919d6e0400cdc13595d71d9b90b74ad3eb865c9767") version("0.11.0", sha256="cebbc512fcaa537d2af1a6919d6e0400cdc13595d71d9b90b74ad3eb865c9767")
depends_on("libpressio+libdistributed+mpi") depends_on("libpressio+libdistributed+mpi")
depends_on("libpressio@0.93.0:", when="@0.14.0:")
depends_on("libpressio@0.95.0:", when="@0.15.0:")
depends_on("libpressio@0.88.0:", when="@0.13.5:") depends_on("libpressio@0.88.0:", when="@0.13.5:")
depends_on("libpressio@0.85.0:", when="@0.13.3:") depends_on("libpressio@0.85.0:", when="@0.13.3:")
depends_on("libpressio@0.66.1:", when="@:0.13.2") depends_on("libpressio@0.66.1:", when="@:0.13.2")

View File

@ -17,6 +17,7 @@ class LibpressioRmetric(CMakePackage):
version("master", branch="master") version("master", branch="master")
# note versions <= 0.0.3 do not build with spack # note versions <= 0.0.3 do not build with spack
version("0.0.7", sha256="b01df5102076412064849335c2c928a4a5ba23e1f1f515062d9166b0a7531179")
version("0.0.6", sha256="b23a79448cd32b51a7301d6cebf4e228289712dd77dd76d86821741467e9af46") version("0.0.6", sha256="b23a79448cd32b51a7301d6cebf4e228289712dd77dd76d86821741467e9af46")
version("0.0.5", sha256="51eb192314ef083790dd0779864cab527845bd8de699b3a33cd065c248eae24c") version("0.0.5", sha256="51eb192314ef083790dd0779864cab527845bd8de699b3a33cd065c248eae24c")
version("0.0.4", sha256="166af5e84d7156c828a3f0dcc5bf531793ea4ec44bbf468184fbab96e1f0a91f") version("0.0.4", sha256="166af5e84d7156c828a3f0dcc5bf531793ea4ec44bbf468184fbab96e1f0a91f")

View File

@ -21,5 +21,6 @@ class LibpressioSperr(CMakePackage):
depends_on("pkgconfig", type="build") depends_on("pkgconfig", type="build")
version("master", branch="master") version("master", branch="master")
version("0.0.3", sha256="e0d1fd083419aaaa243cbf780b7de17aeb96533000071088aa21ec238d358ecc")
version("0.0.2", sha256="61995d687f9e7e798e17ec7238d19d917890dc0ff5dec18293b840c4d6f8c115") version("0.0.2", sha256="61995d687f9e7e798e17ec7238d19d917890dc0ff5dec18293b840c4d6f8c115")
version("0.0.1", sha256="e2c164822708624b97654046b42abff704594cba6537d6d0646d485bdf2d03ca") version("0.0.1", sha256="e2c164822708624b97654046b42abff704594cba6537d6d0646d485bdf2d03ca")

View File

@ -17,6 +17,8 @@ class LibpressioTools(CMakePackage):
tags = ["e4s"] tags = ["e4s"]
version("master", branch="master") version("master", branch="master")
version("0.3.0", sha256="2f309557df3e8df9e492691213933865a5dbfb051c03404e33918f4765223025")
version("0.2.0", sha256="75048950f0dfa0e20f2651991875822f36fceb84bdda12d1c0361d49912392b8")
version("0.1.6", sha256="a67a364f46dea29ff1b3e5c52c0a5abf2d9d53412fb8d424f6bd71252bfa7792") version("0.1.6", sha256="a67a364f46dea29ff1b3e5c52c0a5abf2d9d53412fb8d424f6bd71252bfa7792")
version("0.1.5", sha256="b35f495fae53df87dd2abf58c0c51ed17710b16aaa2d0842a543fddd3b2a8035") version("0.1.5", sha256="b35f495fae53df87dd2abf58c0c51ed17710b16aaa2d0842a543fddd3b2a8035")
version("0.1.4", sha256="39adc4b09a63548a416ee4b1dcc87ec8578b15a176a11a2845c276c6c211f2d0") version("0.1.4", sha256="39adc4b09a63548a416ee4b1dcc87ec8578b15a176a11a2845c276c6c211f2d0")
@ -43,6 +45,7 @@ class LibpressioTools(CMakePackage):
depends_on("boost") depends_on("boost")
# 0.1.0 changed a bunch of things in the build system, make sure everything is up to date # 0.1.0 changed a bunch of things in the build system, make sure everything is up to date
depends_on("libpressio@0.89.0:", when="@0.2.0:")
depends_on("libpressio@0.88.0:", when="@0.1.6:") depends_on("libpressio@0.88.0:", when="@0.1.6:")
depends_on("libpressio@0.85.0:", when="@0.1.0:0.1.5") depends_on("libpressio@0.85.0:", when="@0.1.0:0.1.5")
depends_on("libpressio-opt@0.13.3:", when="@0.1.0:+opt") depends_on("libpressio-opt@0.13.3:", when="@0.1.0:+opt")

View File

@ -16,6 +16,7 @@ class LibpressioTthresh(CMakePackage):
maintainers("robertu94") maintainers("robertu94")
version("main", branch="main") version("main", branch="main")
version("0.0.7", sha256="5e364ef72dd1ed1cf786d2b7aef89624fdcf1a0ca845777ce54c365b35a75be2")
version("0.0.6", sha256="e9dc4754421d892a86516c6bb892f6ff582e9ea3c242c1c052104e4f6944cbec") version("0.0.6", sha256="e9dc4754421d892a86516c6bb892f6ff582e9ea3c242c1c052104e4f6944cbec")
version("0.0.5", sha256="af47c90e9c16825312e390a7fb30d9d128847afb69ad6c2f6608bd80f60bae23") version("0.0.5", sha256="af47c90e9c16825312e390a7fb30d9d128847afb69ad6c2f6608bd80f60bae23")
version("0.0.3", sha256="b0b0a4876d3362deafc2bb326be33882132e3d1666e0c5f916fd6fad74a18688") version("0.0.3", sha256="b0b0a4876d3362deafc2bb326be33882132e3d1666e0c5f916fd6fad74a18688")

View File

@ -20,6 +20,12 @@ class Libpressio(CMakePackage, CudaPackage):
tests_require_compiler = True tests_require_compiler = True
version("master", branch="master") version("master", branch="master")
version("develop", branch="develop") version("develop", branch="develop")
version("0.95.1", sha256="c2e4f81d1491781cd47f2baba64acfbba9a7d6203c9b01369f8b1a8f94e0bb2b")
version("0.94.0", sha256="4250597cdd54043a7d5009ffc3feea3eac9496cdd38ea3f61f9727b7acd09add")
version("0.93.0", sha256="1da5940aaf0190a810988dcd8f415b9c8db53bbbdfcb627d899921c89170d990")
version("0.92.0", sha256="e9cab155deb07aabdca4ece2c826be905ed33f16c95f82f24eb01d181fce6109")
version("0.91.1", sha256="35cd4b93e410a83c626c9c168d59ade3bf26a453bcbf50dfd77b6d141184b97c")
version("0.91.0", sha256="6220988dc964c36cdffdbc5e055261ac7a0189ad80b67a962189683648209d2e")
version("0.90.2", sha256="1fe3f4073952a96bda1b3d7c237bc5d64d1f7bf13bfe1830074852ea33006bf9") version("0.90.2", sha256="1fe3f4073952a96bda1b3d7c237bc5d64d1f7bf13bfe1830074852ea33006bf9")
version("0.88.3", sha256="b2df2ed11f77eb2e07206f7bdfa4754017559017235c3324820021ef451fd48b") version("0.88.3", sha256="b2df2ed11f77eb2e07206f7bdfa4754017559017235c3324820021ef451fd48b")
version("0.88.2", sha256="f5de6aff5ff906b164d6b2199ada10a8e32fb1e2a6295da3f0b79d9626661a46") version("0.88.2", sha256="f5de6aff5ff906b164d6b2199ada10a8e32fb1e2a6295da3f0b79d9626661a46")
@ -329,6 +335,7 @@ def cmake_args(self):
args.append("-DLIBPRESSIO_HAS_SZ3=ON") args.append("-DLIBPRESSIO_HAS_SZ3=ON")
if "+cuda" in self.spec: if "+cuda" in self.spec:
args.append("-DLIBPRESSIO_HAS_CUFILE=ON") args.append("-DLIBPRESSIO_HAS_CUFILE=ON")
args.append("-DLIBPRESSIO_HAS_CUDA=ON")
if "+mgardx" in self.spec: if "+mgardx" in self.spec:
args.append("-DLIBPRESSIO_HAS_MGARDx=ON") args.append("-DLIBPRESSIO_HAS_MGARDx=ON")
if "+bzip2" in self.spec: if "+bzip2" in self.spec:

View File

@ -16,6 +16,8 @@ class Libstdcompat(CMakePackage):
maintainers("robertu94") maintainers("robertu94")
version("master", branch="master") version("master", branch="master")
version("0.0.17", sha256="8c8a3f2727dd28c51ab10e02a1114e39b683d6d9ea119d5c2a953f8c41d6bedd")
version("0.0.16", sha256="1287251b694adb80210536ab6eb75c1ff2c4ed8b77023208a757ae27c9dae0bb")
version("0.0.15", sha256="af374a8883a32d874f6cd18cce4e4344e32f9d60754be403a5ac7114feca2a28") version("0.0.15", sha256="af374a8883a32d874f6cd18cce4e4344e32f9d60754be403a5ac7114feca2a28")
version("0.0.14", sha256="9a794d43a1d79aec3350b89d8c06689b8b32cf75e2742cdfa9dc0e3f2be6f04e") version("0.0.14", sha256="9a794d43a1d79aec3350b89d8c06689b8b32cf75e2742cdfa9dc0e3f2be6f04e")
version("0.0.13", sha256="460656189e317e108a489af701fa8f33f13a93d96380788e692a1c68100e0388") version("0.0.13", sha256="460656189e317e108a489af701fa8f33f13a93d96380788e692a1c68100e0388")

View File

@ -13,12 +13,14 @@ class Qoz(CMakePackage):
homepage = git homepage = git
version("2022.04.26", commit="d28a7a8c9f703075441b700202b8a1ee185ded00") version("2022.04.26", commit="d28a7a8c9f703075441b700202b8a1ee185ded00")
version("2023.03.09", commit="537f6a52a39396f9c05e16a12ab160d8dc8b9d56")
maintainers("disheng222") maintainers("disheng222")
depends_on("zstd") depends_on("zstd")
depends_on("gsl") depends_on("gsl")
depends_on("pkgconfig") depends_on("pkgconfig")
depends_on("py-pybind11", when="@2023.03.09:")
def cmake_args(self): def cmake_args(self):
args = ["-DQoZ_USE_BUNDLED_ZSTD=OFF", "-DQoZ_DEBUG_TIMINGS=OFF"] args = ["-DQoZ_USE_BUNDLED_ZSTD=OFF", "-DQoZ_DEBUG_TIMINGS=OFF"]

View File

@ -14,6 +14,8 @@ class RLibpressio(RPackage):
maintainers("robertu94") maintainers("robertu94")
version("1.6.0", sha256="4f8a712e5e84a201373a104e73b10282fcf98f1c7672cc1dd5a2ff07a32d54f6")
version("1.6.0", sha256="4f8a712e5e84a201373a104e73b10282fcf98f1c7672cc1dd5a2ff07a32d54f6") version("1.6.0", sha256="4f8a712e5e84a201373a104e73b10282fcf98f1c7672cc1dd5a2ff07a32d54f6")
version("1.5.0", sha256="6b0e095610f190aad5dded0dbc6c0783893d4d5e773afc80328fc8c5befeff58") version("1.5.0", sha256="6b0e095610f190aad5dded0dbc6c0783893d4d5e773afc80328fc8c5befeff58")
version("1.4.1", sha256="fa9d47c84ddeb4edd9c5250067a87cc1bb549b9b1dd71e2501dd39ee4e171c27") version("1.4.1", sha256="fa9d47c84ddeb4edd9c5250067a87cc1bb549b9b1dd71e2501dd39ee4e171c27")

View File

@ -144,6 +144,9 @@ class Tau(Package):
def set_compiler_options(self, spec): def set_compiler_options(self, spec):
useropt = ["-O2 -g", self.rpath_args] useropt = ["-O2 -g", self.rpath_args]
if self.spec.satisfies("%oneapi"):
useropt.append("-Wno-error=implicit-function-declaration")
########## ##########
# Selecting a compiler with TAU configure is quite tricky: # Selecting a compiler with TAU configure is quite tricky:
# 1 - compilers are mapped to a given set of strings # 1 - compilers are mapped to a given set of strings