From c6d7557484d5082d4332af2a0bd25dcac867664c Mon Sep 17 00:00:00 2001 From: renjithravindrankannath <94420380+renjithravindrankannath@users.noreply.github.com> Date: Wed, 21 Sep 2022 15:48:23 -0700 Subject: Update the version details for rccl, rvs, rocm-tensile rocm-5.2.3 release (#32741) * ROCm 5.2.3 release changes * Patch file for rccl Co-authored-by: Tamara Dahlgren <35777542+tldahlgren@users.noreply.github.com> --- .../0003-Fix-numactl-rocm-smi-path-issue.patch | 25 ++++++++++++++++++++++ var/spack/repos/builtin/packages/rccl/package.py | 10 ++++++--- .../repos/builtin/packages/rocm-tensile/package.py | 7 ++++-- .../packages/rocm-validation-suite/package.py | 4 +++- 4 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 var/spack/repos/builtin/packages/rccl/0003-Fix-numactl-rocm-smi-path-issue.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/rccl/0003-Fix-numactl-rocm-smi-path-issue.patch b/var/spack/repos/builtin/packages/rccl/0003-Fix-numactl-rocm-smi-path-issue.patch new file mode 100644 index 0000000000..1451e54583 --- /dev/null +++ b/var/spack/repos/builtin/packages/rccl/0003-Fix-numactl-rocm-smi-path-issue.patch @@ -0,0 +1,25 @@ +From 5d40f88d3af525326aaeae052f0e7345445336d8 Mon Sep 17 00:00:00 2001 +From: Renjith Ravindran +Date: Wed, 21 Sep 2022 05:42:54 +0000 +Subject: [PATCH] 5.2.3 changes for spack + +--- + CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 79e0a35..21f2a54 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -123,6 +123,8 @@ include_directories(src) + include_directories(src/include) + include_directories(src/collectives) + include_directories(src/collectives/device) ++include_directories(${NUMACTL_DIR}/include) ++link_directories(${NUMACTL_DIR}/lib) + + # Create git version file + # _git_version.cpp is a dummy output to force re-run prior to build +-- +2.17.1 + diff --git a/var/spack/repos/builtin/packages/rccl/package.py b/var/spack/repos/builtin/packages/rccl/package.py index 119ab751df..d8f5c1a652 100644 --- a/var/spack/repos/builtin/packages/rccl/package.py +++ b/var/spack/repos/builtin/packages/rccl/package.py @@ -16,12 +16,13 @@ class Rccl(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/rccl" git = "https://github.com/ROCmSoftwarePlatform/rccl.git" - url = "https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-5.2.0.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-5.2.3.tar.gz" tags = ["rocm"] maintainers = ["srekolam", "renjithravindrankannath"] libraries = ["librccl"] + version("5.2.3", sha256="ecba09f4c95b4b2dae81b88231a972ac956d29909b5e712e21cf2a74bd251ff4") version("5.2.1", sha256="cfd17dc003f19900e44928d81111570d3720d4905321f2a18c909909c4bee822") version("5.2.0", sha256="6ee3a04da0d16eb53f768a088633a7d8ecc4416a2d0c07f7ba8426ab7892b060") version("5.1.3", sha256="56491257f27b48bf85f4b91434a2a6e49a448337c889db181b02c8a4a260a4bc") @@ -92,7 +93,8 @@ class Rccl(CMakePackage): ) patch("0001-Fix-numactl-path-issue.patch", when="@3.7.0:4.3.2") - patch("0002-Fix-numactl-rocm-smi-path-issue.patch", when="@4.5.0:") + patch("0002-Fix-numactl-rocm-smi-path-issue.patch", when="@4.5.0:5.2.1") + patch("0003-Fix-numactl-rocm-smi-path-issue.patch", when="@5.2.3:") depends_on("cmake@3.5:", type="build") for ver in [ @@ -114,6 +116,7 @@ class Rccl(CMakePackage): "5.1.3", "5.2.0", "5.2.1", + "5.2.3", ]: depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) depends_on("hip@" + ver, when="@" + ver) @@ -138,9 +141,10 @@ class Rccl(CMakePackage): "5.1.3", "5.2.0", "5.2.1", + "5.2.3", ]: depends_on("numactl@2:", when="@" + ver) - for ver in ["4.5.0", "4.5.2", "5.0.0", "5.0.2", "5.1.0", "5.1.3", "5.2.0", "5.2.1"]: + for ver in ["4.5.0", "4.5.2", "5.0.0", "5.0.2", "5.1.0", "5.1.3", "5.2.0", "5.2.1", "5.2.3"]: depends_on("rocm-smi-lib@" + ver, when="@" + ver) @classmethod diff --git a/var/spack/repos/builtin/packages/rocm-tensile/package.py b/var/spack/repos/builtin/packages/rocm-tensile/package.py index 8697cbd8b0..a201d8e958 100644 --- a/var/spack/repos/builtin/packages/rocm-tensile/package.py +++ b/var/spack/repos/builtin/packages/rocm-tensile/package.py @@ -13,11 +13,12 @@ class RocmTensile(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/Tensile/" git = "https://github.com/ROCmSoftwarePlatform/Tensile.git" - url = "https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-5.2.0.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-5.2.3.tar.gz" tags = ["rocm"] maintainers = ["srekolam", "renjithravindrankannath", "haampie"] + version("5.2.3", sha256="840698bf2ac62e08ae76c3843f1dad5367ed098d42e6a5fa7953de70642fd2cf") version("5.2.1", sha256="49582e28f7e14fed6a66c59482a41d3899c1eb8e7aa0ce40a7a2e806dadc536b") version("5.2.0", sha256="aa6107944482ad278111d11d2e926393423fc70e7e1838574fe7ad9f553bdacf") version("5.1.3", sha256="87020ca268e3a1ed8853f629839d6497764d862bd70b8775e98de439f6c89f1d") @@ -127,6 +128,7 @@ class RocmTensile(CMakePackage): "5.1.3", "5.2.0", "5.2.1", + "5.2.3", ]: depends_on("rocm-cmake@" + ver, type="build", when="@" + ver) depends_on("hip@" + ver, when="@" + ver) @@ -152,6 +154,7 @@ class RocmTensile(CMakePackage): "5.1.3", "5.2.0", "5.2.1", + "5.2.3", ]: depends_on("rocm-smi-lib@" + ver, type="build", when="@" + ver) @@ -184,7 +187,7 @@ class RocmTensile(CMakePackage): self.define("Tensile_LOGIC", "asm_full"), self.define("Tensile_CODE_OBJECT_VERSION", "V3"), self.define("Boost_USE_STATIC_LIBS", "OFF"), - self.define("TENSILE_USE_OPENMP", "OFF"), + self.define("TENSILE_USE_OPENMP", "ON"), self.define("BUILD_WITH_TENSILE_HOST", "ON" if "@3.7.0:" in self.spec else "OFF"), ] diff --git a/var/spack/repos/builtin/packages/rocm-validation-suite/package.py b/var/spack/repos/builtin/packages/rocm-validation-suite/package.py index fd20cd4a66..6e8392a885 100644 --- a/var/spack/repos/builtin/packages/rocm-validation-suite/package.py +++ b/var/spack/repos/builtin/packages/rocm-validation-suite/package.py @@ -16,11 +16,12 @@ class RocmValidationSuite(CMakePackage): compatible platform.""" homepage = "https://github.com/ROCm-Developer-Tools/ROCmValidationSuite" - url = "https://github.com/ROCm-Developer-Tools/ROCmValidationSuite/archive/rocm-5.2.0.tar.gz" + url = "https://github.com/ROCm-Developer-Tools/ROCmValidationSuite/archive/rocm-5.2.3.tar.gz" tags = ["rocm"] maintainers = ["srekolam", "renjithravindrankannath"] + version("5.2.3", sha256="5dfbd41c694bf2eb4368edad8653dc60ec2927d174fc7aaa5fa416156c5f921f") version("5.2.1", sha256="a0ea3ab9cbb8ac17bfa4537713a4d7075f869949bfdead4565a46f75864bd4a9") version("5.2.0", sha256="2dfef5d66f544230957ac9aaf647b2f1dccf3cc7592cc322cae9fbdcf3321365") version("5.1.3", sha256="0140a4128c31749c078d9e1dc863cbbd690efc65843c34a4b80f0056e5b8c7b6") @@ -123,6 +124,7 @@ class RocmValidationSuite(CMakePackage): "5.1.3", "5.2.0", "5.2.1", + "5.2.3", ]: depends_on("hip@" + ver, when="@" + ver) depends_on("rocminfo@" + ver, when="@" + ver) -- cgit v1.2.3-60-g2f50