From 6cd9cbf578f3dcbc4d4f3423737fb35ff496a89d Mon Sep 17 00:00:00 2001 From: renjithravindrankannath <94420380+renjithravindrankannath@users.noreply.github.com> Date: Thu, 22 Dec 2022 00:36:14 -0800 Subject: [PATCH] Using corresponding commit ids of hiprand for each releases (#34545) --- .../repos/builtin/packages/rocrand/package.py | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/rocrand/package.py b/var/spack/repos/builtin/packages/rocrand/package.py index 3d70af072e..e925197458 100644 --- a/var/spack/repos/builtin/packages/rocrand/package.py +++ b/var/spack/repos/builtin/packages/rocrand/package.py @@ -21,7 +21,8 @@ class Rocrand(CMakePackage): maintainers = ["cgmb", "srekolam", "renjithravindrankannath"] libraries = ["librocrand"] - + version("develop", branch="develop") + version("master", branch="master") version("5.3.0", sha256="be4c9f9433415bdfea50d9f47b8afb43ac315f205ed39674f863955a6c256dca") version("5.2.3", sha256="01eda8022fab7bafb2c457fe26a9e9c99950ed1b772ae7bf8710b23a90b56e32") version("5.2.1", sha256="4b2a7780f0112c12b5f307e1130e6b2c02ab984a0c1b94e9190dae38f0067600") @@ -120,13 +121,38 @@ class Rocrand(CMakePackage): # same directory. patch("hiprand_prefer_samedir_rocrand.patch", working_dir="hiprand", when="@5.2.0:") + # Add hiprand sources thru the below + for d_version, d_commit in [ + ("5.3.0", "12e2f070337945318295c330bf69c6c060928b9e"), + ("5.2.3", "12e2f070337945318295c330bf69c6c060928b9e"), + ("5.2.1", "12e2f070337945318295c330bf69c6c060928b9e"), + ("5.2.0", "12e2f070337945318295c330bf69c6c060928b9e"), + ("5.1.3", "20ac3db9d7462c15a3e96a6f0507cd5f2ee089c4"), + ("5.1.0", "20ac3db9d7462c15a3e96a6f0507cd5f2ee089c4"), + ]: + resource( + name="hipRAND", + git="https://github.com/ROCmSoftwarePlatform/hipRAND.git", + commit=d_commit, + destination="", + placement="hiprand", + when="@{0}".format(d_version), + ) + resource( + name="hipRAND", + git="https://github.com/ROCmSoftwarePlatform/hipRAND.git", + branch="master", + destination="", + placement="hiprand", + when="@master", + ) resource( name="hipRAND", git="https://github.com/ROCmSoftwarePlatform/hipRAND.git", branch="develop", destination="", placement="hiprand", - when="@5.1.0:", + when="@develop", ) for ver in [