diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/aluminum/package.py | 93 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/lbann/package.py | 80 |
2 files changed, 144 insertions, 29 deletions
diff --git a/var/spack/repos/builtin/packages/aluminum/package.py b/var/spack/repos/builtin/packages/aluminum/package.py index dc4a6cfc76..8946146ac4 100644 --- a/var/spack/repos/builtin/packages/aluminum/package.py +++ b/var/spack/repos/builtin/packages/aluminum/package.py @@ -18,25 +18,87 @@ class Aluminum(CMakePackage, CudaPackage, ROCmPackage): situations.""" homepage = "https://github.com/LLNL/Aluminum" - url = "https://github.com/LLNL/Aluminum/archive/v0.1.tar.gz" + url = "https://github.com/LLNL/Aluminum/archive/v1.0.0.tar.gz" git = "https://github.com/LLNL/Aluminum.git" tags = ["ecp", "radiuss"] maintainers("bvanessen") version("master", branch="master") + version("1.3.0", sha256="d0442efbebfdfb89eec793ae65eceb8f1ba65afa9f2e48df009f81985a4c27e3") + version("1.2.3", sha256="9b214bdf30f9b7e8e017f83e6615db6be2631f5be3dd186205dbe3aa62f4018a") + version( + "1.2.2", + sha256="c01d9dd98be4cab9b944bae99b403abe76d65e9e1750e7f23bf0105636ad5485", + deprecated=True, + ) + version( + "1.2.1", + sha256="869402708c8a102a67667b83527b4057644a32b8cdf4990bcd1a5c4e5f0e30af", + deprecated=True, + ) + version( + "1.2.0", + sha256="2f3725147f4dbc045b945af68d3d747f5dffbe2b8e928deed64136785210bc9a", + deprecated=True, + ) + version( + "1.1.0", + sha256="78b03e36e5422e8651f400feb4d8a527f87302db025d77aa37e223be6b9bdfc9", + deprecated=True, + ) version("1.0.0-lbann", tag="v1.0.0-lbann") version("1.0.0", sha256="028d12e271817214db5c07c77b0528f88862139c3e442e1b12f58717290f414a") - version("0.7.0", sha256="bbb73d2847c56efbe6f99e46b41d837763938483f2e2d1982ccf8350d1148caa") - version("0.6.0", sha256="6ca329951f4c7ea52670e46e5020e7e7879d9b56fed5ff8c5df6e624b313e925") - version("0.5.0", sha256="dc365a5849eaba925355a8efb27005c5f22bcd1dca94aaed8d0d29c265c064c1") - version("0.4.0", sha256="4d6fab5481cc7c994b32fb23a37e9ee44041a9f91acf78f981a97cb8ef57bb7d") - version("0.3.3", sha256="26e7f263f53c6c6ee0fe216e981a558dfdd7ec997d0dd2a24285a609a6c68f3b") - version("0.3.2", sha256="09b6d1bcc02ac54ba269b1123eee7be20f0104b93596956c014b794ba96b037f") - version("0.2.1-1", sha256="066b750e9d1134871709a3e2414b96b166e0e24773efc7d512df2f1d96ee8eef") - version("0.2.1", sha256="3d5d15853cccc718f60df68205e56a2831de65be4d96e7f7e8497097e7905f89") - version("0.2", sha256="fc8f06c6d8faab17a2aedd408d3fe924043bf857da1094d5553f35c4d2af893b") - version("0.1", sha256="3880b736866e439dd94e6a61eeeb5bb2abccebbac82b82d52033bc6c94950bdb") + version( + "0.7.0", + sha256="bbb73d2847c56efbe6f99e46b41d837763938483f2e2d1982ccf8350d1148caa", + deprecated=True, + ) + version( + "0.6.0", + sha256="6ca329951f4c7ea52670e46e5020e7e7879d9b56fed5ff8c5df6e624b313e925", + deprecated=True, + ) + version( + "0.5.0", + sha256="dc365a5849eaba925355a8efb27005c5f22bcd1dca94aaed8d0d29c265c064c1", + deprecated=True, + ) + version( + "0.4.0", + sha256="4d6fab5481cc7c994b32fb23a37e9ee44041a9f91acf78f981a97cb8ef57bb7d", + deprecated=True, + ) + version( + "0.3.3", + sha256="26e7f263f53c6c6ee0fe216e981a558dfdd7ec997d0dd2a24285a609a6c68f3b", + deprecated=True, + ) + version( + "0.3.2", + sha256="09b6d1bcc02ac54ba269b1123eee7be20f0104b93596956c014b794ba96b037f", + deprecated=True, + ) + version( + "0.2.1-1", + sha256="066b750e9d1134871709a3e2414b96b166e0e24773efc7d512df2f1d96ee8eef", + deprecated=True, + ) + version( + "0.2.1", + sha256="3d5d15853cccc718f60df68205e56a2831de65be4d96e7f7e8497097e7905f89", + deprecated=True, + ) + version( + "0.2", + sha256="fc8f06c6d8faab17a2aedd408d3fe924043bf857da1094d5553f35c4d2af893b", + deprecated=True, + ) + version( + "0.1", + sha256="3880b736866e439dd94e6a61eeeb5bb2abccebbac82b82d52033bc6c94950bdb", + deprecated=True, + ) variant("nccl", default=False, description="Builds with support for NCCL communication lib") variant( @@ -149,10 +211,11 @@ class Aluminum(CMakePackage, CudaPackage, ROCmPackage): archs = self.spec.variants["amdgpu_target"].value if archs != "none": arch_str = ",".join(archs) - args.append( - "-DHIP_HIPCC_FLAGS=--amdgpu-target={0}" - " -g -fsized-deallocation -fPIC -std=c++17".format(arch_str) - ) + if spec.satisfies("%rocmcc@:5"): + args.append( + "-DHIP_HIPCC_FLAGS=--amdgpu-target={0}" + " -g -fsized-deallocation -fPIC -std=c++17".format(arch_str) + ) args.extend( [ "-DCMAKE_HIP_ARCHITECTURES=%s" % arch_str, diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index e8d47c0f1b..366a12ebb2 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -24,19 +24,71 @@ class Lbann(CMakePackage, CudaPackage, ROCmPackage): version("develop", branch="develop") version("0.102", sha256="3734a76794991207e2dd2221f05f0e63a86ddafa777515d93d99d48629140f1a") - version("0.101", sha256="69d3fe000a88a448dc4f7e263bcb342c34a177bd9744153654528cd86335a1f7") - version("0.100", sha256="d1bab4fb6f1b80ae83a7286cc536a32830890f6e5b0c3107a17c2600d0796912") - version("0.99", sha256="3358d44f1bc894321ce07d733afdf6cb7de39c33e3852d73c9f31f530175b7cd") - version("0.98.1", sha256="9a2da8f41cd8bf17d1845edf9de6d60f781204ebd37bffba96d8872036c10c66") - version("0.98", sha256="8d64b9ac0f1d60db553efa4e657f5ea87e790afe65336117267e9c7ae6f68239") - version("0.97.1", sha256="2f2756126ac8bb993202cf532d72c4d4044e877f4d52de9fdf70d0babd500ce4") - version("0.97", sha256="9794a706fc7ac151926231efdf74564c39fbaa99edca4acb745ee7d20c32dae7") - version("0.96", sha256="97af78e9d3c405e963361d0db96ee5425ee0766fa52b43c75b8a5670d48e4b4a") - version("0.95", sha256="d310b986948b5ee2bedec36383a7fe79403721c8dc2663a280676b4e431f83c2") - version("0.94", sha256="567e99b488ebe6294933c98a212281bffd5220fc13a0a5cd8441f9a3761ceccf") - version("0.93", sha256="77bfd7fe52ee7495050f49bcdd0e353ba1730e3ad15042c678faa5eeed55fb8c") - version("0.92", sha256="9187c5bcbc562c2828fe619d53884ab80afb1bcd627a817edb935b80affe7b84") - version("0.91", sha256="b69f470829f434f266119a33695592f74802cff4b76b37022db00ab32de322f5") + version( + "0.101", + sha256="69d3fe000a88a448dc4f7e263bcb342c34a177bd9744153654528cd86335a1f7", + deprecated=True, + ) + version( + "0.100", + sha256="d1bab4fb6f1b80ae83a7286cc536a32830890f6e5b0c3107a17c2600d0796912", + deprecated=True, + ) + version( + "0.99", + sha256="3358d44f1bc894321ce07d733afdf6cb7de39c33e3852d73c9f31f530175b7cd", + deprecated=True, + ) + version( + "0.98.1", + sha256="9a2da8f41cd8bf17d1845edf9de6d60f781204ebd37bffba96d8872036c10c66", + deprecated=True, + ) + version( + "0.98", + sha256="8d64b9ac0f1d60db553efa4e657f5ea87e790afe65336117267e9c7ae6f68239", + deprecated=True, + ) + version( + "0.97.1", + sha256="2f2756126ac8bb993202cf532d72c4d4044e877f4d52de9fdf70d0babd500ce4", + deprecated=True, + ) + version( + "0.97", + sha256="9794a706fc7ac151926231efdf74564c39fbaa99edca4acb745ee7d20c32dae7", + deprecated=True, + ) + version( + "0.96", + sha256="97af78e9d3c405e963361d0db96ee5425ee0766fa52b43c75b8a5670d48e4b4a", + deprecated=True, + ) + version( + "0.95", + sha256="d310b986948b5ee2bedec36383a7fe79403721c8dc2663a280676b4e431f83c2", + deprecated=True, + ) + version( + "0.94", + sha256="567e99b488ebe6294933c98a212281bffd5220fc13a0a5cd8441f9a3761ceccf", + deprecated=True, + ) + version( + "0.93", + sha256="77bfd7fe52ee7495050f49bcdd0e353ba1730e3ad15042c678faa5eeed55fb8c", + deprecated=True, + ) + version( + "0.92", + sha256="9187c5bcbc562c2828fe619d53884ab80afb1bcd627a817edb935b80affe7b84", + deprecated=True, + ) + version( + "0.91", + sha256="b69f470829f434f266119a33695592f74802cff4b76b37022db00ab32de322f5", + deprecated=True, + ) variant("al", default=True, description="Builds with support for Aluminum Library") variant( @@ -157,7 +209,7 @@ class Lbann(CMakePackage, CudaPackage, ROCmPackage): depends_on("aluminum@0.5.0:", when="@:0.90,0.102: +al") # Add Aluminum variants - depends_on("aluminum +cuda +nccl +cuda_rma", when="+al +cuda") + depends_on("aluminum +cuda +nccl", when="+al +cuda") depends_on("aluminum +rocm +rccl", when="+al +rocm") depends_on("dihydrogen@0.2.0:", when="@:0.90,0.102:") |