Skip to content

Commit 2b18471

Browse files
nicolaslgnicolaslg
committed
elg3d tests compilation
1 parent 916dfa0 commit 2b18471

26 files changed

+88
-342
lines changed

‎Elg3D/CMakeLists.txt‎

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -35,38 +35,9 @@ endif()
3535
#==============================================================================
3636
# GTS
3737
#==============================================================================
38-
#include(FindPkgConfig)
3938
find_package(PkgConfig REQUIRED)
40-
#pkg_check_modules(glib-2.0 REQUIRED glib-2.0)
41-
#find_path(GLIB_INCLUDE_DIR glib.h PATH_SUFFIXES glib-2.0)
42-
#include_directories(${GLIB_INCLUDE_DIR})
43-
#find_path(GLIBCONFIG_INCLUDE_DIR glibconfig.h PATH_SUFFIXES ../lib/glib-2.0/include)
44-
#include_directories(${GLIBCONFIG_INCLUDE_DIR})
45-
46-
#pkg_check_modules(gts REQUIRED gts)
47-
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GTS_Cflags}")
48-
#find_path(GTS_INCLUDE_DIR gts.h PATH_SUFFIXES include)
49-
#include_directories(${GTS_INCLUDE_DIR})
50-
#find_path(GTS_LIBRARY_DIR libgts.so PATH_SUFFIXES lib)
51-
#link_directories(${GTS_LIBRARY_DIR})
52-
53-
pkg_search_module(PKG_GTS REQUIRED IMPORTED_TARGET gts)
54-
55-
56-
#if(GTS_LIB_PATH)
57-
# include_directories(${GTS_INC_PATH})
58-
# link_directories(${GTS_LIB_PATH})
59-
# add_compile_definitions(ELG3D_WITH_GTS)
60-
#
61-
# 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)
62-
# 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)
63-
# link_directories(/home/legoffn/travail/utils/spack_20200612/opt/spack/linux-ubuntu16.04-broadwell/gcc-5.4.0/glib-2.64.3-e2s7xjrjzvokp7qjqhalgs5b3ep3cowf/lib)
64-
#endif()
65-
66-
#==============================================================================
67-
# GLIB
68-
#==============================================================================
69-
#include_directories(/usr/include/glib-2.0 /usr/lib64/glib-2.0/include)
39+
pkg_search_module(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0)
40+
pkg_search_module(GTS REQUIRED IMPORTED_TARGET gts)
7041

7142
#==============================================================================
7243
# INTERSECT
@@ -199,7 +170,7 @@ target_link_libraries(run_compare3d elg3d kmds Kokkos::kokkoscore)
199170
target_link_libraries(elg3d
200171
# PUBLIC ${LIB_GMDS_MATH} ${LIB_GMDS_IG} ${LIB_GMDS_CAD} ${LIB_GMDS_UTILS} kmds Kokkos::kokkoscore Kokkos::kokkoscontainers GCO gts glib-2.0
201172
PUBLIC ${LIB_GMDS_MATH} ${LIB_GMDS_IG} ${LIB_GMDS_CAD}
202-
${LIB_GMDS_CADFAC} ${LIB_GMDS_UTILS} kmds Kokkos::kokkoscore Kokkos::kokkoscontainers GCO PkgConfig::PKG_GTS
173+
${LIB_GMDS_CADFAC} ${LIB_GMDS_UTILS} kmds Kokkos::kokkoscore Kokkos::kokkoscontainers GCO PkgConfig::GTS PkgConfig::GLIB2
203174
INTERFACE glpk)
204175

205176
if(ELG3D_WITH_EXODUSII)

‎Elg3D/test/AssignCellsTest.h‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,11 @@ class AssignCellsTest : public ::testing::Test
2525
static void
2626
SetUpTestCase()
2727
{
28-
// Kokkos::Serial::initialize();
29-
// Kokkos::Threads::initialize();
30-
Kokkos::InitArguments kargs;
31-
kargs.num_threads = 3;
32-
// int num_threads = 3;
33-
// int use_numa = 1;
34-
// int use_core = 1;
35-
// Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
36-
Kokkos::initialize(kargs);
3728
}
3829

3930
static void
4031
TearDownTestCase()
4132
{
42-
// Kokkos::Serial::finalize();
43-
// Kokkos::Threads::finalize();
44-
// Kokkos::OpenMP::finalize();
45-
Kokkos::finalize();
4633
}
4734
};
4835
/*----------------------------------------------------------------------------*/

