nccl, aws-ofi-nccl: add new versions and add rocm support to aws-ofi-nccl

repos/spack_repo/builtin/packages/aws_ofi_nccl/package.py

@@ -19,6 +19,8 @@ class AwsOfiNccl(AutotoolsPackage):
     maintainers("bvanessen", "msimberg")
 
     version("master", branch="master")
+    version("1.18.0", sha256="12fd67f05872600c485d74b8e3c3a640d063322371170f3a9c17d67a5a2ca681")
+    version("1.17.3", sha256="0b3313e9ad48226cb143c8f1dead60bcd59a8083e582558ee44a438d58cc23c1")
     version("1.17.2", sha256="6676f49cdfbaa10e953f18aad55f25812e0a7e716692bc911a69fd55cab42181")
     version("1.17.1", sha256="15a3b5db51075d20b2cb255b99668a7161779fdf5455436e3bea02d59a04685a")
     version("1.17.0", sha256="45a383ffca1e17866e290247e4a314d190aeee09c5380b983a62633168765ec1")
@@ -47,15 +49,21 @@ class AwsOfiNccl(AutotoolsPackage):
     version("1.7.1", sha256="d50a160c7aba76445e5c895fba0f3dbfdec51f702d218168a5e5017806cf0fb0")
     version("1.6.0", sha256="19a6fc91afe9a317fd3154c897fa219eab48fcdddefa66d881f1843c1165f7ee")
 
+    variant("cuda", default=True, description="Enable CUDA support")
+    variant("rocm", default=False, description="Enable ROCm support", when="@1.18:")
     variant("trace", default=False, description="Enable printing trace messages")
     variant("tests", default=False, description="Build tests")
 
+    conflicts("+cuda +rocm", msg="CUDA and ROCm support are mutually exclusive")
+    conflicts("~cuda ~rocm", msg="Either CUDA or ROCm support must be enabled")
+
     depends_on("c", type="build")
     depends_on("cxx", type="build", when="@1.15:")
 
     depends_on("libfabric")
-    depends_on("cuda")
-    depends_on("nccl fabrics=auto")
+    depends_on("cuda", when="+cuda")
+    depends_on("nccl fabrics=auto", when="+cuda")
+    depends_on("hip", when="+rocm")
     depends_on("mpi")
     depends_on("hwloc", when="@1.7:")
     depends_on("autoconf", type="build")
@@ -89,11 +97,16 @@ def configure_args(self):
         args.extend(
             [
                 "--with-libfabric={0}".format(spec["libfabric"].prefix),
-                "--with-cuda={0}".format(spec["cuda"].prefix),
-                "--with-nccl={0}".format(spec["nccl"].prefix),
                 "--with-mpi={0}".format(spec["mpi"].prefix),
             ]
         )
+        if spec.satisfies("+cuda"):
+            args.extend(
+                "--with-cuda={0}".format(spec["cuda"].prefix),
+                "--with-nccl={0}".format(spec["nccl"].prefix),
+            )
+        if spec.satisfies("+rocm"):
+            args.extend(["--with-rocm={0}".format(spec["hip"].prefix)])
         if spec.satisfies("@1.7:"):
             args.extend(["--with-hwloc={0}".format(spec["hwloc"].prefix)])
 

repos/spack_repo/builtin/packages/nccl/package.py

@@ -19,6 +19,8 @@ class Nccl(MakefilePackage, CudaPackage):
     maintainers("msimberg")
     libraries = ["libnccl.so"]
 
+    version("2.29.7-1", sha256="e67239212c395bfdb398a7519491840d06fdf6b599c299f97c7ed0109777bba1")
+    version("2.29.3-1", sha256="d1dffc5e9dd059985704f98ff3d8b7e6cf62d20c10a181d427a4e3233f8148f1")
     version("2.29.2-1", sha256="063e20649c4cfa01e789b4dc73514dbb5d73f9518e426823dab53316415e071b")
     version("2.28.9-1", sha256="f349860336c6b7fb97b22bed9c729142f3531a0e82826c1204d01e44af8b9cb9")
     version("2.28.7-1", sha256="1d2d1dd53e6c6bb42c200d9b934fa31fd528cbf3c6443581519aa628fcbd618a")