Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use Sacado_No_Kokkos.hpp if deal.II is built with CUDA #6425

Closed
wants to merge 1 commit into from

Conversation

davydden
Copy link
Contributor

@davydden davydden commented May 2, 2018

fixes #6423

@aprokop could you please try installing from this branch with Trilinos+tpetra? You would need to hack-in my fork/branch as a source:

diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py
index f3b4f6bbe..4593b8b21 100644
--- a/var/spack/repos/builtin/packages/dealii/package.py
+++ b/var/spack/repos/builtin/packages/dealii/package.py
@@ -45,7 +45,7 @@ class Dealii(CMakePackage, CudaPackage):
     version('8.3.0', 'fc6cdcb16309ef4bea338a4f014de6fa')
     version('8.2.1', '71c728dbec14f371297cd405776ccf08')
     version('8.1.0', 'aa8fadc2ce5eb674f44f997461bf668d')
-    version('develop', git='https://github.com/dealii/dealii.git', branch='master')
+    version('develop', git='https://github.com/davydden/dealii.git', branch='bugfix/sacado_kokkos_cuda')
 
     variant('mpi',      default=True,  description='Compile with MPI')
     variant('assimp',   default=False,

@davydden davydden requested a review from jppelteret May 2, 2018 17:09
@davydden
Copy link
Contributor Author

davydden commented May 2, 2018

/run-tests

@davydden davydden added this to the Release 9.0 milestone May 2, 2018
@aprokop
Copy link

aprokop commented May 2, 2018

@davydden Unfortunately, the Kokkos headers still appear. Sacado_No_Kokkos may not be doing what we expect it to. The rabbit hole: Sacado_No_Kokkos.hpp -> Sacado_DisableKokkosCuda.hpp -> Sacado_ConfigDefs.hpp which has this gem:

#ifdef HAVE_SACADO_KOKKOSCORE
#include "Kokkos_Macros.hpp"
#endif

So I don't even know how it works.

@davydden
Copy link
Contributor Author

davydden commented May 2, 2018

Damn... Thanks for checking!

@davydden davydden closed this May 2, 2018
@davydden davydden deleted the bugfix/sacado_kokkos_cuda branch August 31, 2018 20:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Sacado header brings in Kokkos and breaks compilation of deal.II with CUDA
2 participants