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

Remove Kokkos related code from Intrepid #6712

Merged
merged 2 commits into from
Feb 6, 2020
Merged

Remove Kokkos related code from Intrepid #6712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4632b59
Intrepid: Remove all Kokkos related code
mperego Jan 31, 2020
ff6a444
Merge branch 'develop' into develop
mperego Feb 5, 2020
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: 0 additions & 8 deletions packages/intrepid/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@ TRIBITS_PACKAGE(Intrepid)
# B) Set up package-specific options
#

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)
ELSE()
Expand Down
187 changes: 0 additions & 187 deletions packages/intrepid/example/Drivers/Intrepid_ArrayToolsDefScalar_Kokkos.hpp
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions packages/intrepid/example/Shared/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,43 +8,3 @@ TRIBITS_ADD_EXECUTABLE_AND_TEST(
# PASS_REGULAR_EXPRESSION "TEST PASSED"
ADD_DIR_TO_NAME
)

IF (${PACKAGE_NAME}_ENABLE_KokkosCore)
# mfh 24 Mar 2015: These tests use Kokkos, but Kokkos(Core) is an
# optional dependency of Intrepid. Thus, we must protect building
# these tests.

#TRIBITS_ADD_EXECUTABLE_AND_TEST(
# Example_02
# SOURCES example_02.cpp
# ARGS PrintItAll
# NUM_MPI_PROCS 1
## PASS_REGULAR_EXPRESSION "TEST PASSED"
# ADD_DIR_TO_NAME
# )
# TRIBITS_ADD_EXECUTABLE_AND_TEST(
# Example_03
# SOURCES example_03.cpp
# ARGS PrintItAll
# NUM_MPI_PROCS 1
# PASS_REGULAR_EXPRESSION "TEST PASSED"
# ADD_DIR_TO_NAME
# )
# TRIBITS_ADD_EXECUTABLE_AND_TEST(
# Example_04
# SOURCES example_04.cpp
# ARGS PrintItAll
# NUM_MPI_PROCS 1
# PASS_REGULAR_EXPRESSION "TEST PASSED"
# ADD_DIR_TO_NAME
# )
# TRIBITS_ADD_EXECUTABLE_AND_TEST(
# Example_05
# SOURCES example_05.cpp
# ARGS PrintItAll
# NUM_MPI_PROCS 1
# PASS_REGULAR_EXPRESSION "TEST PASSED"
# ADD_DIR_TO_NAME
# )

ENDIF ()
Loading