hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ginkgo: new versions (#17413)

Browse source 
* Add new Ginkgo versions with HIP support.

* Drop HIP support until more ROCm packages are integrated.
This commit is contained in:
tcojean 2020-07-08 15:42:56 +02:00 committed by GitHub
parent 207e496162
commit ae2a867a7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
var/spack/repos/builtin/packages/ginkgo/CAS-HIP-NVCC-1.2.0.patch Normal file
View file

@ -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)

4
var/spack/repos/builtin/packages/ginkgo/package.py
View file

@ -18,6 +18,8 @@ class Ginkgo(CMakePackage, CudaPackage):
version('develop', branch='develop') version('develop', branch='develop')
version('master', branch='master') 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.1.0', commit='b9bec8225442b3eb2a85a870efa112ab767a17fb') # v1.1.0
version('1.0.0', commit='45244641e0c2b19ba33aecd25153c0bddbcbe1a0') # v1.0.0 version('1.0.0', commit='45244641e0c2b19ba33aecd25153c0bddbcbe1a0') # v1.0.0
@ -44,6 +46,8 @@ def cmake_args(self):
'ON' if '+full_optimizations' in spec else 'OFF'), 'ON' if '+full_optimizations' in spec else 'OFF'),
'-DGINKGO_DEVEL_TOOLS=%s' % ( '-DGINKGO_DEVEL_TOOLS=%s' % (
'ON' if '+develtools' in spec else 'OFF'), '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 we are not exposing benchmarks, examples, tests nor doc
# as part of the installation, disable building them altogether. # as part of the installation, disable building them altogether.
'-DGINKGO_BUILD_BENCHMARKS=OFF', '-DGINKGO_BUILD_BENCHMARKS=OFF',