From 940d558dd874bfd1323f9dbf4bc9bcfdfa928f0c Mon Sep 17 00:00:00 2001 From: Peter Munch Date: Tue, 31 Oct 2023 08:48:11 +0100 Subject: [PATCH] Move CUDAWrapper::MatrixFree tests to new folder --- tests/matrix_free_kokkos/CMakeLists.txt | 4 ++++ .../coefficient_eval_device.cc | 0 .../coefficient_eval_device.output | 0 tests/{cuda => matrix_free_kokkos}/cuda_evaluate_1d_shape.cc | 2 -- .../cuda_evaluate_1d_shape.output | 0 tests/{cuda => matrix_free_kokkos}/cuda_evaluate_2d_shape.cc | 2 -- .../cuda_evaluate_2d_shape.output | 0 .../matrix_free_device_initialize_vector.cc | 0 ...nitialize_vector.with_mpi=on.with_p4est=on.mpirun=2.output | 0 ...or.with_mpi=on.with_p4est=on.with_cuda=off.mpirun=1.output | 0 ...tor.with_mpi=on.with_p4est=on.with_cuda=on.mpirun=1.output | 0 .../matrix_free_device_matrix_vector_01.cc | 0 .../matrix_free_device_matrix_vector_01.output | 0 .../matrix_free_device_matrix_vector_02.cc | 0 .../matrix_free_device_matrix_vector_02.output | 0 .../matrix_free_device_matrix_vector_03.cc | 0 .../matrix_free_device_matrix_vector_03.output | 0 .../matrix_free_device_matrix_vector_03b.cc | 0 .../matrix_free_device_matrix_vector_03b.output | 0 .../matrix_free_device_matrix_vector_04.cc | 0 .../matrix_free_device_matrix_vector_04.output | 0 .../matrix_free_device_matrix_vector_05.cc | 0 .../matrix_free_device_matrix_vector_05.output | 0 .../matrix_free_device_matrix_vector_06.cc | 2 +- .../matrix_free_device_matrix_vector_06.output | 0 .../matrix_free_device_matrix_vector_06a.cc | 2 +- .../matrix_free_device_matrix_vector_06a.output | 0 .../matrix_free_device_matrix_vector_06b.cc | 2 +- .../matrix_free_device_matrix_vector_06b.output | 0 .../matrix_free_device_matrix_vector_09.cc | 2 +- .../matrix_free_device_matrix_vector_09.output | 0 .../matrix_free_device_matrix_vector_10.cc | 0 ...ctor_10.with_trilinos=true.with_p4est=true.mpirun=1.output | 0 ...ctor_10.with_trilinos=true.with_p4est=true.mpirun=2.output | 0 .../matrix_free_device_matrix_vector_10a.cc | 0 ...tor_10a.with_trilinos=true.with_p4est=true.mpirun=1.output | 0 ...tor_10a.with_trilinos=true.with_p4est=true.mpirun=2.output | 0 .../matrix_free_device_matrix_vector_19.cc | 0 ...ilinos=true.with_trilinos_with_zoltan=true.mpirun=2.output | 0 .../matrix_free_device_matrix_vector_25.cc | 0 ...ctor_25.with_trilinos=true.with_p4est=true.mpirun=1.output | 0 ...ctor_25.with_trilinos=true.with_p4est=true.mpirun=2.output | 0 .../matrix_free_device_matrix_vector_26.cc | 0 ...ctor_26.with_trilinos=true.with_p4est=true.mpirun=1.output | 0 ...ctor_26.with_trilinos=true.with_p4est=true.mpirun=2.output | 0 .../matrix_free_device_multiple_objects.cc | 0 .../matrix_free_device_multiple_objects.output | 0 .../matrix_free_device_no_index_initialize.cc | 0 .../matrix_free_device_no_index_initialize.output | 0 .../matrix_free_device_precondition_chebyshev.cc | 0 ...inos=true.with_p4est=true.with_lapack=true.mpirun=1.output | 0 ...inos=true.with_p4est=true.with_lapack=true.mpirun=2.output | 0 .../matrix_free_device_reinit_01.cc | 0 ...device_reinit_01.with_mpi=on.with_p4est=on.mpirun=2.output | 0 .../matrix_vector_device_common.h | 0 .../matrix_vector_device_mf.h | 0 56 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 tests/matrix_free_kokkos/CMakeLists.txt rename tests/{matrix_free => matrix_free_kokkos}/coefficient_eval_device.cc (100%) rename tests/{matrix_free => matrix_free_kokkos}/coefficient_eval_device.output (100%) rename tests/{cuda => matrix_free_kokkos}/cuda_evaluate_1d_shape.cc (99%) rename tests/{cuda => matrix_free_kokkos}/cuda_evaluate_1d_shape.output (100%) rename tests/{cuda => matrix_free_kokkos}/cuda_evaluate_2d_shape.cc (99%) rename tests/{cuda => matrix_free_kokkos}/cuda_evaluate_2d_shape.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_initialize_vector.cc (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_initialize_vector.with_mpi=on.with_p4est=on.mpirun=2.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_initialize_vector.with_mpi=on.with_p4est=on.with_cuda=off.mpirun=1.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_initialize_vector.with_mpi=on.with_p4est=on.with_cuda=on.mpirun=1.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_01.cc (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_01.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_02.cc (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_02.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_03.cc (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_03.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_03b.cc (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_03b.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_04.cc (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_04.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_05.cc (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_05.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_06.cc (98%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_06.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_06a.cc (98%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_06a.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_06b.cc (98%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_06b.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_09.cc (98%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_09.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_10.cc (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_10.with_trilinos=true.with_p4est=true.mpirun=1.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_10.with_trilinos=true.with_p4est=true.mpirun=2.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_10a.cc (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_10a.with_trilinos=true.with_p4est=true.mpirun=1.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_10a.with_trilinos=true.with_p4est=true.mpirun=2.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_19.cc (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_19.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=2.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_25.cc (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_25.with_trilinos=true.with_p4est=true.mpirun=1.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_25.with_trilinos=true.with_p4est=true.mpirun=2.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_26.cc (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_26.with_trilinos=true.with_p4est=true.mpirun=1.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_matrix_vector_26.with_trilinos=true.with_p4est=true.mpirun=2.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_multiple_objects.cc (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_multiple_objects.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_no_index_initialize.cc (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_no_index_initialize.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_precondition_chebyshev.cc (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_precondition_chebyshev.with_trilinos=true.with_p4est=true.with_lapack=true.mpirun=1.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_precondition_chebyshev.with_trilinos=true.with_p4est=true.with_lapack=true.mpirun=2.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_reinit_01.cc (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_free_device_reinit_01.with_mpi=on.with_p4est=on.mpirun=2.output (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_vector_device_common.h (100%) rename tests/{matrix_free => matrix_free_kokkos}/matrix_vector_device_mf.h (100%) diff --git a/tests/matrix_free_kokkos/CMakeLists.txt b/tests/matrix_free_kokkos/CMakeLists.txt new file mode 100644 index 0000000000..db9c1adcf2 --- /dev/null +++ b/tests/matrix_free_kokkos/CMakeLists.txt @@ -0,0 +1,4 @@ +cmake_minimum_required(VERSION 3.13.4) +include(../scripts/setup_testsubproject.cmake) +project(testsuite CXX) +deal_ii_pickup_tests() diff --git a/tests/matrix_free/coefficient_eval_device.cc b/tests/matrix_free_kokkos/coefficient_eval_device.cc similarity index 100% rename from tests/matrix_free/coefficient_eval_device.cc rename to tests/matrix_free_kokkos/coefficient_eval_device.cc diff --git a/tests/matrix_free/coefficient_eval_device.output b/tests/matrix_free_kokkos/coefficient_eval_device.output similarity index 100% rename from tests/matrix_free/coefficient_eval_device.output rename to tests/matrix_free_kokkos/coefficient_eval_device.output diff --git a/tests/cuda/cuda_evaluate_1d_shape.cc b/tests/matrix_free_kokkos/cuda_evaluate_1d_shape.cc similarity index 99% rename from tests/cuda/cuda_evaluate_1d_shape.cc rename to tests/matrix_free_kokkos/cuda_evaluate_1d_shape.cc index 3d81a9362a..77b6753e92 100644 --- a/tests/cuda/cuda_evaluate_1d_shape.cc +++ b/tests/matrix_free_kokkos/cuda_evaluate_1d_shape.cc @@ -32,7 +32,6 @@ #include "../tests.h" -namespace CUDA = LinearAlgebra::CUDAWrappers; using TeamHandle = Kokkos::TeamPolicy< MemorySpace::Default::kokkos_space::execution_space>::member_type; @@ -196,7 +195,6 @@ main() deallog.attach(logfile); Kokkos::initialize(); - init_cuda(); deallog.push("values"); test<4, 4, 0, false>(); diff --git a/tests/cuda/cuda_evaluate_1d_shape.output b/tests/matrix_free_kokkos/cuda_evaluate_1d_shape.output similarity index 100% rename from tests/cuda/cuda_evaluate_1d_shape.output rename to tests/matrix_free_kokkos/cuda_evaluate_1d_shape.output diff --git a/tests/cuda/cuda_evaluate_2d_shape.cc b/tests/matrix_free_kokkos/cuda_evaluate_2d_shape.cc similarity index 99% rename from tests/cuda/cuda_evaluate_2d_shape.cc rename to tests/matrix_free_kokkos/cuda_evaluate_2d_shape.cc index cd2286a68b..faccb48dcf 100644 --- a/tests/cuda/cuda_evaluate_2d_shape.cc +++ b/tests/matrix_free_kokkos/cuda_evaluate_2d_shape.cc @@ -30,7 +30,6 @@ #include "../tests.h" -namespace CUDA = LinearAlgebra::CUDAWrappers; using TeamHandle = Kokkos::TeamPolicy< MemorySpace::Default::kokkos_space::execution_space>::member_type; @@ -217,7 +216,6 @@ main() deallog.attach(logfile); Kokkos::initialize(); - init_cuda(); deallog.push("values"); test<4, 4, 0, false>(); diff --git a/tests/cuda/cuda_evaluate_2d_shape.output b/tests/matrix_free_kokkos/cuda_evaluate_2d_shape.output similarity index 100% rename from tests/cuda/cuda_evaluate_2d_shape.output rename to tests/matrix_free_kokkos/cuda_evaluate_2d_shape.output diff --git a/tests/matrix_free/matrix_free_device_initialize_vector.cc b/tests/matrix_free_kokkos/matrix_free_device_initialize_vector.cc similarity index 100% rename from tests/matrix_free/matrix_free_device_initialize_vector.cc rename to tests/matrix_free_kokkos/matrix_free_device_initialize_vector.cc diff --git a/tests/matrix_free/matrix_free_device_initialize_vector.with_mpi=on.with_p4est=on.mpirun=2.output b/tests/matrix_free_kokkos/matrix_free_device_initialize_vector.with_mpi=on.with_p4est=on.mpirun=2.output similarity index 100% rename from tests/matrix_free/matrix_free_device_initialize_vector.with_mpi=on.with_p4est=on.mpirun=2.output rename to tests/matrix_free_kokkos/matrix_free_device_initialize_vector.with_mpi=on.with_p4est=on.mpirun=2.output diff --git a/tests/matrix_free/matrix_free_device_initialize_vector.with_mpi=on.with_p4est=on.with_cuda=off.mpirun=1.output b/tests/matrix_free_kokkos/matrix_free_device_initialize_vector.with_mpi=on.with_p4est=on.with_cuda=off.mpirun=1.output similarity index 100% rename from tests/matrix_free/matrix_free_device_initialize_vector.with_mpi=on.with_p4est=on.with_cuda=off.mpirun=1.output rename to tests/matrix_free_kokkos/matrix_free_device_initialize_vector.with_mpi=on.with_p4est=on.with_cuda=off.mpirun=1.output diff --git a/tests/matrix_free/matrix_free_device_initialize_vector.with_mpi=on.with_p4est=on.with_cuda=on.mpirun=1.output b/tests/matrix_free_kokkos/matrix_free_device_initialize_vector.with_mpi=on.with_p4est=on.with_cuda=on.mpirun=1.output similarity index 100% rename from tests/matrix_free/matrix_free_device_initialize_vector.with_mpi=on.with_p4est=on.with_cuda=on.mpirun=1.output rename to tests/matrix_free_kokkos/matrix_free_device_initialize_vector.with_mpi=on.with_p4est=on.with_cuda=on.mpirun=1.output diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_01.cc b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_01.cc similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_01.cc rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_01.cc diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_01.output b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_01.output similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_01.output rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_01.output diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_02.cc b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_02.cc similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_02.cc rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_02.cc diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_02.output b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_02.output similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_02.output rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_02.output diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_03.cc b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_03.cc similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_03.cc rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_03.cc diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_03.output b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_03.output similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_03.output rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_03.output diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_03b.cc b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_03b.cc similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_03b.cc rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_03b.cc diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_03b.output b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_03b.output similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_03b.output rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_03b.output diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_04.cc b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_04.cc similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_04.cc rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_04.cc diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_04.output b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_04.output similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_04.output rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_04.output diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_05.cc b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_05.cc similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_05.cc rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_05.cc diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_05.output b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_05.output similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_05.output rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_05.output diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_06.cc b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_06.cc similarity index 98% rename from tests/matrix_free/matrix_free_device_matrix_vector_06.cc rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_06.cc index ab3220a643..9d9dce1637 100644 --- a/tests/matrix_free/matrix_free_device_matrix_vector_06.cc +++ b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_06.cc @@ -25,7 +25,7 @@ #include "../tests.h" -#include "create_mesh.h" +#include "../matrix_free/create_mesh.h" #include "matrix_vector_device_common.h" template diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_06.output b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_06.output similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_06.output rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_06.output diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_06a.cc b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_06a.cc similarity index 98% rename from tests/matrix_free/matrix_free_device_matrix_vector_06a.cc rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_06a.cc index abf9d232b6..5545537d22 100644 --- a/tests/matrix_free/matrix_free_device_matrix_vector_06a.cc +++ b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_06a.cc @@ -21,7 +21,7 @@ #include "../tests.h" -#include "create_mesh.h" +#include "../matrix_free/create_mesh.h" #include "matrix_vector_device_common.h" template diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_06a.output b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_06a.output similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_06a.output rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_06a.output diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_06b.cc b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_06b.cc similarity index 98% rename from tests/matrix_free/matrix_free_device_matrix_vector_06b.cc rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_06b.cc index dfbf01c891..56c362e174 100644 --- a/tests/matrix_free/matrix_free_device_matrix_vector_06b.cc +++ b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_06b.cc @@ -20,7 +20,7 @@ #include "../tests.h" -#include "create_mesh.h" +#include "../matrix_free/create_mesh.h" #include "matrix_vector_device_common.h" template diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_06b.output b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_06b.output similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_06b.output rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_06b.output diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_09.cc b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_09.cc similarity index 98% rename from tests/matrix_free/matrix_free_device_matrix_vector_09.cc rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_09.cc index 36226ba729..8f69e188a3 100644 --- a/tests/matrix_free/matrix_free_device_matrix_vector_09.cc +++ b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_09.cc @@ -23,7 +23,7 @@ #include "../tests.h" -#include "create_mesh.h" +#include "../matrix_free/create_mesh.h" #include "matrix_vector_device_common.h" template diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_09.output b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_09.output similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_09.output rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_09.output diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_10.cc b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_10.cc similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_10.cc rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_10.cc diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_10.with_trilinos=true.with_p4est=true.mpirun=1.output b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_10.with_trilinos=true.with_p4est=true.mpirun=1.output similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_10.with_trilinos=true.with_p4est=true.mpirun=1.output rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_10.with_trilinos=true.with_p4est=true.mpirun=1.output diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_10.with_trilinos=true.with_p4est=true.mpirun=2.output b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_10.with_trilinos=true.with_p4est=true.mpirun=2.output similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_10.with_trilinos=true.with_p4est=true.mpirun=2.output rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_10.with_trilinos=true.with_p4est=true.mpirun=2.output diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_10a.cc b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_10a.cc similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_10a.cc rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_10a.cc diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_10a.with_trilinos=true.with_p4est=true.mpirun=1.output b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_10a.with_trilinos=true.with_p4est=true.mpirun=1.output similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_10a.with_trilinos=true.with_p4est=true.mpirun=1.output rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_10a.with_trilinos=true.with_p4est=true.mpirun=1.output diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_10a.with_trilinos=true.with_p4est=true.mpirun=2.output b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_10a.with_trilinos=true.with_p4est=true.mpirun=2.output similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_10a.with_trilinos=true.with_p4est=true.mpirun=2.output rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_10a.with_trilinos=true.with_p4est=true.mpirun=2.output diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_19.cc b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_19.cc similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_19.cc rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_19.cc diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_19.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=2.output b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_19.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=2.output similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_19.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=2.output rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_19.with_trilinos=true.with_trilinos_with_zoltan=true.mpirun=2.output diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_25.cc b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_25.cc similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_25.cc rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_25.cc diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_25.with_trilinos=true.with_p4est=true.mpirun=1.output b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_25.with_trilinos=true.with_p4est=true.mpirun=1.output similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_25.with_trilinos=true.with_p4est=true.mpirun=1.output rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_25.with_trilinos=true.with_p4est=true.mpirun=1.output diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_25.with_trilinos=true.with_p4est=true.mpirun=2.output b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_25.with_trilinos=true.with_p4est=true.mpirun=2.output similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_25.with_trilinos=true.with_p4est=true.mpirun=2.output rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_25.with_trilinos=true.with_p4est=true.mpirun=2.output diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_26.cc b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_26.cc similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_26.cc rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_26.cc diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_26.with_trilinos=true.with_p4est=true.mpirun=1.output b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_26.with_trilinos=true.with_p4est=true.mpirun=1.output similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_26.with_trilinos=true.with_p4est=true.mpirun=1.output rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_26.with_trilinos=true.with_p4est=true.mpirun=1.output diff --git a/tests/matrix_free/matrix_free_device_matrix_vector_26.with_trilinos=true.with_p4est=true.mpirun=2.output b/tests/matrix_free_kokkos/matrix_free_device_matrix_vector_26.with_trilinos=true.with_p4est=true.mpirun=2.output similarity index 100% rename from tests/matrix_free/matrix_free_device_matrix_vector_26.with_trilinos=true.with_p4est=true.mpirun=2.output rename to tests/matrix_free_kokkos/matrix_free_device_matrix_vector_26.with_trilinos=true.with_p4est=true.mpirun=2.output diff --git a/tests/matrix_free/matrix_free_device_multiple_objects.cc b/tests/matrix_free_kokkos/matrix_free_device_multiple_objects.cc similarity index 100% rename from tests/matrix_free/matrix_free_device_multiple_objects.cc rename to tests/matrix_free_kokkos/matrix_free_device_multiple_objects.cc diff --git a/tests/matrix_free/matrix_free_device_multiple_objects.output b/tests/matrix_free_kokkos/matrix_free_device_multiple_objects.output similarity index 100% rename from tests/matrix_free/matrix_free_device_multiple_objects.output rename to tests/matrix_free_kokkos/matrix_free_device_multiple_objects.output diff --git a/tests/matrix_free/matrix_free_device_no_index_initialize.cc b/tests/matrix_free_kokkos/matrix_free_device_no_index_initialize.cc similarity index 100% rename from tests/matrix_free/matrix_free_device_no_index_initialize.cc rename to tests/matrix_free_kokkos/matrix_free_device_no_index_initialize.cc diff --git a/tests/matrix_free/matrix_free_device_no_index_initialize.output b/tests/matrix_free_kokkos/matrix_free_device_no_index_initialize.output similarity index 100% rename from tests/matrix_free/matrix_free_device_no_index_initialize.output rename to tests/matrix_free_kokkos/matrix_free_device_no_index_initialize.output diff --git a/tests/matrix_free/matrix_free_device_precondition_chebyshev.cc b/tests/matrix_free_kokkos/matrix_free_device_precondition_chebyshev.cc similarity index 100% rename from tests/matrix_free/matrix_free_device_precondition_chebyshev.cc rename to tests/matrix_free_kokkos/matrix_free_device_precondition_chebyshev.cc diff --git a/tests/matrix_free/matrix_free_device_precondition_chebyshev.with_trilinos=true.with_p4est=true.with_lapack=true.mpirun=1.output b/tests/matrix_free_kokkos/matrix_free_device_precondition_chebyshev.with_trilinos=true.with_p4est=true.with_lapack=true.mpirun=1.output similarity index 100% rename from tests/matrix_free/matrix_free_device_precondition_chebyshev.with_trilinos=true.with_p4est=true.with_lapack=true.mpirun=1.output rename to tests/matrix_free_kokkos/matrix_free_device_precondition_chebyshev.with_trilinos=true.with_p4est=true.with_lapack=true.mpirun=1.output diff --git a/tests/matrix_free/matrix_free_device_precondition_chebyshev.with_trilinos=true.with_p4est=true.with_lapack=true.mpirun=2.output b/tests/matrix_free_kokkos/matrix_free_device_precondition_chebyshev.with_trilinos=true.with_p4est=true.with_lapack=true.mpirun=2.output similarity index 100% rename from tests/matrix_free/matrix_free_device_precondition_chebyshev.with_trilinos=true.with_p4est=true.with_lapack=true.mpirun=2.output rename to tests/matrix_free_kokkos/matrix_free_device_precondition_chebyshev.with_trilinos=true.with_p4est=true.with_lapack=true.mpirun=2.output diff --git a/tests/matrix_free/matrix_free_device_reinit_01.cc b/tests/matrix_free_kokkos/matrix_free_device_reinit_01.cc similarity index 100% rename from tests/matrix_free/matrix_free_device_reinit_01.cc rename to tests/matrix_free_kokkos/matrix_free_device_reinit_01.cc diff --git a/tests/matrix_free/matrix_free_device_reinit_01.with_mpi=on.with_p4est=on.mpirun=2.output b/tests/matrix_free_kokkos/matrix_free_device_reinit_01.with_mpi=on.with_p4est=on.mpirun=2.output similarity index 100% rename from tests/matrix_free/matrix_free_device_reinit_01.with_mpi=on.with_p4est=on.mpirun=2.output rename to tests/matrix_free_kokkos/matrix_free_device_reinit_01.with_mpi=on.with_p4est=on.mpirun=2.output diff --git a/tests/matrix_free/matrix_vector_device_common.h b/tests/matrix_free_kokkos/matrix_vector_device_common.h similarity index 100% rename from tests/matrix_free/matrix_vector_device_common.h rename to tests/matrix_free_kokkos/matrix_vector_device_common.h diff --git a/tests/matrix_free/matrix_vector_device_mf.h b/tests/matrix_free_kokkos/matrix_vector_device_mf.h similarity index 100% rename from tests/matrix_free/matrix_vector_device_mf.h rename to tests/matrix_free_kokkos/matrix_vector_device_mf.h -- 2.39.5