Compare commits

...

6 Commits

Author SHA1 Message Date
Massimiliano Culpo
8c436c8ed1 asio: remove self-referential dependencies (#42469)
These shouldn't be an issue, but they can be expressed
in terms of variants on the package.
2024-02-08 12:06:13 -08:00
eugeneswalker
2064934ed3 hydrogen@1.5.3: cmake patch with ESCAPE_QUOTES (#42325) 2024-01-31 09:02:28 -08:00
wspear
c5467ef1c4 Update tau 2.33.1 hash (#42336) 2024-01-28 09:45:21 -08:00
wspear
8b59d58ca6 pdt 3.25.2
Add support for -icpx for oneapi
2024-01-26 18:23:34 -08:00
wspear
09074727bf Add tau 2.33.1 2024-01-26 18:23:30 -08:00
eugeneswalker
f562ffba72 xyce: break blis circularity in depends_on 2024-01-26 09:39:11 -08:00
6 changed files with 28 additions and 7 deletions

View File

@ -83,13 +83,11 @@ class Asio(AutotoolsPackage):
variant("separate_compilation", default=False, description="Compile Asio sources separately")
variant("boost_coroutine", default=False, description="Enable support for Boost.Coroutine.")
depends_on("boost +context +coroutine", when="+boost_coroutine")
variant("boost_regex", default=False, description="Enable support for Boost.Regex.")
depends_on("boost +regex", when="+boost_regex")
for std in stds:
depends_on("boost cxxstd=" + std, when="cxxstd={0} ^boost".format(std))
depends_on(f"boost +regex cxxstd={std}", when=f"cxxstd={std} +boost_regex")
depends_on(f"boost +context+coroutine cxxstd={std}", when=f"cxxstd={std} +boost_coroutine")
def configure_args(self):
variants = self.spec.variants

View File

@ -0,0 +1,12 @@
diff -ruN spack-src/CMakeLists.txt spack-src-patched/CMakeLists.txt
--- spack-src/CMakeLists.txt 2023-11-07 21:54:14.000000000 +0000
+++ spack-src-patched/CMakeLists.txt 2024-01-26 19:32:52.140539356 +0000
@@ -515,7 +515,7 @@
# docs (which has the advantage that preprocessing will take
# "{,hydrogen_}config.h" into consideration).
configure_file("${PROJECT_SOURCE_DIR}/cmake/configure_files/config.h.in"
- "${PROJECT_BINARY_DIR}/include/El/config.h")
+ "${PROJECT_BINARY_DIR}/include/El/config.h" ESCAPE_QUOTES)
configure_file("${PROJECT_SOURCE_DIR}/cmake/configure_files/hydrogen_config.h.in"
"${PROJECT_BINARY_DIR}/include/El/hydrogen_config.h")
configure_file("${PROJECT_SOURCE_DIR}/doxy/Doxyfile.in"

View File

@ -130,6 +130,10 @@ class Hydrogen(CachedCMakePackage, CudaPackage, ROCmPackage):
depends_on("llvm-openmp", when="%apple-clang +openmp")
# Fixes https://github.com/spack/spack/issues/42286
# https://github.com/LLNL/Elemental/pull/177
patch("cmake-intel-mpi-escape-quotes-pr177.patch", when="@1.5.3")
@property
def libs(self):
shared = True if "+shared" in self.spec else False

View File

@ -26,6 +26,7 @@ class Pdt(AutotoolsPackage):
license("GPL-2.0-only")
version("3.25.2", sha256="01c2d403bc6672b2b264a182c325806541066c5ed5713878eb598f5506428cbe")
version("3.25.1", sha256="0b6f8a6b8769c181b2ae6cae7298f04b8e3e3d68066f598ed24574e19500bc97")
version("3.25", sha256="1037628d854edfeded3d847150d3e8fbd3774e8146407ce32f5021c80f6299be")
version("3.24", sha256="4a2bb31f3f7f2e52ed49d9b7189ade05170a4386ef76771280a06e8b3ca97ab2")
@ -50,8 +51,13 @@ def configure(self, spec, prefix):
options = ["-prefix=%s" % prefix]
if self.compiler.name == "xl":
options.append("-XLC")
elif self.compiler.name == "intel" or self.compiler.name == "oneapi":
elif self.compiler.name == "intel":
options.append("-icpc")
elif self.compiler.name == "oneapi":
if spec.satisfies("@3.25.2:"):
options.append("-icpx")
else:
options.append("-icpc")
elif self.compiler.name == "pgi":
options.append("-pgCC")
elif self.compiler.name == "gcc":

View File

@ -28,6 +28,7 @@ class Tau(Package):
license("MIT")
version("master", branch="master")
version("2.33.1", sha256="13cc5138e110932f34f02ddf548db91d8219ccb7ff9a84187f0790e40a502403")
version("2.33", sha256="04d9d67adb495bc1ea56561f33c5ce5ba44f51cc7f64996f65bd446fac5483d9")
version("2.32.1", sha256="0eec3de46b0873846dfc639270c5e30a226b463dd6cb41aa12e975b7563f0eeb")
version("2.32", sha256="ee774a06e30ce0ef0f053635a52229152c39aba4f4933bed92da55e5e13466f3")

View File

@ -138,8 +138,8 @@ class Xyce(CMakePackage):
depends_on("armpl-gcc~shared", when="^armpl-gcc")
depends_on("atlas~shared", when="^atlas")
depends_on("blis libs=static", when="^blis+cblas")
depends_on("blis libs=static", when="^blis+blas")
depends_on("blis libs=static", when="^[virtuals=blas] blis+cblas")
depends_on("blis libs=static", when="^[virtuals=blas] blis+blas")
depends_on("clblast~shared", when="^clblast+netlib")
depends_on("intel-mkl~shared", when="^intel-mkl")
depends_on("intel-oneapi-mkl~shared", when="^intel-oneapi-mkl")