diff options
| author | arjun-raj-kuppala <60718144+arjun-raj-kuppala@users.noreply.github.com> | 2020-12-10 02:55:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-10 11:55:07 +0100 |
| commit | 3d568d1553a7771c39fbfb3d2e133d46f05d4280 (patch) | |
| tree | c7176faf68df9958dbf4c32d3f51594c213f0946 | |
| parent | e117e087eb18871e1a86715c027d3cd2fa649870 (diff) | |
| download | spack-3d568d1553a7771c39fbfb3d2e133d46f05d4280.tar.gz spack-3d568d1553a7771c39fbfb3d2e133d46f05d4280.tar.bz2 spack-3d568d1553a7771c39fbfb3d2e133d46f05d4280.tar.xz spack-3d568d1553a7771c39fbfb3d2e133d46f05d4280.zip | |
AMD ROCm Release: Bump up versions(3.9.0 and 3.10.0) for miopen-hip (#20296)
| -rw-r--r-- | var/spack/repos/builtin/packages/miopen-hip/0001-Add-rocm-path-and-rocm-device-lib-path-flags.patch | 14 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/miopen-hip/package.py | 20 |
2 files changed, 32 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/miopen-hip/0001-Add-rocm-path-and-rocm-device-lib-path-flags.patch b/var/spack/repos/builtin/packages/miopen-hip/0001-Add-rocm-path-and-rocm-device-lib-path-flags.patch new file mode 100644 index 0000000000..b98304529f --- /dev/null +++ b/var/spack/repos/builtin/packages/miopen-hip/0001-Add-rocm-path-and-rocm-device-lib-path-flags.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 985f59f..515e7e0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -184,7 +184,8 @@ string(REGEX REPLACE --cuda-gpu-arch=[a-z0-9]+ "" HIP_COMPILER_FLAGS "${HIP_COMP + message(STATUS "Hip compiler flags: ${HIP_COMPILER_FLAGS}") + + add_definitions("-DHIP_COMPILER_FLAGS=${HIP_COMPILER_FLAGS}") +- ++add_definitions("--rocm-path=${HIP_PREFIX_PATH}") ++add_definitions("--rocm-device-lib-path=${DEVICELIBS_PREFIX_PATH}") + + + # HIP diff --git a/var/spack/repos/builtin/packages/miopen-hip/package.py b/var/spack/repos/builtin/packages/miopen-hip/package.py index 30577f58e5..a24c48f480 100644 --- a/var/spack/repos/builtin/packages/miopen-hip/package.py +++ b/var/spack/repos/builtin/packages/miopen-hip/package.py @@ -15,6 +15,8 @@ class MiopenHip(CMakePackage): maintainers = ['srekolam', 'arjun-raj-kuppala'] + version('3.10.0', sha256='926e43c5583cf70d6b247f9fe45971b8b1cc9668f9c8490c142c7e8b6e268f1a') + version('3.9.0', sha256='f57d75a220c1094395cc1dccab2185c759d779751ddbb5369a6f041ec77b2156') version('3.8.0', sha256='612b30d4a967bf18c7fa7aa3ef12ed558314ed04cee2775b842bf6a96cd7276f') version('3.7.0', sha256='f6a6ddd8d39bb76b7f7d91e68ade3b45e0201181145658c43b967065a354b103') version('3.5.0', sha256='aa362e69c4dce7f5751f0ee04c745735ea5454c8101050e9b92cc60fa3c0fb82') @@ -27,7 +29,11 @@ class MiopenHip(CMakePackage): depends_on('bzip2', type='link') depends_on('sqlite', type='link') depends_on('half', type='build') - for ver in ['3.5.0', '3.7.0', '3.8.0']: + depends_on('zlib', type='link', when='@3.9.0:') + + patch('0001-Add-rocm-path-and-rocm-device-lib-path-flags.patch', when='@3.9.0:') + + for ver in ['3.5.0', '3.7.0', '3.8.0', '3.9.0', '3.10.0']: depends_on('hip@' + ver, type='build', when='@' + ver) depends_on('rocm-cmake@' + ver, type='build', when='@' + ver) depends_on('comgr@' + ver, type='link', when='@' + ver) @@ -36,11 +42,21 @@ class MiopenHip(CMakePackage): depends_on('rocblas@' + ver, type='link', when='@' + ver) depends_on('rocm-device-libs@' + ver, type='link', when='@' + ver) + def setup_build_environment(self, env): + if '@3.9.0:' in self.spec: + lib_dir = self.spec['zlib'].libs.directories[0] + env.prepend_path('LIBRARY_PATH', lib_dir) + def cmake_args(self): + hip_prefix_dir = self.spec['hip'].prefix + devicelibs_prefix_dir = self.spec['rocm-device-libs'].prefix args = [ '-DMIOPEN_BACKEND=HIP', '-DCMAKE_CXX_COMPILER={0}/bin/clang++' .format(self.spec['llvm-amdgpu'].prefix), - '-DBoost_USE_STATIC_LIBS=Off' + '-DBoost_USE_STATIC_LIBS=Off', + '-DHIP_PREFIX_PATH={0}'.format(hip_prefix_dir), + '-DDEVICELIBS_PREFIX_PATH={0}/amdgcn/bitcode' + .format(devicelibs_prefix_dir) ] return args |