‎Elg3D/test/BadPillowingTest.h‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,20 @@ class BadPillowingTest : public ::testing::Test
2929
static void
3030
SetUpTestCase()
3131
{
32-
// Kokkos::Serial::initialize();
33-
// Kokkos::Threads::initialize();
34-
Kokkos::InitArguments kargs;
35-
kargs.num_threads = 1;
36-
// int num_threads = 3;
37-
// int use_numa = 1;
38-
// int use_core = 1;
39-
// Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
40-
Kokkos::initialize(kargs);
32+
// // Kokkos::Serial::initialize();
33+
// // Kokkos::Threads::initialize();
34+
// Kokkos::InitArguments kargs;
35+
// kargs.num_threads = 1;
36+
//// int num_threads = 3;
37+
//// int use_numa = 1;
38+
//// int use_core = 1;
39+
//// Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
40+
// Kokkos::initialize(kargs);
4141
}
4242

4343
static void
4444
TearDownTestCase()
4545
{
46-
// Kokkos::Serial::finalize();
47-
// Kokkos::Threads::finalize();
48-
// Kokkos::OpenMP::finalize();
49-
Kokkos::finalize();
5046
}
5147
};
5248
/*----------------------------------------------------------------------------*/

‎Elg3D/test/BoundingBoxGeomAssociationTest.h‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,11 @@ class BoundingBoxGeomAssociationTest : public ::testing::Test
2424
static void
2525
SetUpTestCase()
2626
{
27-
// Kokkos::Serial::initialize();
28-
// Kokkos::Threads::initialize();
29-
Kokkos::InitArguments kargs;
30-
kargs.num_threads = 3;
31-
// int num_threads = 4;
32-
// int use_numa = 1;
33-
// int use_core = 1;
34-
// Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
35-
Kokkos::initialize(kargs);
3627
}
3728

3829
static void
3930
TearDownTestCase()
4031
{
41-
// Kokkos::Serial::finalize();
42-
// Kokkos::Threads::finalize();
43-
// Kokkos::OpenMP::finalize();
44-
Kokkos::finalize();
4532
}
4633
};
4734
/*----------------------------------------------------------------------------*/

‎Elg3D/test/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ set(UT_ELG3D_SRC_FILES
2424
add_executable(UT_elg3d main.cpp ${UT_ELG3D_SRC_FILES})
2525

2626
target_link_libraries(UT_elg3d
27-
PUBLIC gmock elg3d kmds Kokkos::kokkoscore GCO INIH
27+
PUBLIC elg3d kmds Kokkos::kokkoscore GCO INIH GTest::gtest
2828
INTERFACE glpk)
2929

3030

@@ -43,4 +43,4 @@ add_test (NAME UT_elg3d
4343
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
4444

4545

46-
#add_subdirectory(Samples)
46+
add_subdirectory(Samples)

‎Elg3D/test/DefeaturingTest.h‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,11 @@ class DefeaturingTest : public ::testing::Test
2626
static void
2727
SetUpTestCase()
2828
{
29-
// Kokkos::Serial::initialize();
30-
// Kokkos::Threads::initialize();
31-
Kokkos::InitArguments kargs;
32-
kargs.num_threads = 3;
33-
// int num_threads = 3;
34-
// int use_numa = 1;
35-
// int use_core = 1;
36-
// Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
37-
Kokkos::initialize(kargs);
3829
}
3930

4031
static void
4132
TearDownTestCase()
4233
{
43-
// Kokkos::Serial::finalize();
44-
// Kokkos::Threads::finalize();
45-
// Kokkos::OpenMP::finalize();
46-
Kokkos::finalize();
4734
}
4835
};
4936
/*----------------------------------------------------------------------------*/

‎Elg3D/test/EigenTest.h‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,11 @@ class EigenTest : public ::testing::Test
2323
static void
2424
SetUpTestCase()
2525
{
26-
// Kokkos::Serial::initialize();
27-
// Kokkos::Threads::initialize();
28-
Kokkos::InitArguments kargs;
29-
kargs.num_threads = 3;
30-
// int num_threads = 3;
31-
// int use_numa = 1;
32-
// int use_core = 1;
33-
// Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
34-
Kokkos::initialize(kargs);
3526
}
3627

3728
static void
3829
TearDownTestCase()
3930
{
40-
// Kokkos::Serial::finalize();
41-
// Kokkos::Threads::finalize();
42-
// Kokkos::OpenMP::finalize();
43-
Kokkos::finalize();
4431
}
4532
};
4633
/*----------------------------------------------------------------------------*/

