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.

Sign up for GitHub

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

Intrepid: Add cmake flag to make clear that Kokkos code is deprecated #4995

Merged
merged 1 commit into from
Apr 24, 2019
Merged

Intrepid: Add cmake flag to make clear that Kokkos code is deprecated #4995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion packages/intrepid/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ TRIBITS_PACKAGE(Intrepid)
# B) Set up package-specific options
#

SET(INTREPID_OLD_KOKKOS_CODE FALSE)
SET(Intrepid_ENABLE_DEPRECATED_KOKKOS_CODE_DEFAULT OFF)
SET(INTREPID_OLD_KOKKOS_CODE_DEFAULT FALSE)

IF(Intrepid_ENABLE_DEPRECATED_KOKKOS_CODE)
ELSE()
SET(INTREPID_OLD_KOKKOS_CODE FALSE)
ENDIF()

IF(Amesos_ENABLE_UMFPACK)
SET(${PACKAGE_NAME}_ENABLE_AMESOS_UMFPACK_DEFAULT ON)
Expand Down
4 changes: 3 additions & 1 deletion packages/intrepid/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ APPEND_SET(HEADERS
APPEND_SET(HEADERS ${HEADERS}
Kokkos/Intrepid_KokkosRank.hpp
)
IF (Intrepid_ENABLE_DEPRECATED_KOKKOS_CODE)
IF (HAVE_INTREPID_KOKKOSCORE AND KOKKOS_ENABLE_CUDA)
IF( TPL_ENABLE_MPI )
CUDA_INCLUDE_DIRECTORIES( ${MPI_BASE_DIR}/include )
Expand Down Expand Up @@ -97,6 +98,7 @@ IF(HAVE_INTREPID_KOKKOSCORE)
Kokkos/Intrepid_KokkosRank.hpp
)
ENDIF()
ENDIF()


#
Expand Down Expand Up @@ -261,7 +263,7 @@ APPEND_SET(HEADERS
Cell/Intrepid_CellTools.hpp
Cell/Intrepid_CellToolsDef.hpp
)
IF(HAVE_INTREPID_KOKKOSCORE)
IF(INTREPID_OLD_KOKKOS_CODE)
APPEND_SET(HEADERS
Cell/Intrepid_CellTools_Kokkos.hpp
)
Expand Down
3 changes: 3 additions & 0 deletions packages/intrepid/src/Kokkos/Intrepid_FieldContainer_Kokkos.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#ifdef Intrepid_ENABLE_DEPRECATED_KOKKOS_CODE

#ifndef INTREPID_FIELDCONTAINER_KOKKOS_HPP
#define INTREPID_FIELDCONTAINER_KOKKOS_HPP
Expand Down Expand Up @@ -360,3 +361,5 @@ struct Return_Type<const Intrepid::FieldContainer_Kokkos<FadType, Layout, Device
#include "Intrepid_FieldContainer_Kokkos_Serial_Left.hpp"
#include "Intrepid_FieldContainer_Kokkos_Serial_Right.hpp"
#endif

#endif