Skip to content

Commit 8c7a953

Browse files
abhishek1297abhishek1297
authored
Melissa package updates (spack#1701)
Added new versions of Melissa + Package code cleaning + Removal of conflicts related cuda_arch + Relaxation of `[email protected]:2` Relaxing torch version upper bound and removing conflicts Added cxx as build dep. CMake failed to build without it for some reason.
1 parent ee3b103 commit 8c7a953

File tree

2 files changed

+87
-71
lines changed

2 files changed

+87
-71
lines changed

‎repos/spack_repo/builtin/packages/melissa/package.py‎

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,44 @@ class Melissa(CMakePackage):
1818
# attention: Git**Hub**.com accounts
1919
maintainers("abhishek1297", "raffino")
2020

21-
version("develop", branch="develop")
21+
version("develop", branch="develop", preferred=True)
22+
version("2.2.0", sha256="e805c9ac08de5aa666768d5d92bfc680f064bd9108415a911dfd08ad7b0a3cf3")
23+
version("2.1.1", sha256="6b92852429f13b144860edc37c7914723addabb0ec0bd108929ff567334d3f71")
24+
version("2.1.0", sha256="cf0f105ed5b1da260cc7476aec23df084470b50a61df997c0e457c38948bed93")
25+
version("2.0.1", sha256="a7ff4df75ea09af435b0c28c3fa3cab9335c1c76e1c48757facce36786b4962c")
2226
version("2.0.0", sha256="75957d1933cd9c228a6e8643bc855587162c31f3b0ca94c3f5e0e380d01775dd")
2327

2428
depends_on("c", type="build") # generated
29+
depends_on("cxx", type="build")
2530
depends_on("fortran", type="build") # generated
26-
27-
depends_on("[email protected]:", type="build")
2831
depends_on("pkgconfig", type="build")
2932

30-
depends_on("[email protected]:4", type=("build", "run"))
31-
depends_on("[email protected]:3.12", type=("build", "run"))
32-
depends_on("mpi", type=("build", "run"))
33+
with when("@:2.1.0"):
34+
depends_on("[email protected]:", type="build")
35+
depends_on("[email protected]:3.12", type=("build", "run"))
36+
37+
with when("@2.1.1:"):
38+
depends_on("[email protected]:", type="build")
39+
depends_on("[email protected]:3.12", type=("build", "run"))
40+
41+
with default_args(type=("build", "run")):
42+
depends_on("[email protected]:4")
43+
depends_on("mpi")
44+
45+
def setup_build_environment(self, env):
46+
zmq_pkgconfig_path = self.spec["libzmq"].prefix.lib.pkgconfig
47+
env.prepend_path("PKG_CONFIG_PATH", zmq_pkgconfig_path)
3348

3449
def cmake_args(self):
3550
args = []
3651

37-
# embed runtime library search paths
38-
rpaths = [self.spec["libzmq"].prefix.lib, self.spec["mpi"].prefix.lib]
39-
joined_rpaths = ";".join(rpaths)
52+
if self.spec.satisfies("@:2.0.0"):
53+
# embed runtime library search paths
54+
rpaths = [self.spec["libzmq"].prefix.lib, self.spec["mpi"].prefix.lib]
55+
joined_rpaths = ";".join(rpaths)
4056

41-
args.append(f"-DCMAKE_INSTALL_RPATH={joined_rpaths}")
42-
args.append("-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON")
57+
args.append(f"-DCMAKE_INSTALL_RPATH={joined_rpaths}")
58+
args.append("-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON")
4359

4460
return args
4561

‎repos/spack_repo/builtin/packages/py_melissa_core/package.py‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ class PyMelissaCore(PythonPackage, CudaPackage):
2222

2323
license("BSD-3-Clause")
2424

25-
version("develop", branch="develop")
25+
version("develop", branch="develop", preferred=True)
26+
version("2.2.0", sha256="e805c9ac08de5aa666768d5d92bfc680f064bd9108415a911dfd08ad7b0a3cf3")
27+
version("2.1.1", sha256="6b92852429f13b144860edc37c7914723addabb0ec0bd108929ff567334d3f71")
28+
version("2.1.0", sha256="cf0f105ed5b1da260cc7476aec23df084470b50a61df997c0e457c38948bed93")
29+
version("2.0.1", sha256="a7ff4df75ea09af435b0c28c3fa3cab9335c1c76e1c48757facce36786b4962c")
2630
version("2.0.0", sha256="75957d1933cd9c228a6e8643bc855587162c31f3b0ca94c3f5e0e380d01775dd")
2731

2832
# define variants for the deep learning server (torch, tf)
@@ -35,67 +39,63 @@ class PyMelissaCore(PythonPackage, CudaPackage):
3539
when="~torch",
3640
description="Install Deep Learning requirements with TensorFlow only",
3741
)
38-
# ==============================
39-
# Base dependencies
40-
# ==============================
42+
43+
# ============================================================
44+
# Base dependencies
45+
# ============================================================
46+
4147
depends_on("c", type="build") # generated
48+
depends_on("cxx", type="build")
4249
depends_on("fortran", type="build") # generated
43-
44-
depends_on("[email protected]:3.12", type=("build", "run"))
4550
depends_on("[email protected]:", type="build")
46-
depends_on("[email protected]:", type="run")
47-
depends_on("[email protected]:3", type="run")
48-
depends_on("[email protected]:1", type="run")
49-
depends_on("[email protected]:", type="run")
50-
depends_on("[email protected]:", type="run")
51-
depends_on("[email protected]:1", type="run")
52-
depends_on("[email protected]:", type="run")
53-
depends_on("[email protected]:", type="run")
54-
depends_on("[email protected]:", type="run")
55-
depends_on("py-psutil@5:", type="run")
56-
# ==============================
57-
# DL dependencies
58-
# ==============================
51+
52+
with default_args(type=("build", "run")):
53+
depends_on("[email protected]:3.12", when="@:2.1.0")
54+
depends_on("[email protected]:3.12", when="@2.1.1:")
55+
56+
with default_args(type="run"):
57+
depends_on("[email protected]:")
58+
depends_on("[email protected]:3")
59+
depends_on("[email protected]:1")
60+
depends_on("[email protected]:")
61+
depends_on("[email protected]:")
62+
depends_on("[email protected]:1")
63+
depends_on("[email protected]:")
64+
depends_on("[email protected]:")
65+
depends_on("[email protected]:")
66+
depends_on("py-psutil@5:")
67+
68+
# ============================================================
69+
# DL dependencies
70+
# ============================================================
71+
5972
for framework in ["+tf", "+torch"]:
60-
conflicts(
61-
"%gcc@:9",
62-
when=framework,
63-
msg=f"GCC must be greater than version 9 when using {framework}",
64-
)
65-
depends_on("[email protected]:2", type="run", when=framework)
66-
depends_on("py-matplotlib", type="run", when=framework)
67-
depends_on("py-pandas", type="run", when=framework)
68-
# WARNING: If using a gcc compiler, then support with AVX512-VNNI is
69-
# expected for bazel source builds.
70-
# The instruction set comes with binutils. If you are installing a gcc
71-
# through spack then do spack install `gcc+binutils`
72-
depends_on("[email protected]:", type="build", when=f"{framework} %gcc")
73-
74-
# WARNING: do not change the upper limit for tensorflow beyond 2.17, which requires
75-
# AVX-VNNI-INT8 support.
76-
# Check cpu flags to ensure if avxvnniint8 is available on your machine,
77-
# if you want to increase the upper limit.
78-
depends_on("[email protected]:2.17 ~cuda", type="run", when="+tf ~cuda")
79-
depends_on("[email protected]:2.6 ~cuda", type="run", when="+torch ~cuda")
80-
81-
# ==============================
82-
# CUDA dependencies
83-
# ==============================
84-
for arch in CudaPackage.cuda_arch_values:
85-
# Support beyond ampere (A100) GPUs hasn't been tested yet.
86-
# FIXME: free to modify and test
87-
if arch.isdigit() and 60 <= int(arch) <= 80:
73+
with when(framework):
74+
conflicts("%gcc@:9", msg=f"GCC must be greater than version 9 when using {framework}")
75+
76+
with default_args(type="run"):
77+
depends_on("[email protected]:2")
78+
depends_on("py-matplotlib")
79+
depends_on("py-pandas")
80+
81+
depends_on("[email protected]:", type="build", when="%gcc")
82+
83+
# ============================================================
84+
# Frameworks with/out CUDA
85+
# ============================================================
86+
87+
with default_args(type="run"):
88+
# Without CUDA
89+
with when("~cuda"):
90+
# WARNING: Do not set tensorflow upper limit above 2.17.
91+
# Versions >2.17 require AVX-VNNI-INT8 CPU support.
92+
# Check your CPU flags for 'avxvnniint8' before increasing.
93+
depends_on("[email protected]:2.17 ~cuda", when="+tf")
94+
depends_on("[email protected]:2 ~cuda", when="+torch")
95+
96+
# With CUDA
97+
for arch in CudaPackage.cuda_arch_values:
8898
cuda_specs = f"+cuda cuda_arch={arch}"
89-
depends_on(f"nccl {cuda_specs}", when=cuda_specs) # it is set by default
90-
depends_on(
91-
f"[email protected]:2.17 {cuda_specs}", type="run", when=f"+tf {cuda_specs}"
92-
)
93-
depends_on(
94-
f"[email protected]:2.6 {cuda_specs}", type="run", when=f"+torch {cuda_specs}"
95-
)
96-
else:
97-
conflicts(
98-
f"+cuda cuda_arch={arch}",
99-
msg="Support beyond Ampere GPUs has not been tested yet. "
100-
"Accepted values are between 60 and 80 inclusive.",
101-
)
99+
with when(cuda_specs):
100+
depends_on(f"[email protected]:2.17+nccl{cuda_specs}", when="+tf")
101+
depends_on(f"[email protected]:2+cudnn+nccl{cuda_specs}", when="+torch")

0 commit comments

Comments
 (0)