elg3d tests compilation

LIHPC-Computational-Geometry · Jul 26, 2024 · 2b18471 · 2b18471
1 parent 916dfa0
commit 2b18471
Show file tree

Hide file tree

Showing 26 changed files with 88 additions and 342 deletions.
diff --git a/Elg3D/CMakeLists.txt b/Elg3D/CMakeLists.txt
@@ -35,38 +35,9 @@ endif()
 #==============================================================================
 # GTS
 #==============================================================================
-#include(FindPkgConfig)
 find_package(PkgConfig REQUIRED)
-#pkg_check_modules(glib-2.0 REQUIRED glib-2.0)
-#find_path(GLIB_INCLUDE_DIR glib.h PATH_SUFFIXES glib-2.0)
-#include_directories(${GLIB_INCLUDE_DIR})
-#find_path(GLIBCONFIG_INCLUDE_DIR glibconfig.h PATH_SUFFIXES ../lib/glib-2.0/include)
-#include_directories(${GLIBCONFIG_INCLUDE_DIR})
-
-#pkg_check_modules(gts REQUIRED gts)
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GTS_Cflags}")
-#find_path(GTS_INCLUDE_DIR gts.h PATH_SUFFIXES include)
-#include_directories(${GTS_INCLUDE_DIR})
-#find_path(GTS_LIBRARY_DIR libgts.so PATH_SUFFIXES lib)
-#link_directories(${GTS_LIBRARY_DIR})
-
-pkg_search_module(PKG_GTS REQUIRED IMPORTED_TARGET gts)
-
-
-#if(GTS_LIB_PATH)
-#    include_directories(${GTS_INC_PATH})
-#    link_directories(${GTS_LIB_PATH})
-#    add_compile_definitions(ELG3D_WITH_GTS)
-#
-#    include_directories(/home/legoffn/travail/utils/spack_20200612/opt/spack/linux-ubuntu16.04-broadwell/gcc-5.4.0/glib-2.64.3-e2s7xjrjzvokp7qjqhalgs5b3ep3cowf/include/glib-2.0)
-#    include_directories(/home/legoffn/travail/utils/spack_20200612/opt/spack/linux-ubuntu16.04-broadwell/gcc-5.4.0/glib-2.64.3-e2s7xjrjzvokp7qjqhalgs5b3ep3cowf/lib/glib-2.0/include)
-#    link_directories(/home/legoffn/travail/utils/spack_20200612/opt/spack/linux-ubuntu16.04-broadwell/gcc-5.4.0/glib-2.64.3-e2s7xjrjzvokp7qjqhalgs5b3ep3cowf/lib)
-#endif()
-
-#==============================================================================
-# GLIB
-#==============================================================================
-#include_directories(/usr/include/glib-2.0 /usr/lib64/glib-2.0/include)
+pkg_search_module(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0)
+pkg_search_module(GTS REQUIRED IMPORTED_TARGET gts)
 
 #==============================================================================
 # INTERSECT
@@ -199,7 +170,7 @@ target_link_libraries(run_compare3d elg3d kmds Kokkos::kokkoscore)
 target_link_libraries(elg3d
 #	PUBLIC ${LIB_GMDS_MATH} ${LIB_GMDS_IG} ${LIB_GMDS_CAD} ${LIB_GMDS_UTILS} kmds Kokkos::kokkoscore Kokkos::kokkoscontainers GCO  gts glib-2.0
         PUBLIC ${LIB_GMDS_MATH} ${LIB_GMDS_IG} ${LIB_GMDS_CAD}
-        ${LIB_GMDS_CADFAC} ${LIB_GMDS_UTILS} kmds Kokkos::kokkoscore Kokkos::kokkoscontainers GCO PkgConfig::PKG_GTS
+        ${LIB_GMDS_CADFAC} ${LIB_GMDS_UTILS} kmds Kokkos::kokkoscore Kokkos::kokkoscontainers GCO PkgConfig::GTS PkgConfig::GLIB2
 	INTERFACE glpk)
 
 if(ELG3D_WITH_EXODUSII)

diff --git a/Elg3D/test/AssignCellsTest.h b/Elg3D/test/AssignCellsTest.h
@@ -25,24 +25,11 @@ class AssignCellsTest : public ::testing::Test
     static void
     SetUpTestCase()
     {
-            // Kokkos::Serial::initialize();
-            // Kokkos::Threads::initialize();
-            Kokkos::InitArguments kargs;
-            kargs.num_threads = 3;
-//            int num_threads = 3;
-//            int use_numa = 1;
-//            int use_core = 1;
-//            Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
-            Kokkos::initialize(kargs);
     }
 
     static void
     TearDownTestCase()
     {
-            // Kokkos::Serial::finalize();
-            // Kokkos::Threads::finalize();
-//            Kokkos::OpenMP::finalize();
-            Kokkos::finalize();
     }
 };
 /*----------------------------------------------------------------------------*/

