restore ginkgo tests

CExA-project · Jun 28, 2024 · 72fc3d6 · 72fc3d6
1 parent 0fb5c59
commit 72fc3d6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/tests/splines/CMakeLists.txt b/tests/splines/CMakeLists.txt
@@ -121,9 +121,9 @@ foreach(BC "BC_PERIODIC" "BC_GREVILLE" "BC_HERMITE")
 endforeach()
 
 # GINKGO
-foreach(BC "BC_PERIODIC")
+foreach(BC "BC_PERIODIC" "BC_GREVILLE" "BC_HERMITE")
   foreach(DEGREE_X RANGE "${SPLINES_TEST_DEGREE_MIN}" "${SPLINES_TEST_DEGREE_MAX}")
-    foreach(BSPLINES_TYPE "BSPLINES_TYPE_UNIFORM")
+    foreach(BSPLINES_TYPE "BSPLINES_TYPE_UNIFORM" "BSPLINES_TYPE_NON_UNIFORM")
       set(test_name "splines_tests_BATCHED_DEGREE_X_${DEGREE_X}_${BSPLINES_TYPE}_${BC}_GINKGO")
       add_executable("${test_name}" ../main.cpp batched_spline_builder.cpp)
       target_compile_features("${test_name}" PUBLIC cxx_std_17)

diff --git a/tests/splines/batched_spline_builder.cpp b/tests/splines/batched_spline_builder.cpp
@@ -434,6 +434,16 @@ static void BatchedSplineTest()
 #define SUFFIX(name) name##Lapack##Hermite##NonUniform
 #elif defined(BC_PERIODIC) && defined(BSPLINES_TYPE_UNIFORM) && defined(SOLVER_GINKGO)
 #define SUFFIX(name) name##Ginkgo##Periodic##Uniform
+#elif defined(BC_PERIODIC) && defined(BSPLINES_TYPE_NON_UNIFORM) && defined(SOLVER_GINKGO)
+#define SUFFIX(name) name##Ginkgo##Periodic##NonUniform
+#elif defined(BC_GREVILLE) && defined(BSPLINES_TYPE_UNIFORM) && defined(SOLVER_GINKGO)
+#define SUFFIX(name) name##Ginkgo##Greville##Uniform
+#elif defined(BC_GREVILLE) && defined(BSPLINES_TYPE_NON_UNIFORM) && defined(SOLVER_GINKGO)
+#define SUFFIX(name) name##Ginkgo##Greville##NonUniform
+#elif defined(BC_HERMITE) && defined(BSPLINES_TYPE_UNIFORM) && defined(SOLVER_GINKGO)
+#define SUFFIX(name) name##Ginkgo##Hermite##Uniform
+#elif defined(BC_HERMITE) && defined(BSPLINES_TYPE_NON_UNIFORM) && defined(SOLVER_GINKGO)
+#define SUFFIX(name) name##Ginkgo##Hermite##NonUniform
 #endif
 
 TEST(SUFFIX(BatchedSplineHost), 1DX)