Merge branch '107-remove-boost-dependency-2' into 'master'

Resolve "Remove Boost dependency" Closes #107 See merge request OPAL/Libraries/ippl!121
IPPL-framework · Dec 24, 2021 · 6c7906a · 6c7906a
2 parents e877bf8 + 21d3ccf
commit 6c7906a
Show file tree

Hide file tree

Showing 19 changed files with 11 additions and 81 deletions.
diff --git a/src/Communicate/Communicate.cpp b/src/Communicate/Communicate.cpp
@@ -1,6 +1,5 @@
 //
 // Class Communicate
-//   Communicator class using Boost.MPI
 //
 // Copyright (c) 2020, Matthias Frey, Paul Scherrer Institut, Villigen PSI, Switzerland
 // All rights reserved

diff --git a/test/FFT/CMakeLists.txt b/test/FFT/CMakeLists.txt
@@ -7,7 +7,6 @@ include_directories (
 
 link_directories (
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${Boost_LIBRARY_DIRS}
     ${Kokkos_DIR}/..
 )
 
@@ -19,30 +18,26 @@ target_link_libraries (
     TestFFTCC
     ${IPPL_LIBS}
     ${MPI_CXX_LIBRARIES}
-    ${Boost_LIBRARIES}
 )
 
 add_executable (TestFFTRC TestFFTRC.cpp)
 target_link_libraries (
     TestFFTRC
     ${IPPL_LIBS}
     ${MPI_CXX_LIBRARIES}
-    ${Boost_LIBRARIES}
 )
 
 add_executable (TestSine TestSine.cpp)
 target_link_libraries (
     TestSine
     ${IPPL_LIBS}
     ${MPI_CXX_LIBRARIES}
-    ${Boost_LIBRARIES}
 )
 add_executable (TestCos TestCos.cpp)
 target_link_libraries (
     TestCos
     ${IPPL_LIBS}
     ${MPI_CXX_LIBRARIES}
-    ${Boost_LIBRARIES}
 )
 # vi: set et ts=4 sw=4 sts=4:
 

diff --git a/test/field/CMakeLists.txt b/test/field/CMakeLists.txt
@@ -7,7 +7,6 @@ include_directories (
 
 link_directories (
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${Boost_LIBRARY_DIRS}
     ${Kokkos_DIR}/..
 )
 
@@ -19,23 +18,20 @@ target_link_libraries (
     TestLaplace
     ${IPPL_LIBS}
     ${MPI_CXX_LIBRARIES}
-    ${Boost_LIBRARIES}
 )
 
 add_executable (TestFieldBC TestFieldBC.cpp)
 target_link_libraries (
     TestFieldBC
     ${IPPL_LIBS}
     ${MPI_CXX_LIBRARIES}
-    ${Boost_LIBRARIES}
 )
 
 add_executable (TestHalo TestHalo.cpp)
 target_link_libraries (
     TestHalo
     ${IPPL_LIBS}
     ${MPI_CXX_LIBRARIES}
-    ${Boost_LIBRARIES}
 )
 
 # vi: set et ts=4 sw=4 sts=4:

diff --git a/test/kokkos/CMakeLists.txt b/test/kokkos/CMakeLists.txt
@@ -7,7 +7,6 @@ include_directories (
 
 link_directories (
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${Boost_LIBRARY_DIRS}
     ${Kokkos_DIR}/..
 )
 
@@ -19,31 +18,27 @@ target_link_libraries (
     TestVectorField
     ${IPPL_LIBS}
     ${MPI_CXX_LIBRARIES}
-    ${Boost_LIBRARIES}
 )
 
 add_executable (TestVectorField2 TestVectorField2.cpp)
 target_link_libraries (
     TestVectorField2
     ${IPPL_LIBS}
     ${MPI_CXX_LIBRARIES}
-    ${Boost_LIBRARIES}
 )
 
 add_executable (TestVectorField3 TestVectorField3.cpp)
 target_link_libraries (
     TestVectorField3
     ${IPPL_LIBS}
     ${MPI_CXX_LIBRARIES}
-    ${Boost_LIBRARIES}
 )
 
 add_executable (TestVectorField4 TestVectorField4.cpp)
 target_link_libraries (
     TestVectorField4
     ${IPPL_LIBS}
     ${MPI_CXX_LIBRARIES}
-    ${Boost_LIBRARIES}
 )
 
 # vi: set et ts=4 sw=4 sts=4:
@@ -53,4 +48,4 @@ target_link_libraries (
 # cmake-tab-width: 4
 # indent-tabs-mode: nil
 # require-final-newline: nil
-# End:
+# End:
diff --git a/test/particle/CMakeLists.txt b/test/particle/CMakeLists.txt
@@ -7,11 +7,10 @@ include_directories (
 
 link_directories (
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${Boost_LIBRARY_DIRS}
     ${Kokkos_DIR}/..
 )
 
-set (IPPL_LIBS ippl ${MPI_CXX_LIBRARIES} ${Boost_LIBRARIES})
+set (IPPL_LIBS ippl ${MPI_CXX_LIBRARIES})
 set (COMPILE_FLAGS ${OPAL_CXX_FLAGS})
 
 add_executable (TestScatter TestScatter.cpp)

diff --git a/test/region/CMakeLists.txt b/test/region/CMakeLists.txt
@@ -7,7 +7,6 @@ include_directories (
 
 link_directories (
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${Boost_LIBRARY_DIRS}
     ${Kokkos_DIR}/..
 )
 
@@ -19,22 +18,20 @@ target_link_libraries (
     TestPRegion
     ${IPPL_LIBS}
     ${MPI_CXX_LIBRARIES}
-    ${Boost_LIBRARIES}
 )
 
 add_executable (TestNDRegion TestNDRegion.cpp)
 target_link_libraries (
     TestNDRegion
     ${IPPL_LIBS}
     ${MPI_CXX_LIBRARIES}
-    ${Boost_LIBRARIES}
 )
 
 
-# vi: set et ts=4 sw=4 sts=4:                                                                                                                                                                                                                
-# Local Variables:                                                                                                                                                                                                                           
-# mode: cmake                                                                                                                                                                                                                                
-# cmake-tab-width: 4                                                                                                                                                                                                                          
-# indent-tabs-mode: nil                                                                                                                                                                                                                       
-# require-final-newline: nil                                                                                                                                                                                                                  
+# vi: set et ts=4 sw=4 sts=4:
+# Local Variables:
+# mode: cmake
+# cmake-tab-width: 4
+# indent-tabs-mode: nil
+# require-final-newline: nil
 # End:
diff --git a/test/region/TestNDRegion.cpp b/test/region/TestNDRegion.cpp
@@ -1,9 +1,5 @@
 #include "Ippl.h"
 
-#include <typeinfo>
-
-#include <boost/core/demangle.hpp>
-
 int main(int argc, char *argv[]) {
 
     Ippl ippl(argc,argv);
@@ -17,15 +13,10 @@ int main(int argc, char *argv[]) {
     Kokkos::parallel_for("",
 			 1000,
 			    KOKKOS_LAMBDA(const int i) {
-			     
+
 			 });
 */
 
     std::cout << nd << std::endl;
-    //    const char* name = typeid(a * x * y * a).name();
-
-    //std::cout << z << std::endl;
-    //std::cout << boost::core::demangle( name ) << std::endl;
-
     return 0;
 }
diff --git a/test/region/TestPRegion.cpp b/test/region/TestPRegion.cpp
@@ -2,8 +2,6 @@
 
 #include <typeinfo>
 
-#include <boost/core/demangle.hpp>
-
 int main(int argc, char *argv[]) {
 
     Ippl ippl(argc,argv);
@@ -19,10 +17,5 @@ int main(int argc, char *argv[]) {
 			     region += 1.0;
 			 });
 
-    //    const char* name = typeid(a * x * y * a).name();
-
-    //std::cout << z << std::endl;
-    //std::cout << boost::core::demangle( name ) << std::endl;
-
     return 0;
 }
diff --git a/test/serialization/CMakeLists.txt b/test/serialization/CMakeLists.txt
@@ -7,7 +7,6 @@ include_directories (
 
 link_directories (
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${Boost_LIBRARY_DIRS}
     ${Kokkos_DIR}/..
 )
 
@@ -19,7 +18,6 @@ target_link_libraries (
     serialize01
     ${IPPL_LIBS}
     ${MPI_CXX_LIBRARIES}
-    boost_timer
 )
 
 
@@ -30,4 +28,4 @@ target_link_libraries (
 # cmake-tab-width: 4
 # indent-tabs-mode: nil
 # require-final-newline: nil
-# End:
+# End:
diff --git a/test/vector/CMakeLists.txt b/test/vector/CMakeLists.txt
@@ -7,7 +7,6 @@ include_directories (
 
 link_directories (
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${Boost_LIBRARY_DIRS}
     ${Kokkos_DIR}/..
 )
 
@@ -19,23 +18,20 @@ target_link_libraries (
     TestVector
     ${IPPL_LIBS}
     ${MPI_CXX_LIBRARIES}
-    ${Boost_LIBRARIES}
 )
 
 add_executable (TestVector2 TestVector2.cpp)
 target_link_libraries (
     TestVector2
     ${IPPL_LIBS}
     ${MPI_CXX_LIBRARIES}
-    ${Boost_LIBRARIES}
 )
 
 add_executable (TestVector3 TestVector3.cpp)
 target_link_libraries (
     TestVector3
     ${IPPL_LIBS}
     ${MPI_CXX_LIBRARIES}
-    ${Boost_LIBRARIES}
 )
 
 # vi: set et ts=4 sw=4 sts=4:
@@ -45,4 +41,4 @@ target_link_libraries (
 # cmake-tab-width: 4
 # indent-tabs-mode: nil
 # require-final-newline: nil
-# End:
+# End:
diff --git a/test/vector/TestVector.cpp b/test/vector/TestVector.cpp
@@ -2,8 +2,6 @@
 
 #include <typeinfo>
 
-#include <boost/core/demangle.hpp>
-
 int main(int argc, char *argv[]) {
 
     Ippl ippl(argc,argv);
@@ -21,7 +19,6 @@ int main(int argc, char *argv[]) {
     const char* name = typeid(a * x * y * a).name();
 
     std::cout << z << std::endl;
-    std::cout << boost::core::demangle( name ) << std::endl;
 
     return 0;
 }
diff --git a/test/vector/TestVector2.cpp b/test/vector/TestVector2.cpp
@@ -5,8 +5,6 @@
 
 #include <typeinfo>
 
-#include <boost/core/demangle.hpp>
-
 #include <chrono>
 
 
@@ -104,9 +102,6 @@ int main() {
 
     vector_type x(1.0), y(2.0), z(0.0);
 
-    const char* name = typeid(x + y + x + x).name();
-    std::cout << boost::core::demangle( name ) << std::endl;
-
     auto start = std::chrono::high_resolution_clock::now();
 
     z = x + y + x + x;

diff --git a/test/vector/TestVector3.cpp b/test/vector/TestVector3.cpp
@@ -5,8 +5,6 @@
 
 #include <typeinfo>
 
-#include <boost/core/demangle.hpp>
-
 #include <chrono>
 
 
@@ -105,9 +103,6 @@ int main() {
 
     vector_type x(1.0), y(2.0), z(0.0);
 
-    const char* name = typeid(x + y + x + x).name();
-    std::cout << boost::core::demangle( name ) << std::endl;
-
     auto start = std::chrono::high_resolution_clock::now();
 
     z = x + y + x + x;

diff --git a/unit_tests/BareField/CMakeLists.txt b/unit_tests/BareField/CMakeLists.txt
@@ -9,7 +9,6 @@ include_directories (
 link_directories (
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${GTEST_LIBRARY_DIRS}
-    ${Boost_LIBRARY_DIRS}
     ${Kokkos_DIR}/..
 )
 
@@ -20,7 +19,6 @@ target_link_libraries (
     pthread
     ${MPI_CXX_LIBRARIES}
     ${GTEST_BOTH_LIBRARIES}
-    ${Boost_LIBRARIES}
 )
 
 # vi: set et ts=4 sw=4 sts=4:

diff --git a/unit_tests/Field/CMakeLists.txt b/unit_tests/Field/CMakeLists.txt
@@ -9,7 +9,6 @@ include_directories (
 link_directories (
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${GTEST_LIBRARY_DIRS}
-    ${Boost_LIBRARY_DIRS}
     ${Kokkos_DIR}/..
 )
 
@@ -20,7 +19,6 @@ target_link_libraries (
     pthread
     ${MPI_CXX_LIBRARIES}
     ${GTEST_BOTH_LIBRARIES}
-    ${Boost_LIBRARIES}
 )
 
 add_executable (FieldBC FieldBC.cpp)
@@ -30,7 +28,6 @@ target_link_libraries (
     pthread
     ${MPI_CXX_LIBRARIES}
     ${GTEST_BOTH_LIBRARIES}
-    ${Boost_LIBRARIES}
 )
 # vi: set et ts=4 sw=4 sts=4:
 

diff --git a/unit_tests/Meshes/CMakeLists.txt b/unit_tests/Meshes/CMakeLists.txt
@@ -9,7 +9,6 @@ include_directories (
 link_directories (
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${GTEST_LIBRARY_DIRS}
-    ${Boost_LIBRARY_DIRS}
     ${Kokkos_DIR}/..
 )
 
@@ -19,5 +18,4 @@ target_link_libraries (
     ippl
     ${MPI_CXX_LIBRARIES}
     ${GTEST_BOTH_LIBRARIES}
-    ${Boost_LIBRARIES}
 )