diff options
| author | arjun-raj-kuppala <60718144+arjun-raj-kuppala@users.noreply.github.com> | 2021-04-12 13:46:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-12 20:46:10 +0000 |
| commit | 24f4a39d0ec29d0334fa2152f0226cfab3b99632 (patch) | |
| tree | 7e9398a36ca78ca1ccb0f65c16385f83d875abd7 | |
| parent | 96c984e0ce125eba55cfd5b3b9490103c72f6267 (diff) | |
| download | spack-24f4a39d0ec29d0334fa2152f0226cfab3b99632.tar.gz spack-24f4a39d0ec29d0334fa2152f0226cfab3b99632.tar.bz2 spack-24f4a39d0ec29d0334fa2152f0226cfab3b99632.tar.xz spack-24f4a39d0ec29d0334fa2152f0226cfab3b99632.zip | |
ROCm relase 4.1.0: Bump up version of rocm-validation-suite (#22946)
| -rw-r--r-- | var/spack/repos/builtin/packages/rocm-validation-suite/002-remove-force-setting-hip-inc-path.patch | 13 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/rocm-validation-suite/package.py | 4 |
2 files changed, 16 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/rocm-validation-suite/002-remove-force-setting-hip-inc-path.patch b/var/spack/repos/builtin/packages/rocm-validation-suite/002-remove-force-setting-hip-inc-path.patch new file mode 100644 index 0000000000..a95e0836b0 --- /dev/null +++ b/var/spack/repos/builtin/packages/rocm-validation-suite/002-remove-force-setting-hip-inc-path.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3301ec..f62005a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -33,7 +33,7 @@ set(CMAKE_INSTALL_PREFIX "/opt/rocm" CACHE PATH "CMAKE installation directory") + 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}/hip" ) +-set(HIP_INC_DIR "${ROCM_PATH}/hip" CACHE PATH "Contains header files exported by ROC Runtime" FORCE) ++set(HIP_INC_DIR "${ROCM_PATH}/hip" 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) + + execute_process(COMMAND ln -s /usr/bin/python3 /usr/bin/python) 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 563a0f93ea..41bf0a89f6 100644 --- a/var/spack/repos/builtin/packages/rocm-validation-suite/package.py +++ b/var/spack/repos/builtin/packages/rocm-validation-suite/package.py @@ -19,6 +19,7 @@ class RocmValidationSuite(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('4.1.0', sha256='f9618f89384daa0ae897b36638a3737bcfa47e98778e360338267cd1fe2bbc66') version('4.0.0', sha256='04743ca8901b94a801759a3c13c8caf3e6ea950ffcda6408173e6f9ef7b86e74') version('3.10.0', sha256='9f9a530f7850770663e0b0ec0c786367f2e22500a472ac6652c4fd9fb4df4f64') version('3.9.0', sha256='17662028a4485b97e3ccaad5e94d20aaa2c3e9e3f741c7ebbf0f8b4cdebcc555') @@ -29,6 +30,7 @@ class RocmValidationSuite(CMakePackage): variant('build_type', default='Release', values=("Release", "Debug"), description='CMake build type') patch('001-fixes-for-rocblas-rocm-smi-install-prefix-path.patch') + patch('002-remove-force-setting-hip-inc-path.patch', when='@4.1.0') depends_on('cmake@3.5:', type='build') depends_on('zlib', type='link') @@ -37,7 +39,7 @@ class RocmValidationSuite(CMakePackage): spec = self.spec build_env.set("HIPCC_PATH", spec['hip'].prefix) - for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0']: + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0', '4.0.0', '4.1.0']: depends_on('hip@' + ver, type='build', when='@' + ver) depends_on('rocm-device-libs@' + ver, type='build', when='@' + ver) depends_on('comgr@' + ver, type='build', when='@' + ver) |