‎Elg3D/test/ExtractGeomTest.h‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,11 @@ class ExtractGeomTest : public ::testing::Test
2828
static void
2929
SetUpTestCase()
3030
{
31-
// Kokkos::Serial::initialize();
32-
// Kokkos::Threads::initialize();
33-
Kokkos::InitArguments kargs;
34-
kargs.num_threads = 3;
35-
// int num_threads = 3;
36-
// int use_numa = 1;
37-
// int use_core = 1;
38-
// Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
39-
Kokkos::initialize(kargs);
4031
}
4132

4233
static void
4334
TearDownTestCase()
4435
{
45-
// Kokkos::Serial::finalize();
46-
// Kokkos::Threads::finalize();
47-
// Kokkos::OpenMP::finalize();
48-
Kokkos::finalize();
4936
}
5037
};
5138
/*----------------------------------------------------------------------------*/

‎Elg3D/test/FracPresEnforcementTest.h‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,20 @@ class FracPresEnforcementTest : public ::testing::Test
2424
static void
2525
SetUpTestCase()
2626
{
27-
// Kokkos::Serial::initialize();
28-
// Kokkos::Threads::initialize();
29-
Kokkos::InitArguments kargs;
30-
kargs.num_threads = 1;
31-
// int num_threads = 3;
32-
// int use_numa = 1;
33-
// int use_core = 1;
34-
// Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
35-
Kokkos::initialize(kargs);
27+
// // Kokkos::Serial::initialize();
28+
// // Kokkos::Threads::initialize();
29+
// Kokkos::InitArguments kargs;
30+
// kargs.num_threads = 1;
31+
//// int num_threads = 3;
32+
//// int use_numa = 1;
33+
//// int use_core = 1;
34+
//// Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
35+
// Kokkos::initialize(kargs);
3636
}
3737

3838
static void
3939
TearDownTestCase()
4040
{
41-
// Kokkos::Serial::finalize();
42-
// Kokkos::Threads::finalize();
43-
// Kokkos::OpenMP::finalize();
44-
Kokkos::finalize();
4541
}
4642
};
4743
/*----------------------------------------------------------------------------*/

‎Elg3D/test/GCOTest.h‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ double gco_smoothCost_(int p, int q, int label_p, int label_q,void *extraData){
1818

1919
double gco_smoothCost_interface_(int p, int q, int label_p, int label_q,void *extraData){
2020

21-
gmds::math::Vector n(1., -0.5);
21+
gmds::math::Vector n({1., -0.5});
2222
n.normalize();
2323

2424
std::map<int, gmds::math::Point>* index2pts = reinterpret_cast<std::map<int, gmds::math::Point>* > (extraData);
2525
gmds::math::Point pt_p = (*index2pts)[p];
2626
gmds::math::Point pt_q = (*index2pts)[q];
2727

28-
gmds::math::Vector v(pt_p, pt_q);
28+
gmds::math::Vector v(pt_q - pt_p);
2929
v.normalize();
3030

3131
double dotproduct = n.dot(v);
@@ -53,24 +53,11 @@ class GCOTest : public ::testing::Test
5353
static void
5454
SetUpTestCase()
5555
{
56-
// Kokkos::Serial::initialize();
57-
// Kokkos::Threads::initialize();
58-
Kokkos::InitArguments kargs;
59-
kargs.num_threads = 3;
60-
// int num_threads = 4;
61-
// int use_numa = 1;
62-
// int use_core = 1;
63-
// Kokkos::OpenMP::initialize(num_threads, use_numa, use_core);
64-
Kokkos::initialize(kargs);
6556
}
6657

6758
static void
6859
TearDownTestCase()
6960
{
70-
// Kokkos::Serial::finalize();
71-
// Kokkos::Threads::finalize();
72-
// Kokkos::OpenMP::finalize();
73-
Kokkos::finalize();
7461
}
7562
};
7663
/*----------------------------------------------------------------------------*/

0 commit comments

Comments
 (0)