diff options
| author | tcojean <terry.cojean@kit.edu> | 2020-07-08 15:42:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-08 08:42:56 -0500 |
| commit | ae2a867a7ffc25c9d2143e489a2de995ba663bec (patch) | |
| tree | 69390d27b4ed0b05fd2a2b7536cbf977e61f5124 | |
| parent | 207e496162f9bcef5f88ecdede3224cd9b588858 (diff) | |
| download | spack-ae2a867a7ffc25c9d2143e489a2de995ba663bec.tar.gz spack-ae2a867a7ffc25c9d2143e489a2de995ba663bec.tar.bz2 spack-ae2a867a7ffc25c9d2143e489a2de995ba663bec.tar.xz spack-ae2a867a7ffc25c9d2143e489a2de995ba663bec.zip | |
Ginkgo: new versions (#17413)
* Add new Ginkgo versions with HIP support.
* Drop HIP support until more ROCm packages are integrated.
| -rw-r--r-- | var/spack/repos/builtin/packages/ginkgo/CAS-HIP-NVCC-1.2.0.patch | 10 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/ginkgo/package.py | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/ginkgo/CAS-HIP-NVCC-1.2.0.patch b/var/spack/repos/builtin/packages/ginkgo/CAS-HIP-NVCC-1.2.0.patch new file mode 100644 index 0000000000..d562b0315b --- /dev/null +++ b/var/spack/repos/builtin/packages/ginkgo/CAS-HIP-NVCC-1.2.0.patch @@ -0,0 +1,10 @@ +diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt +index 884e50bf6..40618311a 100644 +--- a/third_party/CMakeLists.txt ++++ b/third_party/CMakeLists.txt +@@ -1,4 +1,4 @@ +-if(GINKGO_BUILD_CUDA) ++if(GINKGO_BUILD_CUDA OR (GINKGO_BUILD_HIP AND GINKGO_HIP_PLATFORM STREQUAL "nvcc")) + enable_language(CUDA) + if (GINKGO_USE_EXTERNAL_CAS) + include(CudaArchitectureSelector RESULT_VARIABLE GINKGO_CAS_FILE) diff --git a/var/spack/repos/builtin/packages/ginkgo/package.py b/var/spack/repos/builtin/packages/ginkgo/package.py index 8440be2516..d0ee354256 100644 --- a/var/spack/repos/builtin/packages/ginkgo/package.py +++ b/var/spack/repos/builtin/packages/ginkgo/package.py @@ -18,6 +18,8 @@ class Ginkgo(CMakePackage, CudaPackage): version('develop', branch='develop') version('master', branch='master') + version('1.2.0', commit='b4be2be961fd5db45c3d02b5e004d73550722e31') # v1.2.0 + version('1.1.1', commit='08d2c5200d3c78015ac8a4fd488bafe1e4240cf5') # v1.1.1 version('1.1.0', commit='b9bec8225442b3eb2a85a870efa112ab767a17fb') # v1.1.0 version('1.0.0', commit='45244641e0c2b19ba33aecd25153c0bddbcbe1a0') # v1.0.0 @@ -44,6 +46,8 @@ class Ginkgo(CMakePackage, CudaPackage): 'ON' if '+full_optimizations' in spec else 'OFF'), '-DGINKGO_DEVEL_TOOLS=%s' % ( 'ON' if '+develtools' in spec else 'OFF'), + # Drop HIP support for now + '-DGINKGO_BUILD_HIP=OFF', # As we are not exposing benchmarks, examples, tests nor doc # as part of the installation, disable building them altogether. '-DGINKGO_BUILD_BENCHMARKS=OFF', |