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

Intrepid2: Set correct execution spaces for Projection tests #7438

Merged
merged 3 commits into from
Jun 14, 2020
Merged

Intrepid2: Set correct execution spaces for Projection tests #7438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7279188
Intrepid2: Set correct execution spaces for Projection's tests
mperego May 27, 2020
9bf8db1
Update CMakeLists.txt
mperego Jun 7, 2020
f8ab75d
fix setting RUN_SERIAL property in tests
mperego Jun 14, 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
77 changes: 64 additions & 13 deletions packages/intrepid2/unit-test/Projection/Cuda/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,126 @@
TRIBITS_ADD_EXECUTABLE_AND_TEST(
TRIBITS_ADD_EXECUTABLE(
Test_InterpolationProjection_HEX
SOURCES test_interpolation_projection_HEX.cpp
ADD_DIR_TO_NAME
)

TRIBITS_ADD_TEST(
Test_InterpolationProjection_HEX
ARGS PrintItAll
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
ADD_DIR_TO_NAME
RUN_SERIAL
)

TRIBITS_ADD_EXECUTABLE_AND_TEST(

TRIBITS_ADD_EXECUTABLE(
Test_InterpolationProjection_TET
SOURCES test_interpolation_projection_TET.cpp
ADD_DIR_TO_NAME
)

TRIBITS_ADD_TEST(
Test_InterpolationProjection_TET
ARGS PrintItAll
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
ADD_DIR_TO_NAME
RUN_SERIAL
)


TRIBITS_ADD_EXECUTABLE_AND_TEST(
TRIBITS_ADD_EXECUTABLE(
Test_InterpolationProjection_QUAD
SOURCES test_interpolation_projection_QUAD.cpp
ADD_DIR_TO_NAME
)

TRIBITS_ADD_TEST(
Test_InterpolationProjection_QUAD
ARGS PrintItAll
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
ADD_DIR_TO_NAME
RUN_SERIAL
)

TRIBITS_ADD_EXECUTABLE_AND_TEST(


TRIBITS_ADD_EXECUTABLE(
Test_InterpolationProjection_TRI
SOURCES test_interpolation_projection_TRI.cpp
ADD_DIR_TO_NAME
)

TRIBITS_ADD_TEST(
Test_InterpolationProjection_TRI
ARGS PrintItAll
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
ADD_DIR_TO_NAME
RUN_SERIAL
)

TRIBITS_ADD_EXECUTABLE_AND_TEST(


TRIBITS_ADD_EXECUTABLE(
Test_Convergence_HEX
SOURCES test_convergence_HEX.cpp
ADD_DIR_TO_NAME
)

TRIBITS_ADD_TEST(
Test_Convergence_HEX
ARGS PrintItAll
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
ADD_DIR_TO_NAME
RUN_SERIAL
)

TRIBITS_ADD_EXECUTABLE_AND_TEST(


TRIBITS_ADD_EXECUTABLE(
Test_Convergence_TET
SOURCES test_convergence_TET.cpp
ADD_DIR_TO_NAME
)

TRIBITS_ADD_TEST(
Test_Convergence_TET
ARGS PrintItAll
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
ADD_DIR_TO_NAME
RUN_SERIAL
)

TRIBITS_ADD_EXECUTABLE_AND_TEST(


TRIBITS_ADD_EXECUTABLE(
Test_Convergence_QUAD
SOURCES test_convergence_QUAD.cpp
ADD_DIR_TO_NAME
)

TRIBITS_ADD_TEST(
Test_Convergence_QUAD
ARGS PrintItAll
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
ADD_DIR_TO_NAME
RUN_SERIAL
)

TRIBITS_ADD_EXECUTABLE_AND_TEST(


TRIBITS_ADD_EXECUTABLE(
Test_Convergence_TRI
SOURCES test_convergence_TRI.cpp
ADD_DIR_TO_NAME
)

TRIBITS_ADD_TEST(
Test_Convergence_TRI
ARGS PrintItAll
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
ADD_DIR_TO_NAME
RUN_SERIAL
)
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_HEX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
const bool verbose = (argc-1) > 0;
Kokkos::initialize();

const int r_val = Intrepid2::Test::DeRhamCommutativityHex<double,Kokkos::Serial>(verbose);
const int r_val = Intrepid2::Test::DeRhamCommutativityHex<double,Kokkos::Cuda>(verbose);

Kokkos::finalize();
return r_val;
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_QUAD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
const bool verbose = (argc-1) > 0;
Kokkos::initialize();

const int r_val = Intrepid2::Test::DeRhamCommutativityQuad<double,Kokkos::Serial>(verbose);
const int r_val = Intrepid2::Test::DeRhamCommutativityQuad<double,Kokkos::Cuda>(verbose);

Kokkos::finalize();
return r_val;
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_TET.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
const bool verbose = (argc-1) > 0;
Kokkos::initialize();

const int r_val = Intrepid2::Test::DeRhamCommutativityTet<double,Kokkos::Serial>(verbose);
const int r_val = Intrepid2::Test::DeRhamCommutativityTet<double,Kokkos::Cuda>(verbose);

Kokkos::finalize();
return r_val;
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Projection/Cuda/test_DeRham_commutativity_TRI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
const bool verbose = (argc-1) > 0;
Kokkos::initialize();

const int r_val = Intrepid2::Test::DeRhamCommutativityTri<double,Kokkos::Serial>(verbose);
const int r_val = Intrepid2::Test::DeRhamCommutativityTri<double,Kokkos::Cuda>(verbose);

Kokkos::finalize();
return r_val;
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Projection/Cuda/test_convergence_HEX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
const bool verbose = (argc-1) > 0;
Kokkos::initialize();

const int r_val = Intrepid2::Test::ConvergenceHex<double,Kokkos::Serial>(verbose);
const int r_val = Intrepid2::Test::ConvergenceHex<double,Kokkos::Cuda>(verbose);

Kokkos::finalize();
return r_val;
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Projection/Cuda/test_convergence_QUAD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
const bool verbose = (argc-1) > 0;
Kokkos::initialize();

const int r_val = Intrepid2::Test::ConvergenceQuad<double,Kokkos::Serial>(verbose);
const int r_val = Intrepid2::Test::ConvergenceQuad<double,Kokkos::Cuda>(verbose);

Kokkos::finalize();
return r_val;
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Projection/Cuda/test_convergence_TET.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
const bool verbose = (argc-1) > 0;
Kokkos::initialize();

const int r_val = Intrepid2::Test::ConvergenceTet<double,Kokkos::Serial>(verbose);
const int r_val = Intrepid2::Test::ConvergenceTet<double,Kokkos::Cuda>(verbose);

Kokkos::finalize();
return r_val;
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Projection/Cuda/test_convergence_TRI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
const bool verbose = (argc-1) > 0;
Kokkos::initialize();

const int r_val = Intrepid2::Test::ConvergenceTri<double,Kokkos::Serial>(verbose);
const int r_val = Intrepid2::Test::ConvergenceTri<double,Kokkos::Cuda>(verbose);

Kokkos::finalize();
return r_val;
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_HEX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
const bool verbose = (argc-1) > 0;
Kokkos::initialize();

const int r_val = Intrepid2::Test::DeRhamCommutativityHex<double,Kokkos::Serial>(verbose);
const int r_val = Intrepid2::Test::DeRhamCommutativityHex<double,Kokkos::OpenMP>(verbose);

Kokkos::finalize();
return r_val;
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_QUAD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
const bool verbose = (argc-1) > 0;
Kokkos::initialize();

const int r_val = Intrepid2::Test::DeRhamCommutativityQuad<double,Kokkos::Serial>(verbose);
const int r_val = Intrepid2::Test::DeRhamCommutativityQuad<double,Kokkos::OpenMP>(verbose);

Kokkos::finalize();
return r_val;
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_TET.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
const bool verbose = (argc-1) > 0;
Kokkos::initialize();

const int r_val = Intrepid2::Test::DeRhamCommutativityTet<double,Kokkos::Serial>(verbose);
const int r_val = Intrepid2::Test::DeRhamCommutativityTet<double,Kokkos::OpenMP>(verbose);

Kokkos::finalize();
return r_val;
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Projection/OpenMP/test_DeRham_commutativity_TRI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
const bool verbose = (argc-1) > 0;
Kokkos::initialize();

const int r_val = Intrepid2::Test::DeRhamCommutativityTri<double,Kokkos::Serial>(verbose);
const int r_val = Intrepid2::Test::DeRhamCommutativityTri<double,Kokkos::OpenMP>(verbose);

Kokkos::finalize();
return r_val;
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_HEX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
const bool verbose = (argc-1) > 0;
Kokkos::initialize();

const int r_val = Intrepid2::Test::ConvergenceHex<double,Kokkos::Serial>(verbose);
const int r_val = Intrepid2::Test::ConvergenceHex<double,Kokkos::OpenMP>(verbose);

Kokkos::finalize();
return r_val;
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_QUAD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
const bool verbose = (argc-1) > 0;
Kokkos::initialize();

const int r_val = Intrepid2::Test::ConvergenceQuad<double,Kokkos::Serial>(verbose);
const int r_val = Intrepid2::Test::ConvergenceQuad<double,Kokkos::OpenMP>(verbose);

Kokkos::finalize();
return r_val;
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_TET.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
const bool verbose = (argc-1) > 0;
Kokkos::initialize();

const int r_val = Intrepid2::Test::ConvergenceTet<double,Kokkos::Serial>(verbose);
const int r_val = Intrepid2::Test::ConvergenceTet<double,Kokkos::OpenMP>(verbose);

Kokkos::finalize();
return r_val;
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Projection/OpenMP/test_convergence_TRI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
const bool verbose = (argc-1) > 0;
Kokkos::initialize();

const int r_val = Intrepid2::Test::ConvergenceTri<double,Kokkos::Serial>(verbose);
const int r_val = Intrepid2::Test::ConvergenceTri<double,Kokkos::OpenMP>(verbose);

Kokkos::finalize();
return r_val;
Expand Down