diff --git a/Elg3D/test/BadPillowingTest.h b/Elg3D/test/BadPillowingTest.h
@@ -29,24 +29,20 @@ class BadPillowingTest : public ::testing::Test
     static void
     SetUpTestCase()
     {
-        // Kokkos::Serial::initialize();
-        // Kokkos::Threads::initialize();
-        Kokkos::InitArguments kargs;
-        kargs.num_threads = 1;
-//        int num_threads = 3;
-//        int use_numa = 1;
-//        int use_core = 1;
-//        Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
-        Kokkos::initialize(kargs);
+//        // Kokkos::Serial::initialize();
+//        // Kokkos::Threads::initialize();
+//        Kokkos::InitArguments kargs;
+//        kargs.num_threads = 1;
+////        int num_threads = 3;
+////        int use_numa = 1;
+////        int use_core = 1;
+////        Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
+//        Kokkos::initialize(kargs);
     }
 
     static void
     TearDownTestCase()
     {
-        // Kokkos::Serial::finalize();
-        // Kokkos::Threads::finalize();
-//        Kokkos::OpenMP::finalize();
-        Kokkos::finalize();
     }
 };
 /*----------------------------------------------------------------------------*/

diff --git a/Elg3D/test/BoundingBoxGeomAssociationTest.h b/Elg3D/test/BoundingBoxGeomAssociationTest.h
@@ -24,24 +24,11 @@ class BoundingBoxGeomAssociationTest : public ::testing::Test
         static void
         SetUpTestCase()
         {
-                // Kokkos::Serial::initialize();
-                // Kokkos::Threads::initialize();
-                Kokkos::InitArguments kargs;
-                kargs.num_threads = 3;
-//                int num_threads = 4;
-//                int use_numa = 1;
-//                int use_core = 1;
-//                Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
-                Kokkos::initialize(kargs);
         }
 
         static void
         TearDownTestCase()
         {
-                // Kokkos::Serial::finalize();
-                // Kokkos::Threads::finalize();
-//                Kokkos::OpenMP::finalize();
-                Kokkos::finalize();
         }
 };
 /*----------------------------------------------------------------------------*/

diff --git a/Elg3D/test/CMakeLists.txt b/Elg3D/test/CMakeLists.txt
@@ -24,7 +24,7 @@ set(UT_ELG3D_SRC_FILES
 add_executable(UT_elg3d main.cpp ${UT_ELG3D_SRC_FILES})
 
 target_link_libraries(UT_elg3d
-		PUBLIC gmock elg3d kmds Kokkos::kokkoscore GCO INIH
+		PUBLIC elg3d kmds Kokkos::kokkoscore GCO INIH GTest::gtest
 		INTERFACE glpk)
 
 
@@ -43,4 +43,4 @@ add_test (NAME    UT_elg3d
 	  WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 
 
-#add_subdirectory(Samples)
+add_subdirectory(Samples)
diff --git a/Elg3D/test/DefeaturingTest.h b/Elg3D/test/DefeaturingTest.h
@@ -26,24 +26,11 @@ class DefeaturingTest : public ::testing::Test
     static void
     SetUpTestCase()
     {
-            // Kokkos::Serial::initialize();
-            // Kokkos::Threads::initialize();
-            Kokkos::InitArguments kargs;
-            kargs.num_threads = 3;
-//            int num_threads = 3;
-//            int use_numa = 1;
-//            int use_core = 1;
-//            Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
-            Kokkos::initialize(kargs);
     }
 
     static void
     TearDownTestCase()
     {
-            // Kokkos::Serial::finalize();
-            // Kokkos::Threads::finalize();
-//            Kokkos::OpenMP::finalize();
-            Kokkos::finalize();
     }
 };
 /*----------------------------------------------------------------------------*/

diff --git a/Elg3D/test/EigenTest.h b/Elg3D/test/EigenTest.h
@@ -23,24 +23,11 @@ class EigenTest : public ::testing::Test
     static void
     SetUpTestCase()
     {
-            // Kokkos::Serial::initialize();
-            // Kokkos::Threads::initialize();
-            Kokkos::InitArguments kargs;
-            kargs.num_threads = 3;
-//            int num_threads = 3;
-//            int use_numa = 1;
-//            int use_core = 1;
-//            Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
-            Kokkos::initialize(kargs);
     }
 
     static void
     TearDownTestCase()
     {
-            // Kokkos::Serial::finalize();
-            // Kokkos::Threads::finalize();
-//            Kokkos::OpenMP::finalize();
-            Kokkos::finalize();
     }
 };
 /*----------------------------------------------------------------------------*/

diff --git a/Elg3D/test/ExtractGeomTest.h b/Elg3D/test/ExtractGeomTest.h
@@ -28,24 +28,11 @@ class ExtractGeomTest : public ::testing::Test
     static void
     SetUpTestCase()
     {
-            // Kokkos::Serial::initialize();
-            // Kokkos::Threads::initialize();
-            Kokkos::InitArguments kargs;
-            kargs.num_threads = 3;
-//            int num_threads = 3;
-//            int use_numa = 1;
-//            int use_core = 1;
-//            Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
-            Kokkos::initialize(kargs);
     }
 
     static void
     TearDownTestCase()
     {
-            // Kokkos::Serial::finalize();
-            // Kokkos::Threads::finalize();
-//            Kokkos::OpenMP::finalize();
-            Kokkos::finalize();
     }
 };
 /*----------------------------------------------------------------------------*/

