diff --git a/var/spack/repos/builtin/packages/amdsmi/package.py b/var/spack/repos/builtin/packages/amdsmi/package.py index d17ba6269cd..8f454e4d7cf 100644 --- a/var/spack/repos/builtin/packages/amdsmi/package.py +++ b/var/spack/repos/builtin/packages/amdsmi/package.py @@ -19,6 +19,7 @@ class Amdsmi(CMakePackage): libraries = ["libamd_smi"] license("MIT") + version("6.3.2", sha256="1ed452eedfe51ac6e615d7bfe0bd7a0614f21113874ae3cbea7df72343cc2d13") version("6.3.1", sha256="a3a5a711052e813b9be9304d5e818351d3797f668ec2a455e61253a73429c355") version("6.3.0", sha256="7234c46648938239385cd5db57516ed53985b8c09d2f0828ae8f446386d8bd1e") version("6.2.4", sha256="5ebe8d0f176bf4a73b0e7000d9c47cb7f65ecca47011d3f9b08b93047dcf7ac5") diff --git a/var/spack/repos/builtin/packages/aqlprofile/package.py b/var/spack/repos/builtin/packages/aqlprofile/package.py index daeea79104b..b0769f7129b 100644 --- a/var/spack/repos/builtin/packages/aqlprofile/package.py +++ b/var/spack/repos/builtin/packages/aqlprofile/package.py @@ -8,6 +8,20 @@ from spack.package import * _versions = { + "6.3.2": { + "apt": ( + "bef302bf344c9297f9fb64a4a93f360721a467185bc4fefbeecb307dd956c504", + "https://repo.radeon.com/rocm/apt/6.3.2/pool/main/h/hsa-amd-aqlprofile/hsa-amd-aqlprofile_1.0.0.60302-66~20.04_amd64.deb", + ), + "yum": ( + "1e01de060073cb72a97fcddf0f3b637b48cf89a08b34f2447d010031abc0e099", + "https://repo.radeon.com/rocm/rhel8/6.3.2/main/hsa-amd-aqlprofile-1.0.0.60302-66.el8.x86_64.rpm", + ), + "zyp": ( + "408fb29e09ba59a9e83e8f7d703ba53e1ef3b3acbae1103b2a82d4f87f321752", + "https://repo.radeon.com/rocm/zyp/6.3.2/main/hsa-amd-aqlprofile-1.0.0.60302-sles155.66.x86_64.rpm", + ), + }, "6.3.1": { "apt": ( "76b129345a1a7caa04859fd738e0ba5bfa6f7bc1ad11171f1a7b2d46e0c0b158", @@ -275,6 +289,7 @@ class Aqlprofile(Package): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/comgr/package.py b/var/spack/repos/builtin/packages/comgr/package.py index 0aca847208c..df11eb0cdb1 100644 --- a/var/spack/repos/builtin/packages/comgr/package.py +++ b/var/spack/repos/builtin/packages/comgr/package.py @@ -29,6 +29,7 @@ def url_for_version(self, version): license("NCSA") version("master", branch="amd-stg-open") + version("6.3.2", sha256="1f52e45660ea508d3fe717a9903fe27020cee96de95a3541434838e0193a4827") version("6.3.1", sha256="e9c2481cccacdea72c1f8d3970956c447cec47e18dfb9712cbbba76a2820552c") version("6.3.0", sha256="79580508b039ca6c50dfdfd7c4f6fbcf489fe1931037ca51324818851eea0c1c") version("6.2.4", sha256="7af782bf5835fcd0928047dbf558f5000e7f0207ca39cf04570969343e789528") @@ -88,6 +89,7 @@ def url_for_version(self, version): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", "master", ]: # llvm libs are linked statically, so this *could* be a build dep @@ -115,6 +117,7 @@ def url_for_version(self, version): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-core@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/composable-kernel/package.py b/var/spack/repos/builtin/packages/composable-kernel/package.py index d0e12232b17..d4b76d04446 100644 --- a/var/spack/repos/builtin/packages/composable-kernel/package.py +++ b/var/spack/repos/builtin/packages/composable-kernel/package.py @@ -18,6 +18,7 @@ class ComposableKernel(CMakePackage): license("MIT") version("master", branch="develop") + version("6.3.2", sha256="875237fe493ff040f8f63b827cddf2ff30a8d3aa18864f87d0e35323c7d62a2d") version("6.3.1", sha256="3e8c8c832ca3f9ceb99ab90f654b93b7db876f08d90eda87a70bc629c854052a") version("6.3.0", sha256="274f87fc27ec2584c76b5bc7ebdbe172923166b6b93e66a24f98475b44be272d") version("6.2.4", sha256="5598aea4bce57dc95b60f2029831edfdade80b30a56e635412cc02b2a6729aa6") @@ -60,6 +61,7 @@ class ComposableKernel(CMakePackage): for ver in [ "master", + "6.3.2", "6.3.1", "6.3.0", "6.2.4", diff --git a/var/spack/repos/builtin/packages/hip-tensor/package.py b/var/spack/repos/builtin/packages/hip-tensor/package.py index 105bc43b405..18508419bd4 100644 --- a/var/spack/repos/builtin/packages/hip-tensor/package.py +++ b/var/spack/repos/builtin/packages/hip-tensor/package.py @@ -16,6 +16,7 @@ class HipTensor(CMakePackage, ROCmPackage): maintainers("srekolam", "afzpatel") version("master", branch="master") + version("6.3.2", sha256="094db6d759eb32e9d15c36fce7f5b5d46ba81416953a8d9435b2fb9c161d8c83") version("6.3.1", sha256="142401331526e6da3fa172cce283f1c053056cb59cf431264443da76cee2f168") version("6.3.0", sha256="9a4acef722e838ec702c6b111ebc1fff9d5686ae5c79a9f5a82e5fac2a5e406a") version("6.2.4", sha256="54c378b440ede7a07c93b5ed8d16989cc56283a56ea35e41f3666bb05b6bc984") @@ -45,12 +46,13 @@ class HipTensor(CMakePackage, ROCmPackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", "master", ]: depends_on(f"composable-kernel@{ver}", when=f"@{ver}") depends_on(f"rocm-cmake@{ver}", when=f"@{ver}") - for ver in ["6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1"]: + for ver in ["6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2"]: depends_on(f"hipcc@{ver}", when=f"@{ver}") def setup_build_environment(self, env): diff --git a/var/spack/repos/builtin/packages/hip/package.py b/var/spack/repos/builtin/packages/hip/package.py index 9f75d5f80d7..44c79b53f27 100644 --- a/var/spack/repos/builtin/packages/hip/package.py +++ b/var/spack/repos/builtin/packages/hip/package.py @@ -25,6 +25,7 @@ class Hip(CMakePackage): license("MIT") version("master", branch="master") + version("6.3.2", sha256="2832e21d75369f87beee767949177a93ac113710afae6b73da5548c0047962ec") version("6.3.1", sha256="ebde9fa80ad1f4ba3fbe04fd36d90548492ebe5828ac459995b5f9d384a29783") version("6.3.0", sha256="d8dba8cdf05463afb7879de2833983cafa6a006ba719815a35b96d9b92fc7fc4") version("6.2.4", sha256="76e4583ae3d31786270fd92abbb2e3dc5e665b22fdedb5ceff0093131d4dc0ca") @@ -117,6 +118,7 @@ class Hip(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}") depends_on(f"comgr@{ver}", when=f"@{ver}") @@ -143,6 +145,7 @@ class Hip(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"hipify-clang@{ver}", when=f"@{ver}") @@ -163,6 +166,7 @@ class Hip(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-core@{ver}", when=f"@{ver}") @@ -180,10 +184,11 @@ class Hip(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"hipcc@{ver}", when=f"@{ver}") - for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1"]: + for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2"]: depends_on(f"rocprofiler-register@{ver}", when=f"@{ver}") # roc-obj-ls requirements @@ -245,6 +250,7 @@ class Hip(CMakePackage): ) # Add hip-clr sources thru the below for d_version, d_shasum in [ + ("6.3.2", "ec13dc4ffe212beee22171cb2825d2b16cdce103c835adddb482b9238cf4f050"), ("6.3.1", "bfb8a4a59e7bd958e2cd4bf6f14c6cdea601d9827ebf6dc7af053a90e963770f"), ("6.3.0", "829e61a5c54d0c8325d02b0191c0c8254b5740e63b8bfdb05eec9e03d48f7d2c"), ("6.2.4", "0a3164af7f997a4111ade634152957378861b95ee72d7060eb01c86c87208c54"), @@ -303,6 +309,7 @@ class Hip(CMakePackage): ) # Add hipother sources thru the below for d_version, d_shasum in [ + ("6.3.2", "1623d823de49471aae3ecb1fad0e9cdddf9301a4089f1fd44f78ac2ff0c20fb2"), ("6.3.1", "caa69147227bf72fa7b076867f84579456ef55af63efec29914265a80602df42"), ("6.3.0", "a28eb1e8fe239b41e744584d45d676925ca210968ecb21bfa60678cf8e86eeb7"), ("6.2.4", "b7ebcf8a2679e50d27c49ebec0dbea5a67573f8b8c3f4a29108c84b28b5bedee"), diff --git a/var/spack/repos/builtin/packages/hipblas-common/package.py b/var/spack/repos/builtin/packages/hipblas-common/package.py index efe3dfd2eaa..483b692215f 100644 --- a/var/spack/repos/builtin/packages/hipblas-common/package.py +++ b/var/spack/repos/builtin/packages/hipblas-common/package.py @@ -15,5 +15,6 @@ class HipblasCommon(CMakePackage): license("MIT") + version("6.3.2", sha256="29aa1ac1a0f684a09fe2ea8a34ae8af3622c27708c7df403a7481e75174e1984") version("6.3.1", sha256="512e652483b5580713eca14db3fa633d0441cd7c02cdb0d26e631ea605b9231b") version("6.3.0", sha256="240bb1b0f2e6632447e34deae967df259af1eec085470e58a6d0aa040c8530b0") diff --git a/var/spack/repos/builtin/packages/hipblas/package.py b/var/spack/repos/builtin/packages/hipblas/package.py index 156813eb592..e53927e9712 100644 --- a/var/spack/repos/builtin/packages/hipblas/package.py +++ b/var/spack/repos/builtin/packages/hipblas/package.py @@ -24,6 +24,7 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage): version("develop", branch="develop") version("master", branch="master") + version("6.3.2", sha256="6e86d4f8657e13665e37fdf3174c3a30f4c7dff2c4e2431d1be110cd7d463971") version("6.3.1", sha256="77a1845254d738c43a48bc52fa3e94499ed83535b5771408ff476122bc4b7b7c") version("6.3.0", sha256="72604c1896e42e65ea2b3e905159af6ec5eede6a353678009c47d0a24f462c92") version("6.2.4", sha256="3137ba35e0663d6cceed70086fc6397d9e74803e1711382be62809b91beb2f32") @@ -92,6 +93,7 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-cmake@{ver}", when=f"+rocm @{ver}") depends_on(f"rocm-openmp-extras@{ver}", type="test", when=f"+rocm @{ver}") @@ -119,6 +121,7 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", "master", "develop", ]: @@ -127,7 +130,7 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage): for tgt in ROCmPackage.amdgpu_targets: depends_on(f"rocblas amdgpu_target={tgt}", when=f"+rocm amdgpu_target={tgt}") depends_on(f"rocsolver amdgpu_target={tgt}", when=f"+rocm amdgpu_target={tgt}") - for ver in ["6.3.0", "6.3.1"]: + for ver in ["6.3.0", "6.3.1", "6.3.2"]: depends_on(f"hipblas-common@{ver}", when=f"@{ver}") @classmethod @@ -155,7 +158,7 @@ def cmake_args(self): # FindHIP.cmake is still used for +cuda if self.spec.satisfies("+cuda"): args.append(self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.lib.cmake.hip)) - if self.spec.satisfies("@5.2.0:"): + if self.spec.satisfies("@5.2.0:6.3.1"): args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) if self.spec.satisfies("@5.3.0:"): args.append("-DCMAKE_INSTALL_LIBDIR=lib") diff --git a/var/spack/repos/builtin/packages/hipblaslt/package.py b/var/spack/repos/builtin/packages/hipblaslt/package.py index 99b80fb0871..7ecae4e1e71 100644 --- a/var/spack/repos/builtin/packages/hipblaslt/package.py +++ b/var/spack/repos/builtin/packages/hipblaslt/package.py @@ -16,6 +16,7 @@ class Hipblaslt(CMakePackage): maintainers("srekolam", "afzpatel", "renjithravindrankannath") license("MIT") + version("6.3.2", sha256="cc4875b1a5cf1708a7576c42aff6b4cb790cb7337f5dc2df33119a4aadcef027") version("6.3.1", sha256="9a18a2e44264a21cfe58ed102fd3e34b336f23d6c191ca2da726e8e0883ed663") version("6.3.0", sha256="e570996037ea42eeca4c9b8b0b77a202d40be1a16068a6245595c551d80bdcad") version("6.2.4", sha256="b8a72cb1ed4988b0569817c6387fb2faee4782795a0d8f49b827b32b52572cfd") @@ -51,6 +52,7 @@ class Hipblaslt(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"hip@{ver}", when=f"@{ver}") depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}") @@ -59,7 +61,7 @@ class Hipblaslt(CMakePackage): for ver in ["6.0.0", "6.0.2", "6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4"]: depends_on(f"hipblas@{ver}", when=f"@{ver}") - for ver in ["6.3.0", "6.3.1"]: + for ver in ["6.3.0", "6.3.1", "6.3.2"]: depends_on(f"hipblas-common@{ver}", when=f"@{ver}") depends_on(f"rocm-smi-lib@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/hipcc/package.py b/var/spack/repos/builtin/packages/hipcc/package.py index 9c8f01683fb..0d5a8dd985d 100644 --- a/var/spack/repos/builtin/packages/hipcc/package.py +++ b/var/spack/repos/builtin/packages/hipcc/package.py @@ -23,6 +23,7 @@ def url_for_version(self, version): maintainers("srekolam", "renjithravindrankannath", "afzpatel") license("MIT") + version("6.3.2", sha256="1f52e45660ea508d3fe717a9903fe27020cee96de95a3541434838e0193a4827") version("6.3.1", sha256="e9c2481cccacdea72c1f8d3970956c447cec47e18dfb9712cbbba76a2820552c") version("6.3.0", sha256="79580508b039ca6c50dfdfd7c4f6fbcf489fe1931037ca51324818851eea0c1c") version("6.2.4", sha256="7af782bf5835fcd0928047dbf558f5000e7f0207ca39cf04570969343e789528") diff --git a/var/spack/repos/builtin/packages/hipcub/package.py b/var/spack/repos/builtin/packages/hipcub/package.py index 2406cbc2d7c..61e9489fc71 100644 --- a/var/spack/repos/builtin/packages/hipcub/package.py +++ b/var/spack/repos/builtin/packages/hipcub/package.py @@ -17,6 +17,7 @@ class Hipcub(CMakePackage, CudaPackage, ROCmPackage): license("BSD-3-Clause") maintainers("srekolam", "renjithravindrankannath", "afzpatel") + version("6.3.2", sha256="4a1443c2ea12c3aa05fb65703eb309ccf8b893f9e6cbebec4ccf5502ba54b940") version("6.3.1", sha256="e5d100c7b8f95fe6243ad9f22170c136aa34db4e588136bec54ede7cb2e7f12f") version("6.3.0", sha256="a609cde18cefa90a1970049cc5630f2ec263f12961aa85993897580da2ca0456") version("6.2.4", sha256="06f3655b110d3d2e2ecf0aca052d3ba3f2ef012c069e5d2d82f2b75d50555f46") @@ -84,6 +85,7 @@ class Hipcub(CMakePackage, CudaPackage, ROCmPackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocprim@{ver}", when=f"+rocm @{ver}") depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}") @@ -107,7 +109,7 @@ def cmake_args(self): # FindHIP.cmake is still used for +cuda if self.spec.satisfies("+cuda"): args.append(self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.lib.cmake.hip)) - if self.spec.satisfies("@5.2.0:"): + if self.spec.satisfies("@5.2.0:6.3.1"): args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) return args diff --git a/var/spack/repos/builtin/packages/hipfft/package.py b/var/spack/repos/builtin/packages/hipfft/package.py index 8765c9e3378..d2997ad7ed0 100644 --- a/var/spack/repos/builtin/packages/hipfft/package.py +++ b/var/spack/repos/builtin/packages/hipfft/package.py @@ -24,6 +24,7 @@ class Hipfft(CMakePackage, CudaPackage, ROCmPackage): license("MIT") version("master", branch="master") + version("6.3.2", sha256="5d9e662c7d67f4c814cad70476b57651df5ae6b65f371ca6dbb5aa51d9eeb6f5") version("6.3.1", sha256="b709df2d0115748ed004d0cddce829cb0f9ec3761eb855e61f0097cab04e4806") version("6.3.0", sha256="08a0c800f531247281b4dbe8de9567a6fde4f432829a451a720d0b0a3c711059") version("6.2.4", sha256="308b81230498b01046f7fc3299a9e9c2c5456d80fd71a94f490ad97f51ed9de8") @@ -91,6 +92,7 @@ class Hipfft(CMakePackage, CudaPackage, ROCmPackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", "master", ]: depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}") @@ -117,7 +119,7 @@ def cmake_args(self): if self.spec["hip"].satisfies("@5.2:"): args.append(self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.lib.cmake.hip)) - if self.spec.satisfies("@5.2.0:"): + if self.spec.satisfies("@5.2.0:6.3.1"): args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) if self.spec.satisfies("@5.3.0:"): diff --git a/var/spack/repos/builtin/packages/hipfort/package.py b/var/spack/repos/builtin/packages/hipfort/package.py index 5788af17e98..035308e1e91 100644 --- a/var/spack/repos/builtin/packages/hipfort/package.py +++ b/var/spack/repos/builtin/packages/hipfort/package.py @@ -16,6 +16,7 @@ class Hipfort(CMakePackage): license("MIT") maintainers("cgmb", "srekolam", "renjithravindrankannath", "afzpatel") + version("6.3.2", sha256="d2438971199637eb2e09519c1f2300cdd7a84b4d948034a7cd1ce3e441faf5de") version("6.3.1", sha256="8141bf3d05ab4f91c561815134707123e3d06486bf775224b9a3a4cc8ee8f56f") version("6.3.0", sha256="9e7f4420c75430cdb9046c0c4dbe656f22128b0672b2e261d50a6e92e47cc6d3") version("6.2.4", sha256="32daa4ee52c2d44790bff7a7ddde9d572e4785b2f54766a5e45d10228da0534b") @@ -68,6 +69,7 @@ class Hipfort(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"hip@{ver}", type="build", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/hipify-clang/package.py b/var/spack/repos/builtin/packages/hipify-clang/package.py index 1de68ce82f0..27948c4e6a1 100644 --- a/var/spack/repos/builtin/packages/hipify-clang/package.py +++ b/var/spack/repos/builtin/packages/hipify-clang/package.py @@ -19,6 +19,7 @@ class HipifyClang(CMakePackage): license("MIT") version("master", branch="master") + version("6.3.2", sha256="c0da5118be8207fab6d19803417c0b8d2db5bc766279038527cbd6fa92b25c67") version("6.3.1", sha256="5f9d9a65545f97b18c6a0d4394dca1bcdee10737a5635b79378ea505081f9315") version("6.3.0", sha256="9fced04f9e36350bdbabd730c446b55a898e2f4ba82078855bcf5dea3b5e8dc8") version("6.2.4", sha256="981af55ab4243f084b3e75007e827f7c94ac317fa84fe08d59c5872124a7d3c7") @@ -76,6 +77,7 @@ class HipifyClang(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", "master", ]: depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}") @@ -97,6 +99,7 @@ class HipifyClang(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-core@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/hiprand/package.py b/var/spack/repos/builtin/packages/hiprand/package.py index fa4a5a527d6..40380c18117 100644 --- a/var/spack/repos/builtin/packages/hiprand/package.py +++ b/var/spack/repos/builtin/packages/hiprand/package.py @@ -24,6 +24,7 @@ class Hiprand(CMakePackage, CudaPackage, ROCmPackage): version("develop", branch="develop") version("master", branch="master") + version("6.3.2", sha256="0a08ed7554c161b095c866cd5e6f0d63cdf063e5b3c1183afa6ac18bad94a575") version("6.3.1", sha256="ec43bf64eda348cf53c2767e553fd9561540dc50ae3ce95ca916404aa9a3eafb") version("6.3.0", sha256="7464c1e48f4e1a97a5e5978146641971d068886038810876b60acb5dfb6c4d39") version("6.2.4", sha256="b6010f5e0c63a139acd92197cc1c0d64a428f7a0ad661bce0cd1e553ad6fd6eb") @@ -103,6 +104,7 @@ class Hiprand(CMakePackage, CudaPackage, ROCmPackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", "master", "develop", ]: @@ -140,7 +142,7 @@ def cmake_args(self): else: args.append(self.define("BUILD_WITH_LIB", "ROCM")) - if self.spec.satisfies("@5.2.0:"): + if self.spec.satisfies("@5.2.0:6.3.1"): args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) if self.spec.satisfies("@5.3.0:"): diff --git a/var/spack/repos/builtin/packages/hipsolver/package.py b/var/spack/repos/builtin/packages/hipsolver/package.py index a201a4afcb8..0b9d6c75340 100644 --- a/var/spack/repos/builtin/packages/hipsolver/package.py +++ b/var/spack/repos/builtin/packages/hipsolver/package.py @@ -29,6 +29,7 @@ class Hipsolver(CMakePackage, CudaPackage, ROCmPackage): version("develop", branch="develop") version("master", branch="master") + version("6.3.2", sha256="885c999da8e4aa0b4cb9584bc0fc0d6a8c8d56f5e7ee6d211c608003eff22aa7") version("6.3.1", sha256="793074ebaa4a3b16dc6e4d2a54ecbb259f1e0ec7fdcd7f885da622a1d1478b76") version("6.3.0", sha256="a0443f0b894cedd5af59af4fadcb3c38daa728ca32c13b9741fb19e2d828a089") version("6.2.4", sha256="4dc564498361cb1bac17dcfeaf0f2b9c85320797c75b05ee33160a133f5f4a15") @@ -109,6 +110,7 @@ class Hipsolver(CMakePackage, CudaPackage, ROCmPackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", "master", "develop", ]: @@ -162,7 +164,7 @@ def cmake_args(self): self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.lib.cmake.hip) ) - if self.spec.satisfies("@5.2.0:"): + if self.spec.satisfies("@5.2.0:6.3.1"): args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) if self.spec.satisfies("@5.3.0:"): args.append(self.define("CMAKE_INSTALL_LIBDIR", "lib")) diff --git a/var/spack/repos/builtin/packages/hipsparse/package.py b/var/spack/repos/builtin/packages/hipsparse/package.py index 5b568a05bf8..bd93050d96e 100644 --- a/var/spack/repos/builtin/packages/hipsparse/package.py +++ b/var/spack/repos/builtin/packages/hipsparse/package.py @@ -21,6 +21,7 @@ class Hipsparse(CMakePackage, CudaPackage, ROCmPackage): libraries = ["libhipsparse"] license("MIT") + version("6.3.2", sha256="9fbc3468632fdc828d7bae386c2737eb371d78811f53da7348b417fb00d62808") version("6.3.1", sha256="d64bc48e0aa5ec2f48853272a9c554b37ec98cb0724135e45f21b1340df7bccb") version("6.3.0", sha256="550fd5a480490e631507e8c34b2b0cf9cbc2ad2a5bf84e8ea0a8fad96eecb25a") version("6.2.4", sha256="0ecc0ff1eeb99e9a9ac419e49e9be9ec4cd23a117d819710114ee2f35aefe88b") @@ -91,6 +92,7 @@ class Hipsparse(CMakePackage, CudaPackage, ROCmPackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}") depends_on(f"rocsparse@{ver}", when=f"+rocm @{ver}") @@ -127,7 +129,7 @@ def cmake_args(self): # FindHIP.cmake is still used for +cuda if self.spec.satisfies("+cuda"): args.append(self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.lib.cmake.hip)) - if self.spec.satisfies("@5.2.0:"): + if self.spec.satisfies("@5.2.0:6.3.1"): args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) if self.spec.satisfies("@5.3.0:"): diff --git a/var/spack/repos/builtin/packages/hipsparselt/package.py b/var/spack/repos/builtin/packages/hipsparselt/package.py index dfc8b006db0..1bc6cf5a3bb 100644 --- a/var/spack/repos/builtin/packages/hipsparselt/package.py +++ b/var/spack/repos/builtin/packages/hipsparselt/package.py @@ -21,6 +21,7 @@ class Hipsparselt(CMakePackage, ROCmPackage): maintainers("srekolam", "afzpatel", "renjithravindrankannath") license("MIT") + version("6.3.2", sha256="a0b30b478eff822dd7fa1c116ad99dcdf14ece1c33aae04ac71b594efd4d9866") version("6.3.1", sha256="403d4c0ef47f89510452a20be6cce72962f21761081fc19a7e0e27e7f0c4ccfd") version("6.3.0", sha256="f67ed4900101686596add37824d0628f1e71cf6a30d827a0519b3c3657f63ac3") version("6.2.4", sha256="7b007b346f89fac9214ad8541b3276105ce1cac14d6f95a8a504b5a5381c8184") @@ -58,13 +59,14 @@ class Hipsparselt(CMakePackage, ROCmPackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"hip@{ver}", when=f"@{ver}") depends_on(f"hipsparse@{ver}", when=f"@{ver}") depends_on(f"rocm-openmp-extras@{ver}", when=f"@{ver}", type="test") depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}") - for ver in ["6.3.0", "6.3.1"]: + for ver in ["6.3.0", "6.3.1", "6.3.2"]: depends_on(f"rocm-smi-lib@{ver}", when=f"@{ver}") depends_on("cmake@3.5:", type="build") diff --git a/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py b/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py index 1236a4d38e1..8c08496b5fa 100644 --- a/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py +++ b/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py @@ -23,6 +23,7 @@ class HsaRocrDev(CMakePackage): libraries = ["libhsa-runtime64"] version("master", branch="master") + version("6.3.2", sha256="aaecaa7206b6fa1d5d7b8f7c1f7c5057a944327ba4779448980d7e7c7122b074") version("6.3.1", sha256="547ceeeda9a41cdffa21e57809dc5834f94938a0a2809c283aebcbcf01901df0") version("6.3.0", sha256="8fd6bcd6a5afd0ae5a59e33b786a525f575183d38c34049c2dab6b9270a1ca3b") version("6.2.4", sha256="b7aa0055855398d1228c39a6f4feb7d7be921af4f43d82855faf0b531394bb9b") @@ -106,6 +107,7 @@ class HsaRocrDev(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", "master", ]: depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}") @@ -129,6 +131,7 @@ class HsaRocrDev(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-core@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py index 0d00f119a44..1b887702295 100644 --- a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py +++ b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py @@ -24,6 +24,7 @@ class LlvmAmdgpu(CMakePackage, CompilerPackage): license("Apache-2.0") version("master", branch="amd-stg-open") + version("6.3.2", sha256="1f52e45660ea508d3fe717a9903fe27020cee96de95a3541434838e0193a4827") version("6.3.1", sha256="e9c2481cccacdea72c1f8d3970956c447cec47e18dfb9712cbbba76a2820552c") version("6.3.0", sha256="79580508b039ca6c50dfdfd7c4f6fbcf489fe1931037ca51324818851eea0c1c") version("6.2.4", sha256="7af782bf5835fcd0928047dbf558f5000e7f0207ca39cf04570969343e789528") @@ -160,6 +161,7 @@ class LlvmAmdgpu(CMakePackage, CompilerPackage): when="@master +rocm-device-libs", ) for d_version, d_shasum in [ + ("6.3.2", "aaecaa7206b6fa1d5d7b8f7c1f7c5057a944327ba4779448980d7e7c7122b074"), ("6.3.1", "547ceeeda9a41cdffa21e57809dc5834f94938a0a2809c283aebcbcf01901df0"), ("6.3.0", "8fd6bcd6a5afd0ae5a59e33b786a525f575183d38c34049c2dab6b9270a1ca3b"), ("6.2.4", "b7aa0055855398d1228c39a6f4feb7d7be921af4f43d82855faf0b531394bb9b"), diff --git a/var/spack/repos/builtin/packages/migraphx/package.py b/var/spack/repos/builtin/packages/migraphx/package.py index 4e93753f7d8..8a85f3e80f1 100644 --- a/var/spack/repos/builtin/packages/migraphx/package.py +++ b/var/spack/repos/builtin/packages/migraphx/package.py @@ -19,6 +19,7 @@ class Migraphx(CMakePackage): libraries = ["libmigraphx"] license("MIT") + version("6.3.2", sha256="4e6b9800919e99070c0289616657592c23ff66a55230409f38e5c7e099c0d89b") version("6.3.1", sha256="c60df20b3c890c469265ae6f273fb5d43cc13c8c514f76dd7b4d195d9e44ba85") version("6.3.0", sha256="21550e5cecf1b26c02e1c4633c7c4c6eb5e37be8758d7a2641f10cfdf4203636") version("6.2.4", sha256="849cca3c7c98dc437e42ac17013f86ef0a5fd202cb87b7822778bd9a8f93d293") @@ -105,6 +106,7 @@ class Migraphx(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}") depends_on(f"hip@{ver}", when=f"@{ver}") @@ -122,6 +124,7 @@ class Migraphx(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocmlir@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/miopen-hip/package.py b/var/spack/repos/builtin/packages/miopen-hip/package.py index 460c2474dae..3a768683b87 100644 --- a/var/spack/repos/builtin/packages/miopen-hip/package.py +++ b/var/spack/repos/builtin/packages/miopen-hip/package.py @@ -20,6 +20,7 @@ class MiopenHip(CMakePackage): libraries = ["libMIOpen"] license("MIT") + version("6.3.2", sha256="7abda3b437e396a1611a6f63e73ab1656d45d5405194504136c0ccbb75b81fea") version("6.3.1", sha256="edb82a74086fb96f8d7ee9e50a180302f716332cd0dff96bf7244bdc6fab5895") version("6.3.0", sha256="171834978d6316a5ec7607d4b10c7c69e5bfe9064edae8bdb9b207e578b41c1d") version("6.2.4", sha256="8e4836e007e5e66fa487288887a098aaeeb95f3c63a19c2b91f6e848c023a040") @@ -96,6 +97,7 @@ class MiopenHip(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}") depends_on(f"hip@{ver}", when=f"@{ver}") @@ -139,6 +141,7 @@ class MiopenHip(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on("nlohmann-json", type="link") depends_on(f"composable-kernel@{ver}", when=f"@{ver}") @@ -156,13 +159,14 @@ class MiopenHip(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"roctracer-dev@{ver}", when=f"@{ver}") for ver in ["6.1.0", "6.1.1", "6.1.2"]: depends_on("googletest") - for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1"]: + for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2"]: depends_on(f"rocrand@{ver}", when=f"@{ver}") - for ver in ["6.3.0", "6.3.1"]: + for ver in ["6.3.0", "6.3.1", "6.3.2"]: depends_on(f"hipblas@{ver}", when=f"@{ver}") depends_on(f"hipblaslt@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/mivisionx/package.py b/var/spack/repos/builtin/packages/mivisionx/package.py index 2475d305976..76227c76485 100644 --- a/var/spack/repos/builtin/packages/mivisionx/package.py +++ b/var/spack/repos/builtin/packages/mivisionx/package.py @@ -25,6 +25,7 @@ def url_for_version(self, version): return url.format(version) license("MIT") + version("6.3.2", sha256="2e7984e4ef2e6195aa9afa11030b8418aee885bec9befa220b9b53b5229b7fae") version("6.3.1", sha256="1f7bd1f6b61401bc642b50e96411344b092b09189534c5d6ba2f4c661d1af0ce") version("6.3.0", sha256="bc16881eae11140025b8fbd00bc741763548d41345dbe954c8d8659f4dccfe9e") version("6.2.4", sha256="7e65dc83f1b85e089c1218dff57211e64f3586bcb4415bda4798e4a434cba216") @@ -172,6 +173,14 @@ def patch(self): "model_compiler/python/nnir_to_clib.py", string=True, ) + if self.spec.satisfies("@6.2:"): + filter_file( + r"crypto", + "{0}".format(self.spec["openssl"].libs), + "utilities/runvx/CMakeLists.txt", + "utilities/runcl/CMakeLists.txt", + string=True, + ) depends_on("cmake@3.5:", type="build") depends_on("ffmpeg@:4", type="build", when="@:5.3") @@ -230,6 +239,7 @@ def patch(self): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"miopen-hip@{ver}", when=f"@{ver}") for ver in [ @@ -252,6 +262,7 @@ def patch(self): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"migraphx@{ver}", when=f"@{ver}") depends_on(f"hip@{ver}", when=f"@{ver}") @@ -273,6 +284,7 @@ def patch(self): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-core@{ver}", when=f"@{ver}") depends_on("python@3.5:", type="build") @@ -290,6 +302,7 @@ def patch(self): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rpp@{ver}", when=f"@{ver}") @@ -299,9 +312,10 @@ def setup_run_environment(self, env): env.prepend_path("LD_LIBRARY_PATH", self.spec["hsa-rocr-dev"].prefix.lib) def setup_build_environment(self, env): - if self.spec.satisfies("+asan"): + if self.spec.satisfies("@6.1:"): env.set("CC", f"{self.spec['llvm-amdgpu'].prefix}/bin/clang") env.set("CXX", f"{self.spec['llvm-amdgpu'].prefix}/bin/clang++") + if self.spec.satisfies("+asan"): env.set("ASAN_OPTIONS", "detect_leaks=0") env.set("CFLAGS", "-fsanitize=address -shared-libasan") env.set("CXXFLAGS", "-fsanitize=address -shared-libasan") diff --git a/var/spack/repos/builtin/packages/rccl/package.py b/var/spack/repos/builtin/packages/rccl/package.py index d80d4410693..e39ddca453f 100644 --- a/var/spack/repos/builtin/packages/rccl/package.py +++ b/var/spack/repos/builtin/packages/rccl/package.py @@ -20,6 +20,12 @@ class Rccl(CMakePackage): maintainers("srekolam", "renjithravindrankannath", "afzpatel") libraries = ["librccl"] + version( + "6.3.2", + tag="rocm-6.3.2", + commit="9a0e6a114c8f7371fa3050b413a350d6945fb7db", + submodules=True, + ) version( "6.3.1", tag="rocm-6.3.1", @@ -93,6 +99,7 @@ class Rccl(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}") depends_on(f"hip@{ver}", when=f"@{ver}") @@ -116,6 +123,7 @@ class Rccl(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-core@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/rdc/package.py b/var/spack/repos/builtin/packages/rdc/package.py index 524a5f7f848..9f48a9a875c 100644 --- a/var/spack/repos/builtin/packages/rdc/package.py +++ b/var/spack/repos/builtin/packages/rdc/package.py @@ -26,6 +26,7 @@ def url_for_version(self, version): return url.format(version) license("MIT") + version("6.3.2", sha256="e0780b8ef46d7b9885eb06a0b9eb56924fdf090ade71a66360a0bee1d9d7295d") version("6.3.1", sha256="88a96f13c0010a7f9e63f7a5a5531ae1d57ef1a722bac232c8544cde6245e120") version("6.3.0", sha256="419afd9c8e50a872fb0a922e29c8578664ed88e0b79bf558db0a1e864aa8fecf") version("6.2.4", sha256="cdebbc0c1a49f067fb8ff17bd91cd92f6f83b2aee142e5b576e5eb1742983a7f") @@ -80,6 +81,7 @@ def url_for_version(self, version): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-smi-lib@{ver}", type=("build", "link"), when=f"@{ver}") depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}") @@ -101,9 +103,10 @@ def url_for_version(self, version): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-core@{ver}", when=f"@{ver}") - for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1"]: + for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2"]: depends_on(f"amdsmi@{ver}", when=f"@{ver}") def patch(self): diff --git a/var/spack/repos/builtin/packages/rocal/package.py b/var/spack/repos/builtin/packages/rocal/package.py index b5e740f50ba..9dc3451835b 100644 --- a/var/spack/repos/builtin/packages/rocal/package.py +++ b/var/spack/repos/builtin/packages/rocal/package.py @@ -15,6 +15,7 @@ class Rocal(CMakePackage): maintainers("afzpatel", "srekolam", "renjithravindrankannath") license("MIT") + version("6.3.2", sha256="ceae8a86770c1f5d8cb56f4c38d6b354e16bda6b877cf93417d6a3e4e33354c6") version("6.3.1", sha256="e332c9c2b2eb4081d7dd8a66a141f95fe8c7fccbbfdd0fea7572a62a28a62bbb") version("6.3.0", sha256="162a0c15e6e7e09c0e13a9d01a493ba3199b77919addf396cd5d273ebf44d759") version("6.2.4", sha256="630813669e75a8ee179b89f489101931a26f7a7ee486fcbe1b0e3cb1803c582c") @@ -27,7 +28,7 @@ class Rocal(CMakePackage): depends_on("ffmpeg@4.4:") depends_on("abseil-cpp", when="@6.3:") - for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1"]: + for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2"]: depends_on(f"mivisionx@{ver}", when=f"@{ver}") depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}") depends_on(f"rpp@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/rocalution/package.py b/var/spack/repos/builtin/packages/rocalution/package.py index f8cdb66098d..b38a66995cb 100644 --- a/var/spack/repos/builtin/packages/rocalution/package.py +++ b/var/spack/repos/builtin/packages/rocalution/package.py @@ -25,6 +25,7 @@ class Rocalution(CMakePackage): libraries = ["librocalution_hip"] license("MIT") + version("6.3.2", sha256="b13118a5c0af08a666d80af78d52bdfba12ed134f6745ab36d8de75ed3bc7584") version("6.3.1", sha256="94b78b34ac750c09831aa70a3d7f8cd220c540a75e4f91c391ba435de420c536") version("6.3.0", sha256="a7476e1ce79915cb8e01917de372ae6b15d7e51b1a25e15cde346dadf2391068") version("6.2.4", sha256="993c55e732d0ee390746890639486649f36ae806110cf7490b9bb5d49b0663c0") @@ -86,6 +87,7 @@ class Rocalution(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"hip@{ver}", when=f"@{ver}") depends_on(f"rocprim@{ver}", when=f"@{ver}") @@ -145,7 +147,7 @@ def cmake_args(self): if self.spec.satisfies("^cmake@3.21.0:3.21.2"): args.append(self.define("__skip_rocmclang", "ON")) - if self.spec.satisfies("@5.2:"): + if self.spec.satisfies("@5.2:6.3.1"): args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) if self.spec.satisfies("@5.3:"): diff --git a/var/spack/repos/builtin/packages/rocblas/package.py b/var/spack/repos/builtin/packages/rocblas/package.py index 0ff48f217d9..2fddd57d0e8 100644 --- a/var/spack/repos/builtin/packages/rocblas/package.py +++ b/var/spack/repos/builtin/packages/rocblas/package.py @@ -22,6 +22,7 @@ class Rocblas(CMakePackage): version("develop", branch="develop") version("master", branch="master") + version("6.3.2", sha256="455cad760d926c21101594197c4456f617e5873a8f17bb3e14bd762018545a9e") version("6.3.1", sha256="88d2de6ce6b23a157eea8be63408350848935e4dfc3e27e5f2add78834c6d6ba") version("6.3.0", sha256="051f53bb69a9aba55a0c66c32688bf6af80e29e4a6b56b380b3c427e7a6aff9d") version("6.2.4", sha256="8bacf74e3499c445f1bb0a8048df1ef3ce6f72388739b1823b5784fd1e8aa22a") @@ -88,10 +89,11 @@ class Rocblas(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-openmp-extras@{ver}", type="test", when=f"@{ver}") - for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1"]: + for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2"]: depends_on(f"rocm-smi-lib@{ver}", type="test", when=f"@{ver}") depends_on("rocm-cmake@master", type="build", when="@master:") @@ -117,13 +119,14 @@ class Rocblas(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"hip@{ver}", when=f"@{ver}") depends_on(f"llvm-amdgpu@{ver}", type="build", when=f"@{ver}") depends_on(f"rocminfo@{ver}", type="build", when=f"@{ver}") depends_on(f"rocm-cmake@{ver}", type="build", when=f"@{ver}") - for ver in ["6.3.0", "6.3.1"]: + for ver in ["6.3.0", "6.3.1", "6.3.2"]: depends_on(f"hipblaslt@{ver}", when=f"@{ver}") depends_on("python@3.6:", type="build") @@ -160,6 +163,7 @@ class Rocblas(CMakePackage): ("@6.2.4", "81ae9537671627fe541332c0a5d953bfd6af71d6"), ("@6.3.0", "aca95d1743c243dd0dd0c8b924608bc915ce1ae7"), ("@6.3.1", "aca95d1743c243dd0dd0c8b924608bc915ce1ae7"), + ("@6.3.2", "aca95d1743c243dd0dd0c8b924608bc915ce1ae7"), ]: resource( name="Tensile", @@ -250,7 +254,7 @@ def cmake_args(self): if self.spec.satisfies("^cmake@3.21.0:3.21.2"): args.append(self.define("__skip_rocmclang", "ON")) - if self.spec.satisfies("@5.2.0:"): + if self.spec.satisfies("@5.2.0:6.3.1"): args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) if self.spec.satisfies("@5.3.0:"): args.append("-DCMAKE_INSTALL_LIBDIR=lib") diff --git a/var/spack/repos/builtin/packages/rocdecode/package.py b/var/spack/repos/builtin/packages/rocdecode/package.py index 83e92365be0..6b5f2204660 100644 --- a/var/spack/repos/builtin/packages/rocdecode/package.py +++ b/var/spack/repos/builtin/packages/rocdecode/package.py @@ -17,6 +17,7 @@ class Rocdecode(CMakePackage): maintainers("afzpatel", "srekolam", "renjithravindrankannath") license("MIT") + version("6.3.2", sha256="39ff3c21c81a73910dcfe6a147edaddecc21575a3077f0f99971c8d2f6d0e7d5") version("6.3.1", sha256="94da1a61167abaf3f983ae5d62bffb22bb8ba3eb1c9d9fc7c68ed9a066aa4e52") version("6.3.0", sha256="931f49ff86fa34929b03cec8e7becde78d0c49c1c3a23a13203fecd2b392b242") version("6.2.4", sha256="37aaa1299cfc517ddaf60b0e8a5cf06d672f59e8acc0da3862b40b810d4931cb") @@ -37,7 +38,7 @@ class Rocdecode(CMakePackage): depends_on("libva", type="build", when="@6.2:") - for ver in ["6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1"]: + for ver in ["6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2"]: depends_on(f"hip@{ver}", when=f"@{ver}") def patch(self): diff --git a/var/spack/repos/builtin/packages/rocfft/package.py b/var/spack/repos/builtin/packages/rocfft/package.py index dcc1c66a6c4..542d3515e75 100644 --- a/var/spack/repos/builtin/packages/rocfft/package.py +++ b/var/spack/repos/builtin/packages/rocfft/package.py @@ -20,6 +20,7 @@ class Rocfft(CMakePackage): license("MIT") version("master", branch="master") + version("6.3.2", sha256="0511d04d2367dcac6b35bc6b449337ba37bb623b8382fb11178fc608b5435437") version("6.3.1", sha256="f8aa0e68d8e303725d0be8ae1d7c0113b6ca019a3b9f08572abf8a02db690662") version("6.3.0", sha256="afc716c95d1c80097f7a965e0c3cf1fe246c9fdf10a8fd9a303202156bd3811d") version("6.2.4", sha256="8ddc4e779a84b73c21b054ae37fec69e5c2f248589c7fb1b84a2197baf6ce995") @@ -97,6 +98,7 @@ class Rocfft(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", "master", ]: depends_on(f"hip@{ver}", when=f"@{ver}") @@ -163,7 +165,7 @@ def cmake_args(self): if self.spec.satisfies("^cmake@3.21.0:3.21.2"): args.append(self.define("__skip_rocmclang", "ON")) - if self.spec.satisfies("@5.2.0:"): + if self.spec.satisfies("@5.2.0:6.3.1"): args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) if self.spec.satisfies("@5.3.0:"): diff --git a/var/spack/repos/builtin/packages/rocjpeg/package.py b/var/spack/repos/builtin/packages/rocjpeg/package.py index 42668fcef1b..627b8d93c90 100644 --- a/var/spack/repos/builtin/packages/rocjpeg/package.py +++ b/var/spack/repos/builtin/packages/rocjpeg/package.py @@ -18,12 +18,13 @@ class Rocjpeg(CMakePackage): license("MIT") + version("6.3.2", sha256="4e1ec9604152e818afa85360f1e0ef9e98bfb8a97ca0989980063e2ece015c16") version("6.3.1", sha256="f4913cbc63e11b9b418d33b0f9ba0fec0aa00b23285090acfd435e1ba1c21e42") version("6.3.0", sha256="2623b8f8bb61cb418d00c695e8ff0bc5979e1bb2d61d6c327a27d676c89e89cb") depends_on("cxx", type="build") - for ver in ["6.3.0", "6.3.1"]: + for ver in ["6.3.0", "6.3.1", "6.3.2"]: depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}") depends_on(f"hip@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py b/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py index fb5d19e4744..04a54a9bb09 100644 --- a/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py +++ b/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py @@ -17,6 +17,7 @@ class RocmBandwidthTest(CMakePackage): maintainers("srekolam", "renjithravindrankannath", "afzpatel") version("master", branch="master") + version("6.3.2", sha256="3754831244d7c4f6314fc25b3e929adf9abe44c9cb60621dd8ae5d1aa930ae55") version("6.3.1", sha256="98002e4104929a62a308114ed82fba530880359a17f90ebd62a2ca49c2baac78") version("6.3.0", sha256="6d1e444b962e7a40fb9f20c87631865d3e04e8c9027fd21b439bee9b62d0070c") version("6.2.4", sha256="4d25c62d81f60eba8042f57ca0905adc853a214333ffc70238d91e2f53606a79") @@ -86,6 +87,7 @@ class RocmBandwidthTest(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", "master", ]: depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}") @@ -107,6 +109,7 @@ class RocmBandwidthTest(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-core@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/rocm-cmake/package.py b/var/spack/repos/builtin/packages/rocm-cmake/package.py index 30c4d07dc27..05cff118b27 100644 --- a/var/spack/repos/builtin/packages/rocm-cmake/package.py +++ b/var/spack/repos/builtin/packages/rocm-cmake/package.py @@ -20,6 +20,7 @@ class RocmCmake(CMakePackage): license("MIT") version("master", branch="master") + version("6.3.2", sha256="f5104c2289da99a70d8c4c1befbca4f8efa7c89711eaac7b6b63592cd4bd99a8") version("6.3.1", sha256="6994a5bdeea55cd41ec01ab4142785ea02bbdcb83e70f6911095c7cea766ebe8") version("6.3.0", sha256="45a1b96f85ae28a7f62895ddc4d6648500b883af250f52f6417bafb31b3cc75d") version("6.2.4", sha256="76bfac6fba31a9c4ec196d9b9b2d5ec51b8b68840b3fba8686aa42323d76a425") @@ -63,6 +64,7 @@ class RocmCmake(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-core@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/rocm-core/package.py b/var/spack/repos/builtin/packages/rocm-core/package.py index 97c73143fda..7d7573ff6c3 100644 --- a/var/spack/repos/builtin/packages/rocm-core/package.py +++ b/var/spack/repos/builtin/packages/rocm-core/package.py @@ -19,6 +19,7 @@ class RocmCore(CMakePackage): libraries = ["librocm-core"] license("MIT") + version("6.3.2", sha256="3243f661e5e995341e81127a6096ac80169b8481826ebadc02e24020f1ff985d") version("6.3.1", sha256="f8196f3aafe03bd93ae2947162f34098fd08ddbad4eb3deaf92acd434b480304") version("6.3.0", sha256="4fa981335426195028dd6b3a05228a2ebe8e601023a1e99130bba1b14bf60178") version("6.2.4", sha256="46dcfb5d20d242cd0ce6d02ba64d92bdd3ea59c103cf47b665c7d7a4ea7dc7f1") @@ -44,7 +45,7 @@ class RocmCore(CMakePackage): depends_on("cxx", type="build") # generated - for ver in ["6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1"]: + for ver in ["6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2"]: depends_on("llvm-amdgpu", when=f"@{ver}+asan") def setup_build_environment(self, env): diff --git a/var/spack/repos/builtin/packages/rocm-dbgapi/package.py b/var/spack/repos/builtin/packages/rocm-dbgapi/package.py index 0e3512178aa..21c96803c01 100644 --- a/var/spack/repos/builtin/packages/rocm-dbgapi/package.py +++ b/var/spack/repos/builtin/packages/rocm-dbgapi/package.py @@ -24,6 +24,7 @@ class RocmDbgapi(CMakePackage): license("MIT") version("master", branch="amd-master") + version("6.3.2", sha256="0e7cea6ae2eb737ad378787d2ef5f6cbaf9dfb483bb5e61e716601a145677adf") version("6.3.1", sha256="1843423c91a22cf83bef5f14cb50f55ba333047e03e75296b9f9522facde5822") version("6.3.0", sha256="c46ca562fbbac8673c22ee5c92d62ddf6c7dfd7faceeb66d3876cde6beda8872") version("6.2.4", sha256="004e9ace3ead840e44f98fc033b621d5489a554965deecfdb7df768482068282") @@ -78,6 +79,7 @@ class RocmDbgapi(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", "master", ]: depends_on(f"hsa-rocr-dev@{ver}", type="build", when=f"@{ver}") @@ -100,6 +102,7 @@ class RocmDbgapi(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-core@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/rocm-debug-agent/package.py b/var/spack/repos/builtin/packages/rocm-debug-agent/package.py index c8a26d1c8c7..a0ac44bf150 100644 --- a/var/spack/repos/builtin/packages/rocm-debug-agent/package.py +++ b/var/spack/repos/builtin/packages/rocm-debug-agent/package.py @@ -17,6 +17,7 @@ class RocmDebugAgent(CMakePackage): maintainers("srekolam", "renjithravindrankannath", "afzpatel") libraries = ["librocm-debug-agent"] + version("6.3.2", sha256="578aa08b10a456eebd2b548afd86339bd5a5df807611ffd20cc3006eaae74836") version("6.3.1", sha256="0e28a9febf3b95cc6bbf8eae91091bf22a8f49fe9558171251f8f9afe666f9d7") version("6.3.0", sha256="c8c3461395b2fc1e136d61eb5a36ba9f3f751eb00cb9d830f498de2e5d4299d5") version("6.2.4", sha256="a4f213a9e28a1e82543135c0b6d16c5a252186f83fc842f980631943f7e11398") @@ -93,6 +94,7 @@ class RocmDebugAgent(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}") depends_on(f"rocm-dbgapi@{ver}", when=f"@{ver}") @@ -114,6 +116,7 @@ class RocmDebugAgent(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-core@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/rocm-device-libs/package.py b/var/spack/repos/builtin/packages/rocm-device-libs/package.py index 28d56357a53..1a085c7ad0c 100644 --- a/var/spack/repos/builtin/packages/rocm-device-libs/package.py +++ b/var/spack/repos/builtin/packages/rocm-device-libs/package.py @@ -24,6 +24,7 @@ def url_for_version(self, version): maintainers("srekolam", "renjithravindrankannath", "haampie", "afzpatel") version("master", branch="amd-stg-open") + version("6.3.2", sha256="1f52e45660ea508d3fe717a9903fe27020cee96de95a3541434838e0193a4827") version("6.3.1", sha256="e9c2481cccacdea72c1f8d3970956c447cec47e18dfb9712cbbba76a2820552c") version("6.3.0", sha256="79580508b039ca6c50dfdfd7c4f6fbcf489fe1931037ca51324818851eea0c1c") version("6.2.4", sha256="7af782bf5835fcd0928047dbf558f5000e7f0207ca39cf04570969343e789528") @@ -82,6 +83,7 @@ def url_for_version(self, version): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", "master", ]: depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}") @@ -103,6 +105,7 @@ def url_for_version(self, version): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-core@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/rocm-examples/package.py b/var/spack/repos/builtin/packages/rocm-examples/package.py index 84043aa77d8..e107ab8ad7e 100644 --- a/var/spack/repos/builtin/packages/rocm-examples/package.py +++ b/var/spack/repos/builtin/packages/rocm-examples/package.py @@ -18,6 +18,7 @@ class RocmExamples(CMakePackage): license("MIT") + version("6.3.2", sha256="7a71dcfec782338af1d838f86b692974368e362de8ad85d5ec26c23b0afbab9e") version("6.3.1", sha256="c5093cd6641de478b940d2e36d6723f7ef1ccad3f4f96caf0394def2e6c7e325") version("6.3.0", sha256="809b5212d86d182586d676752b192967aee3bde6df8bbbe67558b221d63f5c7c") version("6.2.4", sha256="510931103e4a40b272123b5c731d2ea795215c6171810beb1d5335d73bcc9b03") @@ -28,7 +29,7 @@ class RocmExamples(CMakePackage): depends_on("glfw", type="build") - for ver in ["6.3.1", "6.3.0", "6.2.4", "6.2.1", "6.2.0"]: + for ver in ["6.3.2", "6.3.1", "6.3.0", "6.2.4", "6.2.1", "6.2.0"]: depends_on(f"hip@{ver}", when=f"@{ver}") depends_on(f"hipify-clang@{ver}", when=f"@{ver}") depends_on(f"hipcub@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/rocm-gdb/package.py b/var/spack/repos/builtin/packages/rocm-gdb/package.py index bc9ba549d9e..507eb4d26b5 100644 --- a/var/spack/repos/builtin/packages/rocm-gdb/package.py +++ b/var/spack/repos/builtin/packages/rocm-gdb/package.py @@ -17,6 +17,7 @@ class RocmGdb(AutotoolsPackage): license("LGPL-2.0-or-later") maintainers("srekolam", "renjithravindrankannath") + version("6.3.2", sha256="85b03c1fb99f55272f4732dff58e8ba0a1add454a79d2b9d471df200366d0c7e") version("6.3.1", sha256="954236518491ba547f849be7c86e71ff95ef24535f66acabfd45040e11c25d7b") version("6.3.0", sha256="4a41ffbc4f7a5970181ee0aae07f0ea4cda278870cd60a562b25001f1365e29f") version("6.2.4", sha256="061d00f3d02ca64094008c5da185712712ccd3a922f6e126d5f203cdae2b9e04") @@ -77,6 +78,7 @@ class RocmGdb(AutotoolsPackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-dbgapi@{ver}", type="link", when=f"@{ver}") depends_on(f"comgr@{ver}", type="link", when=f"@{ver}") @@ -98,6 +100,7 @@ class RocmGdb(AutotoolsPackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-core@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/rocm-opencl/package.py b/var/spack/repos/builtin/packages/rocm-opencl/package.py index e45f0852af6..9a7251b6b6f 100644 --- a/var/spack/repos/builtin/packages/rocm-opencl/package.py +++ b/var/spack/repos/builtin/packages/rocm-opencl/package.py @@ -35,6 +35,7 @@ def url_for_version(self, version): license("MIT") version("master", branch="main") + version("6.3.2", sha256="ec13dc4ffe212beee22171cb2825d2b16cdce103c835adddb482b9238cf4f050"), version("6.3.1", sha256="bfb8a4a59e7bd958e2cd4bf6f14c6cdea601d9827ebf6dc7af053a90e963770f") version("6.3.0", sha256="829e61a5c54d0c8325d02b0191c0c8254b5740e63b8bfdb05eec9e03d48f7d2c") version("6.2.4", sha256="0a3164af7f997a4111ade634152957378861b95ee72d7060eb01c86c87208c54") @@ -129,6 +130,7 @@ def url_for_version(self, version): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", "master", ]: depends_on(f"comgr@{ver}", type="build", when=f"@{ver}") @@ -145,6 +147,7 @@ def url_for_version(self, version): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"aqlprofile@{ver}", type="link", when=f"@{ver}") @@ -165,6 +168,7 @@ def url_for_version(self, version): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-core@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py b/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py index e378bc0b81a..8c0f7d49ed2 100644 --- a/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py +++ b/var/spack/repos/builtin/packages/rocm-openmp-extras/package.py @@ -35,6 +35,7 @@ "ad5674b5626ed6720ca5f8772542e8ed3fb7a9150ed7a86a1adbcd70a2074e8e", "8c8240d948817ab1874eff0406d6053ee0518902427e0236e6b4d2cee84ff882", "8fefdd0d9eecd11866ddecbe039347560469eb69d974934005d480eac4432b81", + "eeda81dafd17df7e1d2b9dbf91a23924c6dd8de29f0792725fc25a6cd1d9c5fa", ] devlib = [ @@ -58,6 +59,7 @@ "7af782bf5835fcd0928047dbf558f5000e7f0207ca39cf04570969343e789528", "79580508b039ca6c50dfdfd7c4f6fbcf489fe1931037ca51324818851eea0c1c", "e9c2481cccacdea72c1f8d3970956c447cec47e18dfb9712cbbba76a2820552c", + "1f52e45660ea508d3fe717a9903fe27020cee96de95a3541434838e0193a4827", ] llvm = [ @@ -81,6 +83,7 @@ "7af782bf5835fcd0928047dbf558f5000e7f0207ca39cf04570969343e789528", "79580508b039ca6c50dfdfd7c4f6fbcf489fe1931037ca51324818851eea0c1c", "e9c2481cccacdea72c1f8d3970956c447cec47e18dfb9712cbbba76a2820552c", + "1f52e45660ea508d3fe717a9903fe27020cee96de95a3541434838e0193a4827", ] flang = [ @@ -104,6 +107,7 @@ "51c1308f324101e4b637e78cd2eb652e22f68f6d820991a76189c15131f971dc", "43f10662706dbf22b0090839fd590d9fc633e7339b19aaee7578322ea6809275", "2e38ba138312d18b2677347839a960802bb04090bb92b5e6a15ac06ed789dbc0", + "4b4d8025a215c52e62dd6317cafce224d95f91040e90942c9a93ade568a8dd48", ] extras = [ @@ -127,6 +131,7 @@ "34c3506b0f6aefbf0bc7981ff2901b7a2df975a5b40c5eb078522499d81057f0", "22cdd87b1d66e7e7f9e30fd9031fcbf01ce0b631551959144bb42e7f1dba28cb", "4050c60cbbf582122cc0a30b4a99200341c426f2fa3d81ac8dc61f5a0890ed15", + "70b49c1198bf176498ec4a94584b8ed8a07f623ebfa567e4fcf1a6545b635185", ] versions = [ @@ -150,6 +155,7 @@ "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ] versions_dict = dict() # type: Dict[str,Dict[str,str]] components = ["aomp", "devlib", "llvm", "flang", "extras"] @@ -167,12 +173,13 @@ class RocmOpenmpExtras(Package): """OpenMP support for ROCm LLVM.""" homepage = tools_url + "/aomp" - url = tools_url + "/aomp/archive/rocm-6.2.4.tar.gz" + url = tools_url + "/aomp/archive/rocm-6.3.2.tar.gz" tags = ["rocm"] license("Apache-2.0") maintainers("srekolam", "renjithravindrankannath", "estewart08", "afzpatel") + version("6.3.2", sha256=versions_dict["6.3.2"]["aomp"]) version("6.3.1", sha256=versions_dict["6.3.1"]["aomp"]) version("6.3.0", sha256=versions_dict["6.3.0"]["aomp"]) version("6.2.4", sha256=versions_dict["6.2.4"]["aomp"]) @@ -229,6 +236,7 @@ class RocmOpenmpExtras(Package): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-core@{ver}", when=f"@{ver}") @@ -292,7 +300,7 @@ class RocmOpenmpExtras(Package): for ver in ["6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4"]: depends_on(f"hsakmt-roct@{ver}", when=f"@{ver}") - for ver in ["6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1"]: + for ver in ["6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2"]: depends_on(f"comgr@{ver}", when=f"@{ver}") depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}") depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/rocm-smi-lib/package.py b/var/spack/repos/builtin/packages/rocm-smi-lib/package.py index 1f6b097db2d..ac3f16bb74e 100644 --- a/var/spack/repos/builtin/packages/rocm-smi-lib/package.py +++ b/var/spack/repos/builtin/packages/rocm-smi-lib/package.py @@ -23,6 +23,7 @@ class RocmSmiLib(CMakePackage): libraries = ["librocm_smi64"] version("master", branch="master") + version("6.3.2", sha256="29a9190143dfcbafeac93d8064b00c9320dbca57a3344adb009ec17d9b09d036") version("6.3.1", sha256="0f45e4823e361a1c6ac560eabf6000c3b59e08bcd96e87150149149e861c6a63") version("6.3.0", sha256="573cfb759f8c7700fdcb0c28d045aed0f2d950692bb66a10bd589b89b8f48d0f") version("6.2.4", sha256="eb8986dd571f5862c2db693398c0dbec28e2754f764f6bd3cfb21be7699e4452") @@ -71,6 +72,7 @@ class RocmSmiLib(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-core@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/rocm-tensile/package.py b/var/spack/repos/builtin/packages/rocm-tensile/package.py index 32e3a873a07..5862109bec2 100644 --- a/var/spack/repos/builtin/packages/rocm-tensile/package.py +++ b/var/spack/repos/builtin/packages/rocm-tensile/package.py @@ -18,6 +18,7 @@ class RocmTensile(CMakePackage): license("MIT") maintainers("srekolam", "renjithravindrankannath", "haampie", "afzpatel") + version("6.3.2", sha256="700e43a22d7e6309bf74624b18a42bb0132ef35716fccec897d3045a97759e6a") version("6.3.1", sha256="9882e8f949e1eb1d4b7dbd215370ecce643852dd2ce6e021d59cd49d32ba9dea") version("6.3.0", sha256="7ae90d1a513dc6f000a45f644b360305ef212ab3dff7b0217b6addabebf932e1") version("6.2.4", sha256="dd0721e4371c8752aa4b14362f75d7ebb7805f57dcb990e03ae08cef4a291383") @@ -87,6 +88,7 @@ class RocmTensile(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-cmake@{ver}", type="build", when=f"@{ver}") depends_on(f"hip@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/rocm-validation-suite/009-replacing-rocm-path-with-package-path-6.3.patch b/var/spack/repos/builtin/packages/rocm-validation-suite/009-replacing-rocm-path-with-package-path-6.3.patch deleted file mode 100644 index 9314e302304..00000000000 --- a/var/spack/repos/builtin/packages/rocm-validation-suite/009-replacing-rocm-path-with-package-path-6.3.patch +++ /dev/null @@ -1,687 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 77065a7..709a10b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -76,14 +76,18 @@ endif(rocblas_FOUND) - # Making ROCM_PATH, CMAKE_INSTALL_PREFIX, CPACK_PACKAGING_INSTALL_PREFIX as CACHE - # variables since we will pass them as cmake params appropriately, and - # all find_packages relevant to this build will be in ROCM path hence appending it to CMAKE_PREFIX_PATH --set(ROCM_PATH "/opt/rocm" CACHE PATH "ROCM install path") --set(CMAKE_INSTALL_PREFIX "/opt/rocm" CACHE PATH "CMAKE installation directory") --set(CPACK_PACKAGING_INSTALL_PREFIX "/opt/rocm" CACHE PATH "Prefix used in built packages") -+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") -+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -+set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - list(APPEND CMAKE_PREFIX_PATH "${ROCM_PATH}") --set(ROCR_INC_DIR "${ROCM_PATH}/include" CACHE PATH "Contains header files exported by ROC Runtime" FORCE) --set(ROCR_LIB_DIR "${ROCM_PATH}/lib" CACHE PATH "Contains library files exported by ROC Runtime" FORCE) --set(HIP_INC_DIR "${ROCM_PATH}" CACHE PATH "Contains header files exported by ROC Runtime") --set(ROCT_INC_DIR "${ROCM_PATH}/include" CACHE PATH "Contains header files exported by ROC Trunk" FORCE) -+set(ROCR_INC_DIR "${HSA_PATH}/include" CACHE PATH "Contains header files exported by ROC Runtime") -+set(ROCR_LIB_DIR "${HSA_PATH}/lib" CACHE PATH "Contains library files exported by ROC Runtime") -+set(HIP_INC_DIR "${HIP_PATH}" CACHE PATH "Contains header files exported by ROC Runtime") -+set(ROCT_INC_DIR "${ROCM_PATH}/include" CACHE PATH "Contains header files exported by ROC Trunk") -+set(HIPRAND_INC_DIR "${HIPRAND_DIR}/include" CACHE PATH "Contains header files exported by ROC Trunk") -+set(HIPRAND_LIB_DIR "${HIPRAND_DIR}/lib" CACHE PATH "Contains header files exported by ROC Trunk") -+set(ROCRAND_INC_DIR "${ROCRAND_DIR}/include" CACHE PATH "Contains header files exported by ROC Trunk") -+set(ROCRAND_LIB_DIR "${ROCRAND_DIR}/lib" CACHE PATH "Contains header files exported by ROC Trunk") - - add_definitions(-DROCM_PATH="${ROCM_PATH}") - if(FETCH_ROCMPATH_FROM_ROCMCORE) -@@ -446,18 +450,20 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/rvs_smi-build/librocm_smi64.so - ) - - endif() # if (RVS_ROCMSMI EQUAL 1) -- --set(HIPRAND_INC_DIR "${ROCM_PATH}/include") --set(HIPRAND_LIB_DIR "${ROCM_PATH}/lib") --set(HIPBLASLT_INC_DIR "${ROCM_PATH}/include") --set(HIPBLASLT_LIB_DIR "${ROCM_PATH}/lib") -+find_package( hipblas-common REQUIRED CONFIG PATHS ${HIP_DIR} ${ROCM_PATH} /opt/rocm) -+set(HIPRAND_INC_DIR "${HIPRAND_DIR}/include") -+set(HIPRAND_LIB_DIR "${HIPRAND_DIR}/lib") -+set(HIPBLASLT_INC_DIR "${HIPBLASLT_DIR}/include") -+set(HIPBLASLT_LIB_DIR "${HIPBLASLT_DIR}/lib") -+set(ROCRAND_INC_DIR "${ROCRAND_DIR}/include") -+set(ROCRAND_LIB_DIR "${ROCRAND_DIR}/lib") - - if (RVS_ROCBLAS EQUAL 1) - set(ROCBLAS_INC_DIR "${CMAKE_BINARY_DIR}/rvs_rblas-src/build/release/rocblas-install") - set(ROCBLAS_LIB_DIR "${CMAKE_BINARY_DIR}/rvs_rblas-src/build/release/rocblas-install/lib/") - else() -- set(ROCBLAS_INC_DIR "${ROCM_PATH}/include") -- set(ROCBLAS_LIB_DIR "${ROCM_PATH}/lib") -+ set(ROCBLAS_INC_DIR "${ROCBLAS_DIR}/include") -+ set(ROCBLAS_LIB_DIR "${ROCBLAS_DIR}/lib") - endif() - - if (RVS_ROCMSMI EQUAL 1) -@@ -472,8 +478,8 @@ else() - set(ROCM_SMI_LIB_DIR "${ROCM_PATH}/rocm_smi/lib") - else() - message( STATUS "ROCBLAS REORG Enabled Version: ${RVS_ROCBLAS_VERSION_FLAT}" ) -- set(ROCM_SMI_INC_DIR "${ROCM_PATH}/include") -- set(ROCM_SMI_LIB_DIR "${ROCM_PATH}/lib") -+ set(ROCM_SMI_INC_DIR "${ROCM_SMI_DIR}/include") -+ set(ROCM_SMI_LIB_DIR "${ROCM_SMI_DIR}/lib") - endif() - endif() - set(ROCM_SMI_LIB "rocm_smi64" CACHE STRING "rocm_smi library name") -diff --git a/babel.so/CMakeLists.txt b/babel.so/CMakeLists.txt -index ca29a5b..36ff304 100644 ---- a/babel.so/CMakeLists.txt -+++ b/babel.so/CMakeLists.txt -@@ -109,13 +109,13 @@ set(HIP_HCC_LIB "amdhip64") - add_compile_options(-DRVS_ROCBLAS_VERSION_FLAT=${RVS_ROCBLAS_VERSION_FLAT}) - - # Determine Roc Runtime header files are accessible --if(NOT EXISTS ${HIP_INC_DIR}/include/hip/hip_runtime.h) -- message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_INC_DIR path. Current value is : " ${HIP_INC_DIR}) -+if(NOT EXISTS ${HIP_PATH}/include/hip/hip_runtime.h) -+ message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH}) - RETURN() - endif() - --if(NOT EXISTS ${HIP_INC_DIR}/include/hip/hip_runtime_api.h) -- message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_INC_DIR path. Current value is : " ${HIP_INC_DIR}) -+if(NOT EXISTS ${HIP_PATH}/include/hip/hip_runtime_api.h) -+ message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH}) - RETURN() - endif() - -@@ -135,16 +135,16 @@ if(DEFINED RVS_ROCMSMI) - endif() - - --if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so") -- message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR}) -+if(NOT EXISTS "${HIP_PATH}/lib/lib${HIP_HCC_LIB}.so") -+ message("ERROR: ROC Runtime libraries can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH}) - RETURN() - endif() - - ## define include directories --include_directories(./ ../ ${ROCR_INC_DIR} ${HIP_INC_DIR}) -+include_directories(./ ../ ${HIP_PATH}) - - # Add directories to look for library files to link --link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH}) -+link_directories(${RVS_LIB_DIR} ${HIP_PATH}/lib/ ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR}) - ## additional libraries - set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) - -@@ -156,7 +156,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES}) - set_target_properties(${RVS_TARGET} PROPERTIES - SUFFIX .so.${LIB_VERSION_STRING} - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) --target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB}) -+target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB} ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so) - add_dependencies(${RVS_TARGET} rvslib) - - add_custom_command(TARGET ${RVS_TARGET} POST_BUILD -diff --git a/cmake_modules/tests_unit.cmake b/cmake_modules/tests_unit.cmake -index 9760b72..d585f8b 100644 ---- a/cmake_modules/tests_unit.cmake -+++ b/cmake_modules/tests_unit.cmake -@@ -27,7 +27,7 @@ - ## define additional unit testing include directories - include_directories(${UT_INC}) - ## define additional unit testing lib directories --link_directories(${UT_LIB} ${RVS_LIB_DIR}) -+link_directories(${UT_LIB} ${RVS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR}) - - file(GLOB TESTSOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} test/test*.cpp ) - #message ( "TESTSOURCES: ${TESTSOURCES}" ) -@@ -46,6 +46,7 @@ FOREACH(SINGLE_TEST ${TESTSOURCES}) - add_dependencies(${TEST_NAME} rvs_gtest_target) - target_link_libraries(${TEST_NAME} - ${UT_LINK_LIBS} rvslibut rvslib gtest_main gtest pthread pci -+ ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so - ) - target_compile_definitions(${TEST_NAME} PUBLIC RVS_UNIT_TEST) - if(DEFINED tcd.${TEST_NAME}) -diff --git a/edp.so/CMakeLists.txt b/edp.so/CMakeLists.txt -index 4466edc..8c739bb 100644 ---- a/edp.so/CMakeLists.txt -+++ b/edp.so/CMakeLists.txt -@@ -128,17 +128,17 @@ if(DEFINED RVS_ROCMSMI) - endif() - - --if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so") -+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so") - message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR}) - RETURN() - endif() - - ## define include directories --include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR}) -+include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR} ${YAML_CPP_INCLUDE_DIRS} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR} ${HIPBLASLT_INC_DIR} ${HIPBLAS-COMMON_INCLUDE_DIRS}) - # Add directories to look for library files to link --link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR}) -+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR}) - ## additional libraries --set (PROJECT_LINK_LIBS rvslib libpthread.so libpciaccess.so libpci.so libm.so) -+set (PROJECT_LINK_LIBS rvslib libpthread.so libpciaccess.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so) - - ## define source files - set (SOURCES src/rvs_module.cpp src/action.cpp src/edp_worker.cpp ) -@@ -148,7 +148,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES}) - set_target_properties(${RVS_TARGET} PROPERTIES - SUFFIX .so.${LIB_VERSION_STRING} - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) --target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB}) -+target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB} ${HIPRAND_LIB} ${ROCRAND_LIB}) - add_dependencies(${RVS_TARGET} rvslib) - - add_custom_command(TARGET ${RVS_TARGET} POST_BUILD -diff --git a/gm.so/CMakeLists.txt b/gm.so/CMakeLists.txt -index d3caa84..94a06be 100644 ---- a/gm.so/CMakeLists.txt -+++ b/gm.so/CMakeLists.txt -@@ -118,11 +118,11 @@ if(DEFINED RVS_ROCMSMI) - endif() - - ## define include directories --include_directories(./ ../ ${ROCM_SMI_INC_DIR}) -+include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${YAML_CPP_INCLUDE_DIRS}) - # Add directories to look for library files to link --link_directories(${RVS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH}) -+link_directories(${RVS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR}) - ## additional libraries --set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) -+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so librocm_smi64.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so) - - ## define source files - set(SOURCES src/rvs_module.cpp src/action.cpp src/worker.cpp) -@@ -133,7 +133,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES}) - set_target_properties(${RVS_TARGET} PROPERTIES - SUFFIX .so.${LIB_VERSION_STRING} - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) --target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${ROCM_SMI_LIB}) -+target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS}) - add_dependencies(${RVS_TARGET} rvslib) - - add_custom_command(TARGET ${RVS_TARGET} POST_BUILD -@@ -149,7 +149,7 @@ install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib${RVS}.so" - - # TEST SECTION - if (RVS_BUILD_TESTS) -- add_custom_command(TARGET ${RVS_TARGET} POST_BUILD -+ B_add_custom_command(TARGET ${RVS_TARGET} POST_BUILD - COMMAND ln -fs ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/lib${RVS}.so.${VERSION_MAJOR} ${RVS_BINTEST_FOLDER}/lib${RVS}.so WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} - ) - include(${CMAKE_CURRENT_SOURCE_DIR}/tests.cmake) -diff --git a/gm.so/tests.cmake b/gm.so/tests.cmake -index 71dabc8..7898dee 100644 ---- a/gm.so/tests.cmake -+++ b/gm.so/tests.cmake -@@ -31,11 +31,11 @@ set(CORE_RUNTIME_NAME "hsa-runtime") - set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64") - - set(UT_LINK_LIBS libpthread.so libpci.so libm.so libdl.so "lib${ROCM_SMI_LIB}.so" -- ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} ${HIPRAND_LIB} ${HIPBLASLT_LIB} -+ ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} "lib${HIPRAND_LIB}.so" "lib${ROCRAND_LIB}.so" "lib${HIPBLASLT_LIB}.so" - ) - - # Add directories to look for library files to link --link_directories(${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR}) -+link_directories(${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR}) - - set (UT_SOURCES src/action.cpp src/worker.cpp - ) -diff --git a/gpup.so/CMakeLists.txt b/gpup.so/CMakeLists.txt -index 43d337a..c92d8ba 100644 ---- a/gpup.so/CMakeLists.txt -+++ b/gpup.so/CMakeLists.txt -@@ -109,11 +109,11 @@ else() - endif() - - ## define include directories --include_directories(./ ../ include ../include) -+include_directories(./ ../ include ../include ${YAML_CPP_INCLUDE_DIRS}) - # Add directories to look for library files to link --link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH}) -+link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR}) - ## additional libraries --set (PROJECT_LINK_LIBS rvslib libpci.so libm.so) -+set (PROJECT_LINK_LIBS rvslib libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so) - - ## define source files - set(SOURCES src/rvs_module.cpp src/action.cpp) -diff --git a/gpup.so/tests.cmake b/gpup.so/tests.cmake -index 566508f..a64622c 100644 ---- a/gpup.so/tests.cmake -+++ b/gpup.so/tests.cmake -@@ -26,12 +26,13 @@ - set(ROCBLAS_LIB "rocblas") - set(HIPRAND_LIB "hiprand") - set(HIPBLASLT_LIB "hipblaslt") -+set(ROCRAND_LIB "rocrand") - set(ROC_THUNK_NAME "hsakmt") - set(CORE_RUNTIME_NAME "hsa-runtime") - set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64") - - set(UT_LINK_LIBS libpthread.so libm.so libdl.so ${ROCM_SMI_LIB} -- ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} ${HIPRAND_LIB} ${HIPBLASLT_LIB}) -+ ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} ${HIPRAND_LIB} ${HIPBLASLT_LIB} ${ROCRAND_LIB}) - - # Add directories to look for library files to link - link_directories(${RVS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR}) -diff --git a/gst.so/CMakeLists.txt b/gst.so/CMakeLists.txt -index fd346ce..eebc90b 100644 ---- a/gst.so/CMakeLists.txt -+++ b/gst.so/CMakeLists.txt -@@ -137,17 +137,17 @@ if(DEFINED RVS_ROCMSMI) - endif() - - --if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so") -+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so") - message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR}) - RETURN() - endif() - - ## define include directories --include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR}) -+include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR} ${YAML_CPP_INCLUDE_DIRS} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR} ${HIPBLASLT_INC_DIR} ${HIPBLAS-COMMON_INCLUDE_DIRS}) - # Add directories to look for library files to link --link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH}) -+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HIP_INC_DIR}/lib/ ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_DIR} ${ROCRAND_DIR}) - ## additional libraries --set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) -+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so) - - ## define source files - set(SOURCES src/rvs_module.cpp src/action.cpp src/gst_worker.cpp) -diff --git a/iet.so/CMakeLists.txt b/iet.so/CMakeLists.txt -index 002c03c..e0383a6 100644 ---- a/iet.so/CMakeLists.txt -+++ b/iet.so/CMakeLists.txt -@@ -145,7 +145,7 @@ if(DEFINED RVS_ROCMSMI) - endif() - endif() - --if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so") -+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so") - message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR}) - RETURN() - endif() -@@ -160,11 +160,11 @@ if(DEFINED RVS_ROCMSMI) - endif() - - ## define include directories --include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${ROCBLAS_INC_DIR} ${ROCR_INC_DIR} ${HIP_INC_DIR}) -+include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${ROCBLAS_INC_DIR} ${ROCR_INC_DIR} ${HIP_INC_DIR} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR} ${HIPBLASLT_INC_DIR} ${HIPBLAS-COMMON_INCLUDE_DIRS}) - # Add directories to look for library files to link --link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH}) -+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR}) - ## additional libraries --set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) -+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so librocm_smi64.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so ) - - set(SOURCES src/rvs_module.cpp src/action.cpp src/iet_worker.cpp ) - -@@ -173,7 +173,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES}) - set_target_properties(${RVS_TARGET} PROPERTIES - SUFFIX .so.${LIB_VERSION_STRING} - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) --target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB} ${ROCM_SMI_LIB}) -+target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_INC_DIR}/lib/ ${HIP_HCC_LIB} ${ROCBLAS_LIB}) - add_dependencies(${RVS_TARGET} rvslib) - - add_custom_command(TARGET ${RVS_TARGET} POST_BUILD -diff --git a/mem.so/CMakeLists.txt b/mem.so/CMakeLists.txt -index 5133337..1f05dc6 100644 ---- a/mem.so/CMakeLists.txt -+++ b/mem.so/CMakeLists.txt -@@ -134,18 +134,18 @@ if(DEFINED RVS_ROCMSMI) - endif() - - --if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so") -+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so") - message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR}) - RETURN() - endif() - - ## define include directories --include_directories(./ ../ ${ROCR_INC_DIR} ${HIP_INC_DIR}) -+include_directories(./ ../ ${ROCR_INC_DIR} ${HIP_INC_DIR} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR} ${HIPBLASLT_INC_DIR} ${HIPBLAS-COMMON_INCLUDE_DIRS}) - - # Add directories to look for library files to link --link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH}) -+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HIP_INC_DIR}/lib ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR}) - ## additional libraries --set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) -+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so) - - ## define source files - set(SOURCES src/rvs_module.cpp src/action.cpp src/rvs_memtest.cpp src/rvs_memworker.cpp) -diff --git a/pbqt.so/CMakeLists.txt b/pbqt.so/CMakeLists.txt -index 5ae675a..8b7e5a6 100644 ---- a/pbqt.so/CMakeLists.txt -+++ b/pbqt.so/CMakeLists.txt -@@ -136,11 +136,11 @@ if(NOT EXISTS ${ROCR_LIB_DIR}/${CORE_RUNTIME_LIBRARY}.so) - endif() - - ## define include directories --include_directories(./ ../ pci ${ROCR_INC_DIR}) -+include_directories(./ ../ pci ${ROCR_INC_DIR} ${YAML_CPP_INCLUDE_DIRS} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR} ${HIPBLASLT_INC_DIR} ${HIPBLAS-COMMON_INCLUDE_DIRS}) - # Add directories to look for library files to link --link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH}) -+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HSAKMT_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR}) - ## additional libraries --set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) -+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so) - - ## define source files - set(SOURCES src/rvs_module.cpp src/action.cpp src/action_run.cpp -diff --git a/pebb.so/CMakeLists.txt b/pebb.so/CMakeLists.txt -index c4e2964..a37e78a 100644 ---- a/pebb.so/CMakeLists.txt -+++ b/pebb.so/CMakeLists.txt -@@ -137,11 +137,11 @@ if(NOT EXISTS ${ROCR_LIB_DIR}/${CORE_RUNTIME_LIBRARY}.so) - endif() - - ## define include directories --include_directories(./ ../ pci ${ROCR_INC_DIR}) -+include_directories(./ ../ pci ${ROCR_INC_DIR} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR} ${HIPBLASLT_INC_DIR} ${HIPBLAS-COMMON_INCLUDE_DIRS}) - # Add directories to look for library files to link --link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH}) -+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HSAKMT_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR}/.. ${ROCRAND_LIB_DIR}/..) - ## additional libraries --set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) -+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so) - - ## define source files - set(SOURCES src/rvs_module.cpp src/action.cpp src/action_run.cpp -diff --git a/peqt.so/CMakeLists.txt b/peqt.so/CMakeLists.txt -index ead507d..d83c9e5 100644 ---- a/peqt.so/CMakeLists.txt -+++ b/peqt.so/CMakeLists.txt -@@ -107,11 +107,11 @@ else() - endif() - - ## define include directories --include_directories(./ ../) -+include_directories(./ ../ ${HSA_PATH}) - # Add directories to look for library files to link --link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH}) -+link_directories(${RVS_LIB_DIR} ${HSA_PATH}/lib/ ${HSAKMT_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR}) - ## additional libraries --set (PROJECT_LINK_LIBS rvslib libpci.so libm.so) -+set (PROJECT_LINK_LIBS rvslib libpci.so libm.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so) - - ## define source files - set(SOURCES src/rvs_module.cpp src/action.cpp) -@@ -121,7 +121,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES}) - set_target_properties(${RVS_TARGET} PROPERTIES - SUFFIX .so.${LIB_VERSION_STRING} - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) --target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ) -+target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so) - add_dependencies(${RVS_TARGET} rvslib) - - add_custom_command(TARGET ${RVS_TARGET} POST_BUILD -diff --git a/perf.so/CMakeLists.txt b/perf.so/CMakeLists.txt -index 518dac9..5cc54c1 100644 ---- a/perf.so/CMakeLists.txt -+++ b/perf.so/CMakeLists.txt -@@ -137,17 +137,17 @@ if(DEFINED RVS_ROCMSMI) - endif() - - --if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so") -+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so") - message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR}) - RETURN() - endif() - - ## define include directories --include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR}) -+include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR} ${HIPBLASLT_INC_DIR} ${HIPBLAS-COMMON_INCLUDE_DIRS}) - # Add directories to look for library files to link --link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH}) -+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${HIP_INC_DIR}/lib ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR}) - ## additional libraries --set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) -+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so) - - ## define source files - set(SOURCES src/rvs_module.cpp src/action.cpp src/perf_worker.cpp) -@@ -157,7 +157,7 @@ add_library( ${RVS_TARGET} SHARED ${SOURCES}) - set_target_properties(${RVS_TARGET} PROPERTIES - SUFFIX .so.${LIB_VERSION_STRING} - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) --target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS} ${HIP_HCC_LIB} ${ROCBLAS_LIB}) -+target_link_libraries(${RVS_TARGET} ${PROJECT_LINK_LIBS}) - add_dependencies(${RVS_TARGET} rvslib) - - add_custom_command(TARGET ${RVS_TARGET} POST_BUILD -diff --git a/pesm.so/CMakeLists.txt b/pesm.so/CMakeLists.txt -index 1f27f34..502c1c8 100644 ---- a/pesm.so/CMakeLists.txt -+++ b/pesm.so/CMakeLists.txt -@@ -107,11 +107,11 @@ else() - endif() - - ## define include directories --include_directories(./ ../ pci) -+include_directories(./ ../ pci ${YAML_CPP_INCLUDE_DIRS}) - # Add directories to look for library files to link --link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH}) -+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR} ${HIPRAND_DIR} ${ROCRAND_DIR}) - ## additional libraries --set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so) -+set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so ${PROJECT_LINK_LIBS} ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so) - - ## define source files - set(SOURCES src/rvs_module.cpp src/action.cpp src/worker.cpp) -diff --git a/pesm.so/tests.cmake b/pesm.so/tests.cmake -index e255144..b3f2660 100644 ---- a/pesm.so/tests.cmake -+++ b/pesm.so/tests.cmake -@@ -31,11 +31,11 @@ set(CORE_RUNTIME_NAME "hsa-runtime") - set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64") - - set(UT_LINK_LIBS libpthread.so libpci.so libm.so libdl.so "lib${ROCM_SMI_LIB}.so" -- ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} ${HIPRAND_LIB} ${HIPBLASLT_LIB} -+ ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} "lib${HIPRAND_LIB}.so" "lib${HIPBLASLT_LIB}.so" - ) - - # Add directories to look for library files to link --link_directories(${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${HIPRAND_LIB_DIR}) -+link_directories(${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR}) - - set (UT_SOURCES test/unitactionbase.cpp - ) -diff --git a/rcqt.so/CMakeLists.txt b/rcqt.so/CMakeLists.txt -index c0099ab..fcc82f3 100644 ---- a/rcqt.so/CMakeLists.txt -+++ b/rcqt.so/CMakeLists.txt -@@ -108,11 +108,11 @@ else() - endif() - - ## define include directories --include_directories(./ ../) -+include_directories(./ ../ ${YAML_CPP_INCLUDE_DIRS}) - # Add directories to look for library files to link --link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH}) -+link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH} ${ASAN_LIB_PATH} ${HSAKMT_LIB_DIR} ${ROCM_SMI_LIB_DIR}) - ## additional libraries --set (PROJECT_LINK_LIBS rvslib) -+set (PROJECT_LINK_LIBS rvslib ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so) - - ## define source files - set(SOURCES -diff --git a/rvs/CMakeLists.txt b/rvs/CMakeLists.txt -index 5c1c124..70fa609 100644 ---- a/rvs/CMakeLists.txt -+++ b/rvs/CMakeLists.txt -@@ -34,6 +34,7 @@ set ( RVS "rvs" ) - set ( RVS_PACKAGE "rvs-roct" ) - set ( RVS_COMPONENT "lib${RVS}" ) - set ( RVS_TARGET "${RVS}" ) -+set ( YAML_CPP_LIBRARIES "${YAML_CPP_LIB_PATH}") - - project ( ${RVS_TARGET} ) - -@@ -115,21 +116,23 @@ endif() - ## define include directories - include_directories(./ ../ ${YAML_CPP_INCLUDE_DIRS}) - ## define lib directories --link_directories(${CMAKE_CURRENT_BINARY_DIR} ${RVS_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH} ${HIPRAND_LIB_DIR}) -+link_directories(${CMAKE_CURRENT_BINARY_DIR} ${RVS_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR} ${RVS_LIB_DIR}/.. ${YAML_CPP_LIBRARIES}) - - ## additional libraries --set(ROCBLAS_LIB "rocblas") --set(ROC_THUNK_NAME "hsakmt") --set(CORE_RUNTIME_NAME "hsa-runtime") --set(HIPRAND_LIB "hiprand") --set(HIPBLASLT_LIB "hipblaslt") --set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64") --set(PROJECT_LINK_LIBS libdl.so libpthread.so libpci.so ${YAML_CPP_LIBRARIES}) -+set(ROCBLAS_LIB "${ROCBLAS_LIB_DIR}/librocblas.so") -+set(ROC_THUNK_NAME "${HSAKMT_LIB_DIR}/libhsakmt.a") -+set(CORE_RUNTIME_NAME "${HSA_PATH}/lib/libhsa-runtime64.so") -+set(YAML_CPP_LIB "${YAML_CPP_LIBRARIES}/libyaml-cpp.a") -+set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}") -+set(PROJECT_LINK_LIBS libdl.so libpthread.so libpci.so) -+set(HIPRAND_LIB "${HIPRAND_LIB_DIR}/libhiprand.so") -+set(ROCRAND_LIB "${ROCRAND_LIB_DIR}/librocrand.so") -+set(HIPBLASLT_LIB "${HIPBLASLT_LIB_DIR}/libhipblaslt.so") - - ## define target - add_executable(${RVS_TARGET} src/rvs.cpp) - target_link_libraries(${RVS_TARGET} rvslib -- ${ROCBLAS_LIB} ${ROCM_SMI_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${PROJECT_LINK_LIBS} ${HIPRAND_LIB} ${HIPBLASLT_LIB}) -+ ${ROCBLAS_LIB} ${ROCM_SMI_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${PROJECT_LINK_LIBS} ${HIPRAND_LIB} ${HIPBLASLT_LIB} ${YAML_CPP_LIB} ${ROCRAND_LIB}) - add_dependencies(${RVS_TARGET} rvslib) - - install(TARGETS ${RVS_TARGET} -diff --git a/rvs/tests.cmake b/rvs/tests.cmake -index 15e72c2..36fc223 100644 ---- a/rvs/tests.cmake -+++ b/rvs/tests.cmake -@@ -38,12 +38,12 @@ set(CORE_RUNTIME_NAME "hsa-runtime") - set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64") - - ## define lib directories --link_directories(${RVS_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${HIPRAND_LIB_DIR}) -+link_directories(${RVS_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR}) - - ## define target for "test-to-fail" - add_executable(${RVS_TARGET}fail src/rvs.cpp) - target_link_libraries(${RVS_TARGET}fail rvslib rvslibut ${PROJECT_LINK_LIBS} -- ${ROCM_SMI_LIB} ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${ROCM_CORE} ${CORE_RUNTIME_TARGET} ${HIPRAND_LIB} ${HIPBLASLT_LIB}) -+ ${ROCM_SMI_LIB} ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${ROCM_CORE} ${CORE_RUNTIME_TARGET} ${HIPRAND_LIB} ${HIPBLASLT_LIB} ${ROCRAND_LIB}) - - target_compile_definitions(${RVS_TARGET}fail PRIVATE RVS_INVERT_RETURN_STATUS) - set_target_properties(${RVS_TARGET}fail PROPERTIES -@@ -212,7 +212,7 @@ FOREACH(SINGLE_TEST ${TESTSOURCES}) - ${PROJECT_LINK_LIBS} - ${PROJECT_TEST_LINK_LIBS} - rvslib rvslibut gtest_main gtest pthread -- ${ROCM_SMI_LIB} ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${HIPRAND_LIB} ${HIPBLASLT_LIB} -+ ${ROCM_SMI_LIB} ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${HIPRAND_LIB} ${HIPBLASLT_LIB} ${ROCRAND_LIB} - ) - add_dependencies(${TEST_NAME} rvs_gtest_target) - -diff --git a/rvslib/CMakeLists.txt b/rvslib/CMakeLists.txt -index bf806a0..7693b0e 100644 ---- a/rvslib/CMakeLists.txt -+++ b/rvslib/CMakeLists.txt -@@ -116,7 +116,7 @@ endif() - - ## define include directories - include_directories(./ ../ ../rvs -- ${ROCM_SMI_INC_DIR} ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR} ${HIPBLASLT_INC_DIR}) -+ ${ROCM_SMI_INC_DIR} ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_PATH} ${YAML_CPP_INCLUDE_DIRS} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR} ${HIPBLASLT_INC_DIR} ${HIPBLAS-COMMON_INCLUDE_DIRS}) - - link_directories(${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) - -diff --git a/smqt.so/CMakeLists.txt b/smqt.so/CMakeLists.txt -index 042586f..285cb17 100644 ---- a/smqt.so/CMakeLists.txt -+++ b/smqt.so/CMakeLists.txt -@@ -106,11 +106,11 @@ else() - endif() - - ## define include directories --include_directories(./ ../ pci) -+include_directories(./ ../ pci ${YAML_CPP_INCLUDE_DIRS}) - # Add directories to look for library files to link --link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH}) -+link_directories(${RVS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) - ## additional libraries --set (PROJECT_LINK_LIBS rvslib libpci.so libm.so) -+set (PROJECT_LINK_LIBS rvslib libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so) - - ## define source files - set(SOURCES src/rvs_module.cpp src/action.cpp) -diff --git a/smqt.so/tests.cmake b/smqt.so/tests.cmake -index 8b6ea93..329a967 100644 ---- a/smqt.so/tests.cmake -+++ b/smqt.so/tests.cmake -@@ -31,11 +31,11 @@ set(CORE_RUNTIME_NAME "hsa-runtime") - set(CORE_RUNTIME_TARGET "${CORE_RUNTIME_NAME}64") - - set(UT_LINK_LIBS libpthread.so libpci.so libm.so libdl.so "lib${ROCM_SMI_LIB}.so" -- ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} ${HIPRAND_LIB} ${HIPBLASLT_LIB} -+ ${ROCBLAS_LIB} ${ROC_THUNK_NAME} ${CORE_RUNTIME_TARGET} ${ROCM_CORE} ${YAML_CPP_LIBRARIES} "lib${HIPRAND_LIB}.so" "lib${HIPBLASLT_LIB}.so" - ) - - # Add directories to look for library files to link --link_directories(${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${HIPRAND_LIB_DIR}) -+link_directories(${ROCM_SMI_LIB_DIR} ${ROCT_LIB_DIR} ${ROCBLAS_LIB_DIR} ${HIPRAND_LIB_DIR} ${ROCRAND_LIB_DIR}) - - set (UT_SOURCES src/action.cpp test/unitsmqt.cpp - ) -diff --git a/testif.so/CMakeLists.txt b/testif.so/CMakeLists.txt -index 4cba0f9..691534a 100644 ---- a/testif.so/CMakeLists.txt -+++ b/testif.so/CMakeLists.txt -@@ -108,11 +108,11 @@ endif() - - - ## define include directories --include_directories(./ ../ pci) -+include_directories(./ ../ pci ${YAML_CPP_INCLUDE_DIRS}) - # Add directories to look for library files to link --link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH}) -+link_directories(${RVS_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR}) - ## additional libraries --set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so) -+set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so ${ROCBLAS_LIB_DIR}/librocblas.so ${HSAKMT_LIB_DIR}/libhsakmt.a ${HSA_PATH}/lib/libhsa-runtime64.so) - - ## define source files - ## set(SOURCES src/rvs_module.cpp src/action.cpp src/worker.cpp) -diff --git a/tst.so/CMakeLists.txt b/tst.so/CMakeLists.txt -index 1a1a8b0..7c70b04 100644 ---- a/tst.so/CMakeLists.txt -+++ b/tst.so/CMakeLists.txt -@@ -140,7 +140,7 @@ if(DEFINED RVS_ROCMSMI) - endif() - endif() - --if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so") -+if(NOT EXISTS "${HIP_INC_DIR}/lib/lib${HIP_HCC_LIB}.so") - message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR}) - RETURN() - endif() -@@ -155,11 +155,11 @@ if(DEFINED RVS_ROCMSMI) - endif() - - ## define include directories --include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${ROCBLAS_INC_DIR} ${ROCR_INC_DIR} ${HIP_INC_DIR}) -+include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${ROCBLAS_INC_DIR} ${ROCR_INC_DIR} ${HIP_INC_DIR} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR} ${HIPBLASLT_INC_DIR} ${HIPBLAS-COMMON_INCLUDE_DIRS}) - # Add directories to look for library files to link --link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH}) -+link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH} ${HIPRAND_LIB_DIR}/.. ${ROCRAND_LIB_DIR}/..) - ## additional libraries --set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so) -+set (PROJECT_LINK_LIBS rvslib libpthread.so libpci.so libm.so ${HIPRAND_LIB_DIR}/libhiprand.so ${ROCRAND_LIB_DIR}/librocrand.so) - - set(SOURCES src/rvs_module.cpp src/action.cpp src/tst_worker.cpp ) - 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 3f13babb57f..b767021e285 100644 --- a/var/spack/repos/builtin/packages/rocm-validation-suite/package.py +++ b/var/spack/repos/builtin/packages/rocm-validation-suite/package.py @@ -21,6 +21,7 @@ class RocmValidationSuite(CMakePackage): license("MIT") maintainers("srekolam", "renjithravindrankannath", "afzpatel") + version("6.3.2", sha256="c13d1efc21358901074f73c48f9cc8531cd5c6d28b7702d022f3efbbaf4b4286") version("6.3.1", sha256="5a5ec682729292d57838191e217a3475d662c5c25a7bd79c4996fdf4b5e36a5a") version("6.3.0", sha256="1e2b7eee002dd922625bcf792104e265cc5a57bec21f13d79d68036aa84b422f") version("6.2.4", sha256="ccdea6e955ca145a29d47da74d77b14196c935b57502edaed37fd18029b5220c") @@ -62,7 +63,11 @@ class RocmValidationSuite(CMakePackage): patch("009-replacing-rocm-path-with-package-path.patch", when="@6.0") patch("009-replacing-rocm-path-with-package-path-6.1.patch", when="@6.1:6.2.0") patch("009-replacing-rocm-path-with-package-path-6.2.1.patch", when="@6.2.1:6.2.4") - patch("009-replacing-rocm-path-with-package-path-6.3.patch", when="@6.3.0:") + patch( + "https://github.com/ROCm/ROCmValidationSuite/commit/bd63256d43d11ae09a2c203e05cb002c7a730c59.patch?full_index=1", + sha256="bd63baeb4dea00ac4104ef7e9fab907bc04a1eccb93036478c005d0ac11034de", + when="@6.3.0:", + ) depends_on("cmake@3.5:", type="build") depends_on("zlib-api", type="link") depends_on("yaml-cpp~shared") @@ -116,17 +121,18 @@ def setup_build_environment(self, build_env): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"hip@{ver}", when=f"@{ver}") depends_on(f"rocminfo@{ver}", when=f"@{ver}") depends_on(f"rocblas@{ver}", when=f"@{ver}") depends_on(f"rocm-smi-lib@{ver}", when=f"@{ver}") depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}") - for ver in ["6.2.1", "6.2.4", "6.3.0", "6.3.1"]: + for ver in ["6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2"]: depends_on(f"hiprand@{ver}", when=f"@{ver}") depends_on(f"rocrand@{ver}", when=f"@{ver}") - for ver in ["6.3.0", "6.3.1"]: + for ver in ["6.3.0", "6.3.1", "6.3.2"]: depends_on(f"hipblaslt@{ver}", when=f"@{ver}") def patch(self): @@ -146,31 +152,33 @@ def patch(self): def cmake_args(self): args = [ self.define("RVS_BUILD_TESTS", False), - self.define("HIP_PATH", self.spec["hip"].prefix), - self.define("HSA_PATH", self.spec["hsa-rocr-dev"].prefix), - self.define("ROCM_SMI_DIR", self.spec["rocm-smi-lib"].prefix), - self.define("ROCBLAS_DIR", self.spec["rocblas"].prefix), - self.define("YAML_CPP_INCLUDE_DIRS", self.spec["yaml-cpp"].prefix.include), self.define("UT_INC", self.spec["googletest"].prefix.include), ] - if self.spec.satisfies("@6.2.1:"): - args.append(self.define("HIPRAND_DIR", self.spec["hiprand"].prefix)) - args.append(self.define("ROCRAND_DIR", self.spec["rocrand"].prefix)) + + if self.spec.satisfies("@6.2.1:6.2.4"): + args.append(self.define("HIPRAND_DIR", self.spec["hiprand"].prefix)), + args.append(self.define("ROCRAND_DIR", self.spec["rocrand"].prefix)), + libloc = self.spec["googletest"].prefix.lib64 if not os.path.isdir(libloc): libloc = self.spec["googletest"].prefix.lib args.append(self.define("UT_LIB", libloc)) if self.spec.satisfies("@:6.2"): + args.append(self.define("HIP_PATH", self.spec["hip"].prefix)), + args.append(self.define("HSA_PATH", self.spec["hsa-rocr-dev"].prefix)), + args.append(self.define("ROCM_SMI_DIR", self.spec["rocm-smi-lib"].prefix)), + args.append(self.define("ROCBLAS_DIR", self.spec["rocblas"].prefix)), + args.append( + self.define("YAML_CPP_INCLUDE_DIRS", self.spec["yaml-cpp"].prefix.include) + ), + libloc = self.spec["hsakmt-roct"].prefix.lib64 if not os.path.isdir(libloc): libloc = self.spec["hsakmt-roct"].prefix.lib args.append(self.define("HSAKMT_LIB_DIR", libloc)) - else: - args.append(self.define("HSAKMT_LIB_DIR", self.spec["hsa-rocr-dev"].prefix.lib)) - libloc = self.spec["yaml-cpp"].prefix.lib64 - if not os.path.isdir(libloc): - libloc = self.spec["yaml-cpp"].prefix.lib - args.append(self.define("YAML_CPP_LIB_PATH", libloc)) + if self.spec.satisfies("@6.3.0:"): - args.append(self.define("HIPBLASLT_DIR", self.spec["hipblaslt"].prefix)) + args.append(self.define("CMAKE_INSTALL_RPATH", self.spec.prefix.lib)), + args.append(self.define("CPACK_PACKAGING_INSTALL_PREFIX", self.spec.prefix)), + return args diff --git a/var/spack/repos/builtin/packages/rocminfo/package.py b/var/spack/repos/builtin/packages/rocminfo/package.py index fbfad08f806..96eaa52e710 100644 --- a/var/spack/repos/builtin/packages/rocminfo/package.py +++ b/var/spack/repos/builtin/packages/rocminfo/package.py @@ -17,6 +17,7 @@ class Rocminfo(CMakePackage): maintainers("srekolam", "renjithravindrankannath", "haampie") version("master", branch="master") + version("6.3.2", sha256="a98a32bae0e118397b5559b4a584c9363191bb2d1f45fe13b09f502016745e8f") version("6.3.1", sha256="30cf7ed537c066e325a8731d0fbe62be2f0f66c8700a06f334e787e9f0f87437") version("6.3.0", sha256="40e2ef89e135770196022761cb929af93c80c41869082b3ef80e42b7772267d0") version("6.2.4", sha256="14d4b0e22e2314156091ac9ad1646dd20909dba3a43e037584a503a6754e7f9e") @@ -87,6 +88,7 @@ class Rocminfo(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", "master", ]: depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}") @@ -108,6 +110,7 @@ class Rocminfo(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-core@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/rocmlir/package.py b/var/spack/repos/builtin/packages/rocmlir/package.py index 299d39bae14..1d81681f9d3 100644 --- a/var/spack/repos/builtin/packages/rocmlir/package.py +++ b/var/spack/repos/builtin/packages/rocmlir/package.py @@ -17,6 +17,7 @@ class Rocmlir(CMakePackage): maintainers("srekolam", "afzpatel", "renjithravindrankannath") + version("6.3.2", sha256="5911e880a66faecb08d242efa3e5eb6f8ce32cb21ea09dec36f4aef111c395fb") version("6.3.1", sha256="b9e0ea8cfb83c20553b1ec1556752958afaa421a8d7326b1da748395ba7b75ac") version("6.3.0", sha256="8dd167250e138fac0609f4ed06fc6a4dca5edad346166a291f20b4dad99bbd0b") version("6.2.4", sha256="3283685431fd59e20a6ac5737df22c7c7421901779a2a0b6dbd6c1ab1f1b5adb") @@ -78,6 +79,7 @@ def patch(self): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"hip@{ver}", when=f"@{ver}") depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/rocprim/package.py b/var/spack/repos/builtin/packages/rocprim/package.py index 4a2410acde1..df9585b8559 100644 --- a/var/spack/repos/builtin/packages/rocprim/package.py +++ b/var/spack/repos/builtin/packages/rocprim/package.py @@ -16,6 +16,7 @@ class Rocprim(CMakePackage): license("MIT") maintainers("cgmb", "srekolam", "renjithravindrankannath", "afzpatel") + version("6.3.2", sha256="fbb4839992eaba838f798408636da30f0d61b669513dae185ab790c5fa5595c4") version("6.3.1", sha256="37690d9f326d68379d52a21fe9184061d38b15263a566f1f182d539e4b3277d5") version("6.3.0", sha256="d97c6edcf1f636721f8c023b54f3fad968b48b0709a95ecd640ec0ab1057069e") version("6.2.4", sha256="c567aa5e3209dd00aefe5052dde8ceb5bcc3a4aeeeb3ad8dc322f8d0791fc07f") @@ -79,6 +80,7 @@ class Rocprim(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"hip@{ver}", when=f"@{ver}") depends_on(f"comgr@{ver}", when=f"@{ver}") @@ -114,7 +116,7 @@ def cmake_args(self): args.append(self.define("__skip_rocmclang", "ON")) if self.spec.satisfies("@5.2:"): args.append(self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.lib.cmake.hip)) - if self.spec.satisfies("@5.2:"): + if self.spec.satisfies("@5.2:6.3.1"): args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) return args diff --git a/var/spack/repos/builtin/packages/rocprofiler-compute/package.py b/var/spack/repos/builtin/packages/rocprofiler-compute/package.py new file mode 100644 index 00000000000..63a5563601d --- /dev/null +++ b/var/spack/repos/builtin/packages/rocprofiler-compute/package.py @@ -0,0 +1,45 @@ +# Copyright Spack Project Developers. See COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + +from spack.package import * + + +class RocprofilerCompute(CMakePackage): + """Advanced Profiling and Analytics for AMD Hardware""" + + homepage = "https://github.com/ROCm/rocprofiler-compute" + git = "https://github.com/ROCm/rocprofiler-compute.git" + url = "https://github.com/ROCm/rocprofiler-compute/archive/refs/tags/rocm-6.3.2.tar.gz" + + tags = ["rocm"] + + maintainers("afzpatel", "srekolam", "renjithravindrankannath") + + license("MIT") + version("6.3.2", sha256="317f19acfa6e6780923e6c8144c3c223b523c382588df528b6df001fae38d13d") + + depends_on("python@3.8:") + depends_on("py-pip", type="run") + depends_on("py-astunparse@1.6.2", type=("build", "run")) # wants exact version + depends_on("py-colorlover", type=("build", "run")) + depends_on("py-pyyaml") + depends_on("py-matplotlib") + depends_on("py-pandas@1.4.3:") + depends_on("py-numpy@1.17.5:") + depends_on("py-pymongo") + depends_on("py-tabulate") + depends_on("py-tqdm") + depends_on("py-kaleido") + depends_on("py-plotille") + depends_on("py-dash-svg", type=("build", "run")) + depends_on("py-dash", type=("build", "run")) + depends_on("py-dash-bootstrap-components", type=("build", "run")) + + def cmake_args(self): + args = [self.define("ENABLE_TESTS", self.run_tests)] + return args + + @run_before("cmake") + def before_cmake(self): + touch(join_path(self.stage.source_path, "VERSION.sha")) diff --git a/var/spack/repos/builtin/packages/rocprofiler-dev/package.py b/var/spack/repos/builtin/packages/rocprofiler-dev/package.py index f00af572b77..34d023458ad 100644 --- a/var/spack/repos/builtin/packages/rocprofiler-dev/package.py +++ b/var/spack/repos/builtin/packages/rocprofiler-dev/package.py @@ -18,6 +18,7 @@ class RocprofilerDev(CMakePackage): maintainers("srekolam", "renjithravindrankannath", "afzpatel") libraries = ["librocprofiler64"] license("MIT") + version("6.3.2", sha256="c440ac79fa9f3e8c1decbfd83557d5cbbc4bb720927880b33dc36e682f37ec26") version("6.3.1", sha256="c4666c1167e551cfafc343b092506834477556ba6f7b0739552d660fd69c30fb") version("6.3.0", sha256="45ddc1d87a33bb27e9445e642a3495fef21cec1e545793b2ca5f551743961b1f") version("6.2.4", sha256="898eae91938c2d08207b615db03a784c7f3090989bcf09260635d18aa5930a2c") @@ -88,6 +89,7 @@ class RocprofilerDev(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}") depends_on(f"rocminfo@{ver}", when=f"@{ver}") @@ -106,6 +108,7 @@ class RocprofilerDev(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"hip@{ver}", when=f"@{ver}") depends_on(f"rocm-smi-lib@{ver}", when=f"@{ver}") @@ -127,6 +130,7 @@ class RocprofilerDev(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"aqlprofile@{ver}", when=f"@{ver}") depends_on(f"comgr@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/rocprofiler-register/package.py b/var/spack/repos/builtin/packages/rocprofiler-register/package.py index ee8c01644c4..e3e0aa8d779 100644 --- a/var/spack/repos/builtin/packages/rocprofiler-register/package.py +++ b/var/spack/repos/builtin/packages/rocprofiler-register/package.py @@ -19,6 +19,7 @@ class RocprofilerRegister(CMakePackage): maintainers("afzpatel", "srekolam", "renjithravindrankannath") license("MIT") + version("6.3.2", sha256="2e973dd10af220cd37838c13f3c7d52671f5cf846a3f06311b138770b62f51f4") version("6.3.1", sha256="82e2fbd2da058503398848c3e662f518e99f9bccb7b98880aa321c1f6511fca9") version("6.3.0", sha256="51aae00e7a8bb44a369de9626fca360c80879034ab43092eb6e4ccfa1b51ca47") version("6.2.4", sha256="e7c31d5e1100c1e8ae0a2c6de3bfea75341abc4a68d02b58089421e2a54bba54") diff --git a/var/spack/repos/builtin/packages/rocprofiler-systems/add_cstdint.patch b/var/spack/repos/builtin/packages/rocprofiler-systems/add_cstdint.patch new file mode 100644 index 00000000000..810671f8a75 --- /dev/null +++ b/var/spack/repos/builtin/packages/rocprofiler-systems/add_cstdint.patch @@ -0,0 +1,12 @@ +diff --git a/external/timemory/source/timemory/backends/gperftools.hpp b/external/timemory/source/timemory/backends/gperftools.hpp +index 9177da5..d4c6d74 100644 +--- a/external/timemory/source/timemory/backends/gperftools.hpp ++++ b/external/timemory/source/timemory/backends/gperftools.hpp +@@ -26,6 +26,7 @@ + +#include +#include ++#include +#include + +#if defined(TIMEMORY_USE_GPERFTOOLS) || defined(TIMEMORY_USE_GPERFTOOLS_TCMALLOC) diff --git a/var/spack/repos/builtin/packages/rocprofiler-systems/package.py b/var/spack/repos/builtin/packages/rocprofiler-systems/package.py index a9ffe96b9ec..c38e344b061 100644 --- a/var/spack/repos/builtin/packages/rocprofiler-systems/package.py +++ b/var/spack/repos/builtin/packages/rocprofiler-systems/package.py @@ -18,6 +18,13 @@ class RocprofilerSystems(CMakePackage): version("amd-mainline", branch="amd-mainline", submodules=True) version("amd-staging", branch="amd-staging", submodules=True) + version( + "6.3.2", + git="https://github.com/ROCm/rocprofiler-systems", + tag="rocm-6.3.2", + commit="2fd5fbbef941ff219a1ecef702f8cfaae6e8e5ba", + submodules=True, + ) version( "6.3.1", git="https://github.com/ROCm/rocprofiler-systems", @@ -92,7 +99,7 @@ class RocprofilerSystems(CMakePackage): depends_on("tau", when="+tau") depends_on("caliper", when="+caliper") depends_on("python@3:", when="+python", type=("build", "run")) - depends_on("dyninst@12", when="+rocm") + depends_on("dyninst@12:", when="+rocm") depends_on("m4", when="+rocm") depends_on("texinfo", when="+rocm") depends_on("libunwind", when="+rocm") @@ -100,12 +107,14 @@ class RocprofilerSystems(CMakePackage): depends_on("automake", when="+rocm") depends_on("libtool", when="+rocm") with when("+rocm"): - for ver in ["6.3.0", "6.3.1"]: + for ver in ["6.3.0", "6.3.1", "6.3.2"]: depends_on(f"rocm-smi-lib@{ver}", when=f"@{ver}") depends_on(f"hip@{ver}", when=f"@{ver}") depends_on(f"roctracer-dev@{ver}", when=f"@{ver}") depends_on(f"rocprofiler-dev@{ver}", when=f"@{ver}") + patch("add_cstdint.patch", when="%gcc@13:") + def cmake_args(self): spec = self.spec @@ -113,7 +122,6 @@ def cmake_args(self): self.define("SPACK_BUILD", True), self.define("ROCPROFSYS_BUILD_PAPI", False), self.define("ROCPROFSYS_BUILD_PYTHON", True), - self.define("ROCPROFSYS_BUILD_DYNINST", False), self.define("ROCPROFSYS_BUILD_LIBUNWIND", False), self.define("ROCPROFSYS_BUILD_STATIC_LIBGCC", False), self.define("ROCPROFSYS_BUILD_STATIC_LIBSTDCXX", False), @@ -150,6 +158,11 @@ def cmake_args(self): args.append( self.define("libunwind_INCLUDE_DIR", self.spec["libunwind"].prefix.include) ) + if spec.satisfies("%gcc@13:"): + self.define("ROCPROFSYS_BUILD_DYNINST", True), + self.define("DYNINST_BUILD_TBB", True), + else: + self.define("ROCPROFSYS_BUILD_DYNINST", False), return args def flag_handler(self, name, flags): diff --git a/var/spack/repos/builtin/packages/rocpydecode/package.py b/var/spack/repos/builtin/packages/rocpydecode/package.py index b7339f4ae0e..ea2c2eb689d 100644 --- a/var/spack/repos/builtin/packages/rocpydecode/package.py +++ b/var/spack/repos/builtin/packages/rocpydecode/package.py @@ -13,6 +13,7 @@ class Rocpydecode(CMakePackage): url = "https://github.com/ROCm/rocPyDecode/archive/refs/tags/rocm-6.2.0.tar.gz" maintainers("afzpatel", "srekolam", "renjithravindrankannath") + version("6.3.2", sha256="c1b4dba9f8a28299279ad4e4aeb0c857c3a9772d016fcc0f164940f22faa6dee") version("6.3.1", sha256="77ed22ee23409b004676fb1a11b963324b878e786dae0a56fdef58375716c9eb") version("6.3.0", sha256="4d0d969fb32328d8277b5cc451ee875428f58c12c1d4b3ff33247774ecc6caf8") version("6.2.4", sha256="9cdb8bdc65b54b2c02d6c950dd34cd702ec50d903aa4d252d1eb1f8cae8c0afb") @@ -23,7 +24,7 @@ class Rocpydecode(CMakePackage): depends_on("ffmpeg@4.4:6") depends_on("dlpack") - for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1"]: + for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2"]: depends_on(f"rocdecode@{ver}", when=f"@{ver}") def patch(self): diff --git a/var/spack/repos/builtin/packages/rocrand/package.py b/var/spack/repos/builtin/packages/rocrand/package.py index 66c390a39a4..a1006c85f7f 100644 --- a/var/spack/repos/builtin/packages/rocrand/package.py +++ b/var/spack/repos/builtin/packages/rocrand/package.py @@ -24,6 +24,7 @@ class Rocrand(CMakePackage): version("develop", branch="develop") version("master", branch="master") + version("6.3.2", sha256="57f364806369ddb80761ce44187920075cf446de527dd1fbc6adbb4b4b3e9bb8") version("6.3.1", sha256="80d86c31ec9cb40f5c5532281b42cf99fbc8a81e3ffd3bc8b3bbe4a7e509bf5f") version("6.3.0", sha256="396d2dc842c64d29f577365c348fbccd6260a11431eec61f233fdb0f38b7625d") version("6.2.4", sha256="94a2ea2413623b427ddf69365b3996c18721456965024c0dfac506a13c8dc547") @@ -129,6 +130,7 @@ class Rocrand(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"hip@{ver}", when=f"@{ver}") depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/rocsolver/package.py b/var/spack/repos/builtin/packages/rocsolver/package.py index 15972dcc55d..b19babea1af 100644 --- a/var/spack/repos/builtin/packages/rocsolver/package.py +++ b/var/spack/repos/builtin/packages/rocsolver/package.py @@ -45,6 +45,7 @@ class Rocsolver(CMakePackage): version("develop", branch="develop") version("master", branch="master") + version("6.3.2", sha256="834f532c54bdf0e4900e73ffb0544068071976175559c8bf3c50d7a3b7230a3a") version("6.3.1", sha256="ffa70c4dedeb20a33cf79d4ae3e95ade2ae5202f819459b19a0ebf62c380bba0") version("6.3.0", sha256="48861f7b86379f2b825c0496d1d9318c6e29426d083b361c10f685b0ddd66274") version("6.2.4", sha256="022863df6a9d51bd216e56dd4dc7d437584e48304cfdbc9c5751be1abfd7c73f") @@ -111,6 +112,7 @@ class Rocsolver(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"hip@{ver}", when=f"@{ver}") depends_on(f"rocblas@{ver}", when=f"@{ver}") @@ -143,7 +145,7 @@ def cmake_args(self): if self.spec.satisfies("^cmake@3.21.0:3.21.2"): args.append(self.define("__skip_rocmclang", "ON")) - if self.spec.satisfies("@5.2.0:"): + if self.spec.satisfies("@5.2.0:6.3.1"): args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) if self.spec.satisfies("@5.3.0:"): args.append("-DCMAKE_INSTALL_LIBDIR=lib") diff --git a/var/spack/repos/builtin/packages/rocsparse/package.py b/var/spack/repos/builtin/packages/rocsparse/package.py index e46826e9475..0da9389624e 100644 --- a/var/spack/repos/builtin/packages/rocsparse/package.py +++ b/var/spack/repos/builtin/packages/rocsparse/package.py @@ -38,6 +38,7 @@ class Rocsparse(CMakePackage): conflicts("+asan", when="os=centos8") license("MIT") + version("6.3.2", sha256="665a85517d50e5ef37b1f953ccb17108d6a5cb30db21c5364bd50a41d44c61f2") version("6.3.1", sha256="95c9dcc8421711f2f203a34c2830c5ac504e127922e0a83dbc68bccd5509c72f") version("6.3.0", sha256="38aaf1cc55f57566a3056a970f73f40a9a4930583d6e57fc9c7745a127029227") version("6.2.4", sha256="1f86c2d439e777cd17724269da66997d351b3a1b83f44143361e9c77d80e2370") @@ -87,6 +88,7 @@ class Rocsparse(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"hip@{ver}", when=f"@{ver}") depends_on(f"rocprim@{ver}", when=f"@{ver}") @@ -289,7 +291,7 @@ def cmake_args(self): if self.spec.satisfies("^cmake@3.21.0:3.21.2"): args.append(self.define("__skip_rocmclang", "ON")) - if self.spec.satisfies("@5.2.0:"): + if self.spec.satisfies("@5.2.0:6.3.1"): args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) if self.spec.satisfies("@5.3.0:"): diff --git a/var/spack/repos/builtin/packages/rocthrust/package.py b/var/spack/repos/builtin/packages/rocthrust/package.py index 7301f78b682..b945c5e56cd 100644 --- a/var/spack/repos/builtin/packages/rocthrust/package.py +++ b/var/spack/repos/builtin/packages/rocthrust/package.py @@ -17,6 +17,7 @@ class Rocthrust(CMakePackage): tags = ["rocm"] maintainers("cgmb", "srekolam", "renjithravindrankannath", "afzpatel") + version("6.3.2", sha256="c3991bbd9f8b0e3ecbc18a7d014446608bfe2a3660a8d9e3dcc136d784883935") version("6.3.1", sha256="a63dd161f4b30be7fcc4ad4184b948646233d59b5ca13c239f723ab59c607a1a") version("6.3.0", sha256="553e67bc0a7fb2d129b15fd4b8889f9ee56ebd29bc885a1fb32918dfcfa3b955") version("6.2.4", sha256="ec212f3f5ff1ff3c71b85dae50d19c1faa344d400b5d1fa376471c2390361dc8") @@ -77,6 +78,7 @@ class Rocthrust(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"hip@{ver}", when=f"@{ver}") depends_on(f"rocprim@{ver}", when=f"@{ver}") @@ -101,7 +103,7 @@ def cmake_args(self): if self.spec.satisfies("^cmake@3.21.0:3.21.2"): args.append(self.define("__skip_rocmclang", "ON")) - if self.spec.satisfies("@5.2.0:"): + if self.spec.satisfies("@5.2.0:6.3.1"): args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) return args diff --git a/var/spack/repos/builtin/packages/roctracer-dev-api/package.py b/var/spack/repos/builtin/packages/roctracer-dev-api/package.py index c98b1c58ac6..c2ef134c9a7 100644 --- a/var/spack/repos/builtin/packages/roctracer-dev-api/package.py +++ b/var/spack/repos/builtin/packages/roctracer-dev-api/package.py @@ -18,6 +18,7 @@ class RoctracerDevApi(Package): license("MIT") maintainers("srekolam", "renjithravindrankannath", "afzpatel") + version("6.3.2", sha256="ca8e93fc37f4671db28df5cb7a24b48f3d4879a188e4780e45961bba3725bb8a") version("6.3.1", sha256="89e4ab249f527131f684714c9135c69eaad1a63b7e74bae718b1617543b94426") version("6.3.0", sha256="6eb09e3b3b45ed68b2ac7ed6848521e645569bcd4a1f3a336cf2473a801308a2") version("6.2.4", sha256="b94c7db8ac57a4a1d7f8115020c36551220c20f33289fd06830495b4914a7d7b") diff --git a/var/spack/repos/builtin/packages/roctracer-dev/package.py b/var/spack/repos/builtin/packages/roctracer-dev/package.py index 52eaa7a950f..5f4e4adc636 100644 --- a/var/spack/repos/builtin/packages/roctracer-dev/package.py +++ b/var/spack/repos/builtin/packages/roctracer-dev/package.py @@ -21,6 +21,7 @@ class RoctracerDev(CMakePackage, ROCmPackage): libraries = ["libroctracer64"] license("MIT") + version("6.3.2", sha256="ca8e93fc37f4671db28df5cb7a24b48f3d4879a188e4780e45961bba3725bb8a") version("6.3.1", sha256="89e4ab249f527131f684714c9135c69eaad1a63b7e74bae718b1617543b94426") version("6.3.0", sha256="6eb09e3b3b45ed68b2ac7ed6848521e645569bcd4a1f3a336cf2473a801308a2") version("6.2.4", sha256="b94c7db8ac57a4a1d7f8115020c36551220c20f33289fd06830495b4914a7d7b") @@ -95,6 +96,7 @@ class RoctracerDev(CMakePackage, ROCmPackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}") depends_on(f"rocminfo@{ver}", when=f"@{ver}") @@ -120,6 +122,7 @@ class RoctracerDev(CMakePackage, ROCmPackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on(f"rocm-core@{ver}", when=f"@{ver}") diff --git a/var/spack/repos/builtin/packages/rocwmma/package.py b/var/spack/repos/builtin/packages/rocwmma/package.py index 52f310f1260..513a6f40aee 100644 --- a/var/spack/repos/builtin/packages/rocwmma/package.py +++ b/var/spack/repos/builtin/packages/rocwmma/package.py @@ -26,6 +26,7 @@ class Rocwmma(CMakePackage): license("MIT") maintainers("srekolam", "renjithravindrankannath", "afzpatel") + version("6.3.2", sha256="f9dc5e837ac30efe4600775fb309e46ed8ef112a673435663d2ef7fdf28f8f12") version("6.3.1", sha256="9afd06c58b405dd86535ea1ca479fd6f9d717fa8665710bb64fc8027a26e6ac7") version("6.3.0", sha256="8dcd06599083dc3a67958a1b6f7c29c1880758eb6ff579143e0fb162985b0612") version("6.2.4", sha256="eaa2f313a1bfe455d9641df44d7b890ea7334b58a643c75f0b7f108cae5f777c") @@ -94,6 +95,7 @@ class Rocwmma(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) depends_on("llvm-amdgpu@" + ver, type="build", when="@" + ver) @@ -116,6 +118,7 @@ class Rocwmma(CMakePackage): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on("rocm-smi-lib@" + ver, when="@" + ver) diff --git a/var/spack/repos/builtin/packages/rpp/package.py b/var/spack/repos/builtin/packages/rpp/package.py index 69830757c91..842d52eb418 100644 --- a/var/spack/repos/builtin/packages/rpp/package.py +++ b/var/spack/repos/builtin/packages/rpp/package.py @@ -27,6 +27,7 @@ def url_for_version(self, version): maintainers("srekolam", "afzpatel") license("MIT") + version("6.3.2", sha256="05f0e063c61f5039661a4d5a80113ebb7b9782d0958c29375a8e1e2e759b88bc") version("6.3.1", sha256="6e7da82bf7b6d642d605370329e4e719af10bb5c6af30079b5d0b60cdcb91a48") version("6.3.0", sha256="130a6bd2fc4278956c6450a3c49243651576b1031e6a485aa62453b9dc3b4d51") version("6.2.4", sha256="e733350e938ce8d2f7d6d43d2bfd0febd270d52673bafa0265ed97bb850289de") @@ -170,6 +171,7 @@ def patch(self): "6.2.4", "6.3.0", "6.3.1", + "6.3.2", ]: depends_on("hip@" + ver, when="@" + ver) with when("@:1.2"):