From eebfb1cf0795273c4d8ee4e23af886f03f07f6c4 Mon Sep 17 00:00:00 2001 From: Dan Bonachea Date: Wed, 5 Apr 2023 07:55:17 -0400 Subject: UPC++/GASNet-EX 2023.3.0 update (#36629) --- var/spack/repos/builtin/packages/gasnet/package.py | 1 + .../builtin/packages/oneapi-level-zero/package.py | 7 +++++++ var/spack/repos/builtin/packages/upcxx/package.py | 24 +++++++++++++++++++--- 3 files changed, 29 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/gasnet/package.py b/var/spack/repos/builtin/packages/gasnet/package.py index 3dd6c328f6..6917f06626 100644 --- a/var/spack/repos/builtin/packages/gasnet/package.py +++ b/var/spack/repos/builtin/packages/gasnet/package.py @@ -37,6 +37,7 @@ class Gasnet(Package, CudaPackage, ROCmPackage): version("main", branch="stable") version("master", branch="master") + version("2023.3.0", sha256="e1fa783d38a503cf2efa7662be591ca5c2bb98d19ac72a9bc6da457329a9a14f") version("2022.9.2", sha256="2352d52f395a9aa14cc57d82957d9f1ebd928d0a0021fd26c5f1382a06cd6f1d") version("2022.9.0", sha256="6873ff4ad8ebee49da4378f2d78095a6ccc31333d6ae4cd739b9f772af11f936") version("2022.3.0", sha256="91b59aa84c0680c807e00d3d1d8fa7c33c1aed50b86d1616f93e499620a9ba09") diff --git a/var/spack/repos/builtin/packages/oneapi-level-zero/package.py b/var/spack/repos/builtin/packages/oneapi-level-zero/package.py index dd64b96c79..738c9ce062 100644 --- a/var/spack/repos/builtin/packages/oneapi-level-zero/package.py +++ b/var/spack/repos/builtin/packages/oneapi-level-zero/package.py @@ -21,6 +21,13 @@ class OneapiLevelZero(CMakePackage): maintainers("rscohn2") + version("1.9.9", sha256="3d1784e790bbaae5f160b920c07e7dc2941640d9c631aaa668ccfd57aafc7b56") + version("1.9.4", sha256="7f91ed993be1e643c752cf95a319a0fc64113d91ec481fbb8a2f478f433d3380") + version("1.8.12", sha256="9c5d3dd912882abe8e2e3ba72f8c27e2a2d86759ac48f6318a0df091204985eb") + version("1.8.8", sha256="3553ae8fa0d2d69c4210a8f3428bd6612bd8bb8a627faf52c3658a01851e66d2") + version("1.8.5", sha256="b6e9663bbcc53c148d32376998298bec6f7c434ef2218c61fa708963e3a09394") + version("1.8.1", sha256="de9582ca075dbd207113d432c4d70a2daaf9d6904672c707e340d43cf4e114a5") + version("1.8.0", sha256="d4089820ed6338ce1616746498bff9383cd9485568190b7977d7c5bf0bf8297b") version("1.7.15", sha256="c39bb05a8e5898aa6c444e1704105b93d3f1888b9c333f8e7e73825ffbfb2617") version("1.7.9", sha256="b430a7f833a689c899b32172a31c3bca1d16adcad8ff866f240a3a8968433de7") version("1.7.4", sha256="23a3f393f6e8f7ed694e0d3248d1ac1b92f2b6964cdb4d747abc23328050513b") diff --git a/var/spack/repos/builtin/packages/upcxx/package.py b/var/spack/repos/builtin/packages/upcxx/package.py index 63949234a4..3cb89840e8 100644 --- a/var/spack/repos/builtin/packages/upcxx/package.py +++ b/var/spack/repos/builtin/packages/upcxx/package.py @@ -16,7 +16,7 @@ def is_CrayXC(): def is_CrayEX(): - return (spack.platforms.host().name == "cray") and ( + return (spack.platforms.host().name in ["linux", "cray"]) and ( os.environ.get("CRAYPE_NETWORK_TARGET") in ["ofi", "ucx"] ) @@ -47,6 +47,7 @@ class Upcxx(Package, CudaPackage, ROCmPackage): version("develop", branch="develop") version("master", branch="master") + version("2023.3.0", sha256="382af3c093decdb51f0533e19efb4cc7536b6617067b2dd89431e323704a1009") version("2022.9.0", sha256="dbf15fd9ba38bfe2491f556b55640343d6303048a117c4e84877ceddb64e4c7c") version("2022.3.0", sha256="72bccfc9dfab5c2351ee964232b3754957ecfdbe6b4de640e1b1387d45019496") version("2021.9.0", sha256="9299e17602bcc8c05542cdc339897a9c2dba5b5c3838d6ef2df7a02250f42177") @@ -67,12 +68,23 @@ class Upcxx(Package, CudaPackage, ROCmPackage): variant( "cuda", default=False, - description="Enables UPC++ support for the CUDA memory kind.\n" + description="Enables UPC++ support for the CUDA memory kind on NVIDIA GPUs.\n" + "NOTE: Requires CUDA Driver library be present on the build system", + when="@2019.3.0:", + ) + + variant( + "rocm", + default=False, + description="Enables UPC++ support for the ROCm/HIP memory kind on AMD GPUs", + when="@2022.3.0:", ) variant( - "rocm", default=False, description="Enables UPC++ support for the ROCm/HIP memory kind" + "level_zero", + default=False, + description="Enables UPC++ support for the Level Zero memory kind on Intel GPUs", + when="@2023.3.0:", ) variant( @@ -100,6 +112,8 @@ class Upcxx(Package, CudaPackage, ROCmPackage): conflicts("hip@:4.4.0", when="+rocm") + depends_on("oneapi-level-zero@1.8.0:", when="+level_zero") + # All flags should be passed to the build-env in autoconf-like vars flag_handler = env_flags @@ -202,6 +216,10 @@ class Upcxx(Package, CudaPackage, ROCmPackage): "--with-ld-flags=" + self.compiler.cc_rpath_arg + spec["hip"].prefix.lib ) + if "+level_zero" in spec: + options.append("--enable-ze") + options.append("--with-ze-home=" + spec["oneapi-level-zero"].prefix) + env["GASNET_CONFIGURE_ARGS"] = "--enable-rpath " + env["GASNET_CONFIGURE_ARGS"] configure(*options) -- cgit v1.2.3-60-g2f50