diff --git a/Elg3D/test/FracPresEnforcementTest.h b/Elg3D/test/FracPresEnforcementTest.h
@@ -24,24 +24,20 @@ class FracPresEnforcementTest : public ::testing::Test
     static void
     SetUpTestCase()
     {
-        // Kokkos::Serial::initialize();
-        // Kokkos::Threads::initialize();
-        Kokkos::InitArguments kargs;
-        kargs.num_threads = 1;
-//            int num_threads = 3;
-//            int use_numa = 1;
-//            int use_core = 1;
-//            Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
-        Kokkos::initialize(kargs);
+//        // Kokkos::Serial::initialize();
+//        // Kokkos::Threads::initialize();
+//        Kokkos::InitArguments kargs;
+//        kargs.num_threads = 1;
+////            int num_threads = 3;
+////            int use_numa = 1;
+////            int use_core = 1;
+////            Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
+//        Kokkos::initialize(kargs);
     }
 
     static void
     TearDownTestCase()
     {
-        // Kokkos::Serial::finalize();
-        // Kokkos::Threads::finalize();
-//            Kokkos::OpenMP::finalize();
-        Kokkos::finalize();
     }
 };
 /*----------------------------------------------------------------------------*/

diff --git a/Elg3D/test/GCOTest.h b/Elg3D/test/GCOTest.h
@@ -18,14 +18,14 @@ double gco_smoothCost_(int p, int q, int label_p, int label_q,void *extraData){
 
 double gco_smoothCost_interface_(int p, int q, int label_p, int label_q,void *extraData){
 
-    gmds::math::Vector n(1., -0.5);
+    gmds::math::Vector n({1., -0.5});
     n.normalize();
 
     std::map<int, gmds::math::Point>* index2pts = reinterpret_cast<std::map<int, gmds::math::Point>* > (extraData);
     gmds::math::Point pt_p = (*index2pts)[p];
     gmds::math::Point pt_q = (*index2pts)[q];
 
-    gmds::math::Vector v(pt_p, pt_q);
+    gmds::math::Vector v(pt_q - pt_p);
     v.normalize();
 
     double dotproduct = n.dot(v);
@@ -53,24 +53,11 @@ class GCOTest : public ::testing::Test
         static void
         SetUpTestCase()
         {
-                // Kokkos::Serial::initialize();
-                // Kokkos::Threads::initialize();
-                Kokkos::InitArguments kargs;
-                kargs.num_threads = 3;
-//                int num_threads = 4;
-//                int use_numa = 1;
-//                int use_core = 1;
-//                Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
-                Kokkos::initialize(kargs);
         }
 
         static void
         TearDownTestCase()
         {
-                // Kokkos::Serial::finalize();
-                // Kokkos::Threads::finalize();
-//                Kokkos::OpenMP::finalize();
-                Kokkos::finalize();
         }
 };
 /*----------------------------------------------------------------------------*/

diff --git a/Elg3D/test/InihTest.h b/Elg3D/test/InihTest.h
@@ -24,24 +24,20 @@ class InihTest : public ::testing::Test
     static void
     SetUpTestCase()
     {
-        // Kokkos::Serial::initialize();
-        // Kokkos::Threads::initialize();
-        Kokkos::InitArguments kargs;
-        kargs.num_threads = 1;
-//        int num_threads = 3;
-//        int use_numa = 1;
-//        int use_core = 1;
-//        Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
-        Kokkos::initialize(kargs);
+//        // Kokkos::Serial::initialize();
+//        // Kokkos::Threads::initialize();
+//        Kokkos::InitArguments kargs;
+//        kargs.num_threads = 1;
+////        int num_threads = 3;
+////        int use_numa = 1;
+////        int use_core = 1;
+////        Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
+//        Kokkos::initialize(kargs);
     }
 
     static void
     TearDownTestCase()
     {
-        // Kokkos::Serial::finalize();
-        // Kokkos::Threads::finalize();
-//        Kokkos::OpenMP::finalize();
-        Kokkos::finalize();
     }
 };
 /*----------------------------------------------------------------------------*/

diff --git a/Elg3D/test/InitDataTest.h b/Elg3D/test/InitDataTest.h
@@ -26,24 +26,11 @@ class InitDataTest : public ::testing::Test
         static void
         SetUpTestCase()
         {
-                // Kokkos::Serial::initialize();
-                // Kokkos::Threads::initialize();
-                Kokkos::InitArguments kargs;
-                kargs.num_threads = 3;
-//                int num_threads = 4;
-//                int use_numa = 1;
-//                int use_core = 1;
-//                Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
-                Kokkos::initialize(kargs);
         }
 
         static void
         TearDownTestCase()
         {
-                // Kokkos::Serial::finalize();
-                // Kokkos::Threads::finalize();
-//                Kokkos::OpenMP::finalize();
-                Kokkos::finalize();
         }
 };
 /*----------------------------------------------------------------------------*/