aws-ofi-nccl package: add versions including 1.8.1 (#43305)

The default url couldn't be the one with v0.0.0-aws since spack was
replacing v0.0.0-aws with v<version_number> for example, deleting the
-aws suffix. I used the url_for_version method to specify this suffix.

1 files changed, 17 insertions, 3 deletions

diff --git a/var/spack/repos/builtin/packages/aws-ofi-nccl/package.py b/var/spack/repos/builtin/packages/aws-ofi-nccl/package.py
index 003ad30817..c128a1033f 100644
--- a/var/spack/repos/builtin/packages/aws-ofi-nccl/package.py
+++ b/var/spack/repos/builtin/packages/aws-ofi-nccl/package.py
@@ -12,12 +12,19 @@ class AwsOfiNccl(AutotoolsPackage):
     applications."""
 
     homepage = "https://github.com/aws/aws-ofi-nccl"
+    url = "https://github.com/aws/aws-ofi-nccl/archive/v0.0.0.tar.gz"
     git = "https://github.com/aws/aws-ofi-nccl.git"
-    url = "https://github.com/aws/aws-ofi-nccl.git"
 
     maintainers("bvanessen")
 
     version("master", branch="master")
+    version("1.8.1", sha256="beb59959be0f60b891f9549f4df51b394e97e739416c88c3436e75516fe067c8")
+    version("1.8.0", sha256="a2f1750d4908924985335e513186353d0c4d9a5d27b1a759f6aa31a10e74c06d")
+    version("1.7.4", sha256="472bbc977ce37d0cf9239b8e366f4f247226a984eb8c487aadd884af53f00e13")
+    version("1.7.3", sha256="7a49b530eb0fa5e262c1fcf3412289bc1d538c15290435c579d5e7f08d806fd4")
+    version("1.7.2", sha256="c89bbe5fa49a7036eb873c01c8fdc5693238ae010ddcaf10b10fdc88aec6e56a")
+    version("1.7.1", sha256="d50a160c7aba76445e5c895fba0f3dbfdec51f702d218168a5e5017806cf0fb0")
+    version("1.6.0", sha256="19a6fc91afe9a317fd3154c897fa219eab48fcdddefa66d881f1843c1165f7ee")
 
     variant("trace", default=False, description="Enable printing trace messages")
     variant("tests", default=False, description="Build tests")
@@ -26,11 +33,17 @@ class AwsOfiNccl(AutotoolsPackage):
     depends_on("cuda")
     depends_on("nccl")
     depends_on("mpi")
-    depends_on("hwloc")
+    depends_on("hwloc", when="@1.7:")
     depends_on("autoconf", type="build")
     depends_on("automake", type="build")
     depends_on("libtool", type="build")
 
+    def url_for_version(self, version):
+        if version < Version("1.7.0"):
+            return super().url_for_version(version)
+        url_fmt = "https://github.com/aws/aws-ofi-nccl/archive/v{0}-aws.tar.gz"
+        return url_fmt.format(version)
+
     # To enable this plug-in to work with NCCL add it to the LD_LIBRARY_PATH
     def setup_run_environment(self, env):
         aws_ofi_nccl_home = self.spec.prefix
@@ -53,9 +66,10 @@ class AwsOfiNccl(AutotoolsPackage):
                 "--with-cuda={0}".format(spec["cuda"].prefix),
                 "--with-nccl={0}".format(spec["nccl"].prefix),
                 "--with-mpi={0}".format(spec["mpi"].prefix),
-                "--with-hwloc={0}".format(spec["hwloc"].prefix),
             ]
         )
+        if spec.satisfies("@1.7:"):
+            args.extend(["--with-hwloc={0}".format(spec["hwloc"].prefix)])
 
         args.extend(self.enable_or_disable("trace"))
         args.extend(self.enable_or_disable("tests"))