From c03979c74b396ae864b007bbb18cd0102f1cd920 Mon Sep 17 00:00:00 2001 From: Cody Balos Date: Tue, 4 Oct 2022 06:25:53 -0700 Subject: superlu-dist: add 8.1.0 and 8.0.0 versions (#32558) --- .../repos/builtin/packages/superlu-dist/package.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/var/spack/repos/builtin/packages/superlu-dist/package.py b/var/spack/repos/builtin/packages/superlu-dist/package.py index 4a44da5802..21a5da1542 100644 --- a/var/spack/repos/builtin/packages/superlu-dist/package.py +++ b/var/spack/repos/builtin/packages/superlu-dist/package.py @@ -20,6 +20,9 @@ class SuperluDist(CMakePackage, CudaPackage, ROCmPackage): version("develop", branch="master") version("amd", branch="amd") + version("8.1.1", sha256="766d70b84ece79d88249fe10ff51d2a397a29f274d9fd1e4a4ac39179a9ef23f") + version("8.1.0", sha256="9308844b99a7e762d5704934f7e9f79daf158b0bfc582994303c2e0b31518b34") + version("8.0.0", sha256="ad0682ef425716d5880c7f7c905a8701428b09c82ceaf87b3c386ff4d70efb05") version("7.2.0", sha256="20b60bd8a3d88031c9ce6511ae9700b7a8dcf12e2fd704e74b1af762b3468b8c") version("7.1.1", sha256="558053b3d4a56eb661c4f04d4fcab6604018ce5db97115394c161b56c9c278ff") version("7.1.0", sha256="edbea877562be95fb22c7de1ff484f18685bec4baa8e4f703c414d3c035d4a66") @@ -53,8 +56,10 @@ class SuperluDist(CMakePackage, CudaPackage, ROCmPackage): depends_on("mpi") depends_on("blas") depends_on("lapack") - depends_on("parmetis") - depends_on("metis@5:") + depends_on("parmetis +int64", when="+int64") + depends_on("metis@5: +int64", when="+int64") + depends_on("parmetis ~int64", when="~int64") + depends_on("metis@5: ~int64", when="~int64") depends_on("cmake@3.18.1:", type="build", when="@7.1.0:") depends_on("hipblas", when="+rocm") depends_on("rocsolver", when="+rocm") @@ -81,8 +86,8 @@ class SuperluDist(CMakePackage, CudaPackage, ROCmPackage): append_define("CMAKE_C_COMPILER", spec["mpi"].mpicc) append_define("CMAKE_CXX_COMPILER", spec["mpi"].mpicxx) - append_define("CMAKE_INSTALL_LIBDIR:STRING", self.prefix.lib) - append_define("CMAKE_INSTALL_BINDIR:STRING", self.prefix.bin) + append_define("CMAKE_INSTALL_LIBDIR", self.prefix.lib) + append_define("CMAKE_INSTALL_BINDIR", self.prefix.bin) append_define("TPL_BLAS_LIBRARIES", spec["blas"].libs) append_define("TPL_LAPACK_LIBRARIES", spec["lapack"].libs) append_define("TPL_ENABLE_LAPACKLIB", True) @@ -113,12 +118,9 @@ class SuperluDist(CMakePackage, CudaPackage, ROCmPackage): if "+cuda" in spec: append_define("TPL_ENABLE_CUDALIB", True) - append_define( - "TPL_CUDA_LIBRARIES", "-L%s -lcublas -lcudart" % spec["cuda"].libs.directories[0] - ) cuda_arch = spec.variants["cuda_arch"].value if cuda_arch[0] != "none": - append_define("CMAKE_CUDA_FLAGS", "-arch=sm_" + cuda_arch[0]) + append_define("CMAKE_CUDA_ARCHITECTURES", cuda_arch[0]) if "+rocm" in spec and spec.satisfies("@amd"): append_define("TPL_ENABLE_HIPLIB", True) -- cgit v1.2.3-70-g09d2