Skip to content

Commit

Permalink
dla-future: Add 0.5.0 (spack#44463)
Browse files Browse the repository at this point in the history
* add [email protected]

* [@spackbot] updating style on behalf of rasolca

* fix typo

* review suggestions

---------

Co-authored-by: rasolca <[email protected]>
  • Loading branch information
rasolca and rasolca authored May 31, 2024
1 parent 50fe769 commit 7a5bddf
Showing 1 changed file with 20 additions and 2 deletions.
22 changes: 20 additions & 2 deletions var/spack/repos/builtin/packages/dla-future/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class DlaFuture(CMakePackage, CudaPackage, ROCmPackage):

license("BSD-3-Clause")

version("0.5.0", sha256="f964ee2a96bb58b3f0ee4563ae65fcd136e409a7c0e66beda33f926fc9515a8e")
version("0.4.1", sha256="ba95f26475ad68da1f3a24d091dc1b925525e269e4c83c1eaf1d37d29b526666")
version("0.4.0", sha256="34fd0da0d1a72b6981bed0bba029ba0947e0d0d99beb3e0aad0a478095c9527d")
version("0.3.1", sha256="350a7fd216790182aa52639a3d574990a9d57843e02b92d87b854912f4812bfe")
Expand Down Expand Up @@ -45,6 +46,16 @@ class DlaFuture(CMakePackage, CudaPackage, ROCmPackage):
description="Build C API compatible with ScaLAPACK",
)

variant("mpi_gpu_aware", default=False, when="@0.5.0:", description="Use GPU-aware MPI.")
conflicts("+mpi_gpu_aware", when="~cuda ~rocm", msg="GPU-aware MPI requires +cuda or +rocm")

variant(
"mpi_gpu_force_contiguous",
default=True,
when="@0.5.0: +mpi_gpu_aware",
description="Force GPU communication buffers to be contiguous before communicating.",
)

generator("ninja")

depends_on("[email protected]:", type="build")
Expand Down Expand Up @@ -142,7 +153,7 @@ def cmake_args(self):
args.append(self.define_from_variant("BUILD_SHARED_LIBS", "shared"))

# BLAS/LAPACK
if spec["lapack"].name in INTEL_MATH_LIBRARIES:
if spec.version <= Version("0.4") and spec["lapack"].name in INTEL_MATH_LIBRARIES:
mkl_provider = spec["lapack"].name

vmap = {
Expand Down Expand Up @@ -206,7 +217,7 @@ def cmake_args(self):
)
)
else:
args.append(self.define("DLAF_WITH_MKL", False))
args.append(self.define("DLAF_WITH_MKL", spec["lapack"].name in INTEL_MATH_LIBRARIES))
args.append(
self.define(
"LAPACK_LIBRARY",
Expand All @@ -218,6 +229,13 @@ def cmake_args(self):

args.append(self.define_from_variant("DLAF_WITH_SCALAPACK", "scalapack"))

args.append(self.define_from_variant("DLAF_WITH_MPI_GPU_AWARE", "mpi_gpu_aware"))
args.append(
self.define_from_variant(
"DLAF_WITH_MPI_GPU_FORCE_CONTIGUOUS", "mpi_gpu_force_contiguous"
)
)

# CUDA/HIP
args.append(self.define_from_variant("DLAF_WITH_CUDA", "cuda"))
args.append(self.define_from_variant("DLAF_WITH_HIP", "rocm"))
Expand Down

0 comments on commit 7a5bddf

Please sign in to comment.