From 42d39b0bbe92a00af76f419fe970fe77750aa6be Mon Sep 17 00:00:00 2001 From: Sebastian Kasperski Date: Mon, 19 Sep 2022 17:44:43 +0200 Subject: [PATCH 1/8] Change to plain CMake. --- CMakeLists.txt | 123 +++++++++++++------------------------------------ 1 file changed, 33 insertions(+), 90 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 257b5df3..a3ec502d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,117 +1,60 @@ cmake_minimum_required(VERSION 3.10) project(ndt_omp) -add_definitions(-std=c++14) -set(CMAKE_CXX_FLAGS "-std=c++14") +include(GNUInstallDirs) -if (BUILD_WITH_MARCH_NATIVE) - add_compile_options(-march=native) -else() - add_definitions(-msse -msse2 -msse3 -msse4 -msse4.1 -msse4.2) - set(CMAKE_CXX_FLAGS "-msse -msse2 -msse3 -msse4 -msse4.1 -msse4.2") -endif() +#add_definitions(-std=c++14) +#set(CMAKE_CXX_FLAGS "-std=c++14") -# pcl 1.7 causes a segfault when it is built with debug mode -set(CMAKE_BUILD_TYPE "RELEASE") +#if (BUILD_WITH_MARCH_NATIVE) +# add_compile_options(-march=native) +#else() +# add_definitions(-msse -msse2 -msse3 -msse4 -msse4.1 -msse4.2) +# set(CMAKE_CXX_FLAGS "-msse -msse2 -msse3 -msse4 -msse4.1 -msse4.2") +#endif() -find_package(PCL 1.7 REQUIRED) -include_directories(${PCL_INCLUDE_DIRS}) -link_directories(${PCL_LIBRARY_DIRS}) -add_definitions(${PCL_DEFINITIONS}) +find_package(PCL 1.7 REQUIRED COMPONENTS registration visualization) +find_package(OpenMP REQUIRED) -message(STATUS "PCL_INCLUDE_DIRS:" ${PCL_INCLUDE_DIRS}) -message(STATUS "PCL_LIBRARY_DIRS:" ${PCL_LIBRARY_DIRS}) -message(STATUS "PCL_DEFINITIONS:" ${PCL_DEFINITIONS}) +message(STATUS "OpenMP_CXX_INCLUDE_DIRS:" ${OpenMP_CXX_INCLUDE_DIRS}) +message(STATUS "OpenMP_CXX_LIBRARIES:" ${OpenMP_CXX_LIBRARIES}) +message(STATUS "OpenMP_CXX_FLAGS:" ${OpenMP_CXX_FLAGS}) -find_package(OpenMP) -if (OPENMP_FOUND) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") -endif() -if($ENV{ROS_VERSION} EQUAL 1) -# ROS1 -find_package(catkin REQUIRED COMPONENTS - roscpp - pcl_ros -) - -################################### -## catkin specific configuration ## -################################### -catkin_package( - INCLUDE_DIRS include - LIBRARIES ndt_omp -) +#set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") +set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") -########### -## Build ## -########### -include_directories(include) -include_directories( - ${catkin_INCLUDE_DIRS} -) add_library(ndt_omp - src/pclomp/voxel_grid_covariance_omp.cpp - src/pclomp/ndt_omp.cpp - src/pclomp/gicp_omp.cpp + src/pclomp/voxel_grid_covariance_omp.cpp + src/pclomp/ndt_omp.cpp + src/pclomp/gicp_omp.cpp ) -add_executable(align - apps/align.cpp +target_link_libraries(ndt_omp + ${PCL_REGISTRATION_LIBRARIES} + ${OpenMP_CXX_LIBRARIES} ) -add_dependencies(align - ndt_omp -) -target_link_libraries(align - ${catkin_LIBRARIES} - ${PCL_LIBRARIES} - ndt_omp + +target_include_directories(ndt_omp PUBLIC + $/include + $ + ${PCL_INCLUDE_DIRS} + ${OpenMP_CXX_INCLUDE_DIRS} ) ############# ## INSTALL ## ############# -install( - TARGETS - ndt_omp - ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} - RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} - LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} +install(TARGETS ndt_omp + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) # install headers install(DIRECTORY include/pclomp - DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}) -else() - -# ROS2 -find_package(ament_cmake_auto REQUIRED) -ament_auto_find_build_dependencies() - -########### -## Build ## -########### -include_directories(include) -include_directories( - ${catkin_INCLUDE_DIRS} -) - -add_library(ndt_omp - src/pclomp/voxel_grid_covariance_omp.cpp - src/pclomp/ndt_omp.cpp - src/pclomp/gicp_omp.cpp + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) -target_link_libraries(ndt_omp ${PCL_LIBRARIES}) - -if(OpenMP_CXX_FOUND) - target_link_libraries(ndt_omp OpenMP::OpenMP_CXX) -else() - message(WARNING "OpenMP not found") -endif() - -ament_auto_package() -endif() From e668fc2d7c7ef2790b0f9e4e8647d363b0cb8cbe Mon Sep 17 00:00:00 2001 From: Sebastian Kasperski Date: Mon, 19 Sep 2022 17:58:52 +0200 Subject: [PATCH 2/8] Removed align executable. --- CMakeLists.txt | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a3ec502d..9db66124 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,28 +3,15 @@ project(ndt_omp) include(GNUInstallDirs) -#add_definitions(-std=c++14) -#set(CMAKE_CXX_FLAGS "-std=c++14") - -#if (BUILD_WITH_MARCH_NATIVE) -# add_compile_options(-march=native) -#else() -# add_definitions(-msse -msse2 -msse3 -msse4 -msse4.1 -msse4.2) -# set(CMAKE_CXX_FLAGS "-msse -msse2 -msse3 -msse4 -msse4.1 -msse4.2") -#endif() - -find_package(PCL 1.7 REQUIRED COMPONENTS registration visualization) +find_package(PCL 1.7 REQUIRED COMPONENTS registration) find_package(OpenMP REQUIRED) message(STATUS "OpenMP_CXX_INCLUDE_DIRS:" ${OpenMP_CXX_INCLUDE_DIRS}) message(STATUS "OpenMP_CXX_LIBRARIES:" ${OpenMP_CXX_LIBRARIES}) message(STATUS "OpenMP_CXX_FLAGS:" ${OpenMP_CXX_FLAGS}) - -#set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") - add_library(ndt_omp src/pclomp/voxel_grid_covariance_omp.cpp src/pclomp/ndt_omp.cpp @@ -43,6 +30,8 @@ target_include_directories(ndt_omp PUBLIC ${OpenMP_CXX_INCLUDE_DIRS} ) +target_compile_features(ndt_omp PUBLIC cxx_standard_14) + ############# ## INSTALL ## ############# From 55c2f63587d8add3c53085aed97a01c1800d9470 Mon Sep 17 00:00:00 2001 From: Sebastian Kasperski Date: Tue, 20 Sep 2022 10:55:56 +0200 Subject: [PATCH 3/8] Use omp target --- CMakeLists.txt | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9db66124..5aea472d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,12 +6,6 @@ include(GNUInstallDirs) find_package(PCL 1.7 REQUIRED COMPONENTS registration) find_package(OpenMP REQUIRED) -message(STATUS "OpenMP_CXX_INCLUDE_DIRS:" ${OpenMP_CXX_INCLUDE_DIRS}) -message(STATUS "OpenMP_CXX_LIBRARIES:" ${OpenMP_CXX_LIBRARIES}) -message(STATUS "OpenMP_CXX_FLAGS:" ${OpenMP_CXX_FLAGS}) - -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") - add_library(ndt_omp src/pclomp/voxel_grid_covariance_omp.cpp src/pclomp/ndt_omp.cpp @@ -20,22 +14,15 @@ add_library(ndt_omp target_link_libraries(ndt_omp ${PCL_REGISTRATION_LIBRARIES} - ${OpenMP_CXX_LIBRARIES} + OpenMP::OpenMP_CXX ) target_include_directories(ndt_omp PUBLIC $/include $ ${PCL_INCLUDE_DIRS} - ${OpenMP_CXX_INCLUDE_DIRS} ) -target_compile_features(ndt_omp PUBLIC cxx_standard_14) - -############# -## INSTALL ## -############# - install(TARGETS ndt_omp ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} From 8e2eb1c6b0cdd417a039f40241de16d262131e22 Mon Sep 17 00:00:00 2001 From: Sebastian Kasperski Date: Tue, 20 Sep 2022 12:16:35 +0200 Subject: [PATCH 4/8] Rename lib to pclomp. --- .gitignore | 2 + CMakeLists.txt | 57 ++++++++++++++++------ ndt_omp.project | 113 ++++++++++++++++++++++++++++++++++++++++++++ package.xml | 2 +- pclomp-config.cmake | 2 + 5 files changed, 160 insertions(+), 16 deletions(-) create mode 100644 .gitignore create mode 100644 ndt_omp.project create mode 100644 pclomp-config.cmake diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..dc84959d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +build/ + diff --git a/CMakeLists.txt b/CMakeLists.txt index 5aea472d..8d68b524 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,36 +1,63 @@ cmake_minimum_required(VERSION 3.10) -project(ndt_omp) +project(PCLOMP VERSION "1.0.0") include(GNUInstallDirs) find_package(PCL 1.7 REQUIRED COMPONENTS registration) find_package(OpenMP REQUIRED) -add_library(ndt_omp +set(HEADERS + include/pclomp/gicp_omp.h + include/pclomp/ndt_omp.h + include/pclomp/voxel_grid_covariance_omp.h +) + +add_library(registration SHARED src/pclomp/voxel_grid_covariance_omp.cpp src/pclomp/ndt_omp.cpp src/pclomp/gicp_omp.cpp ) -target_link_libraries(ndt_omp - ${PCL_REGISTRATION_LIBRARIES} - OpenMP::OpenMP_CXX +set_target_properties(registration PROPERTIES + PUBLIC_HEADER "${HEADERS}" +) + +target_link_libraries(registration + PUBLIC ${PCL_REGISTRATION_LIBRARIES} + PRIVATE OpenMP::OpenMP_CXX ) -target_include_directories(ndt_omp PUBLIC - $/include - $ +target_include_directories(registration PUBLIC + $ + $ ${PCL_INCLUDE_DIRS} ) -install(TARGETS ndt_omp - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +# Install binaries +install(TARGETS registration EXPORT pclomp-targets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/pclomp ) -# install headers -install(DIRECTORY include/pclomp - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} +# Export the library interface +install(EXPORT pclomp-targets + NAMESPACE pclomp:: + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pclomp ) +# Create and install the version file +include(CMakePackageConfigHelpers) +write_basic_package_version_file("pclomp-config-version.cmake" + VERSION ${PCLOMP_VERSION} + COMPATIBILITY SameMajorVersion +) + +install( + FILES + pclomp-config.cmake + ${PROJECT_BINARY_DIR}/pclomp-config-version.cmake + DESTINATION + ${CMAKE_INSTALL_LIBDIR}/cmake/pclomp +) diff --git a/ndt_omp.project b/ndt_omp.project new file mode 100644 index 00000000..c63958fa --- /dev/null +++ b/ndt_omp.project @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + make clean + make + + + + None + $(WorkspacePath) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + make clean + make + + + + None + $(WorkspacePath) + + + + + + + + + + + + + + diff --git a/package.xml b/package.xml index c0da9ca6..2a98107b 100644 --- a/package.xml +++ b/package.xml @@ -2,7 +2,7 @@ ndt_omp - 0.0.0 + 1.0.0 OpenMP boosted NDT and GICP algorithms koide diff --git a/pclomp-config.cmake b/pclomp-config.cmake new file mode 100644 index 00000000..afac9b08 --- /dev/null +++ b/pclomp-config.cmake @@ -0,0 +1,2 @@ +find_package(PCL 1.7 REQUIRED COMPONENTS registration) +include("${CMAKE_CURRENT_LIST_DIR}/pclomp-targets.cmake") From 542729b305863f17fe534d49d19b7c05d7593fb1 Mon Sep 17 00:00:00 2001 From: Sebastian Kasperski Date: Tue, 20 Sep 2022 12:24:41 +0200 Subject: [PATCH 5/8] Simplified directory layout. --- CMakeLists.txt | 14 ++++++------- ndt_omp.project | 20 +++++++++---------- src/{pclomp => }/gicp_omp.cpp | 4 ++-- {include/pclomp => src}/gicp_omp.h | 0 {include/pclomp => src}/gicp_omp_impl.hpp | 0 src/{pclomp => }/ndt_omp.cpp | 4 ++-- {include/pclomp => src}/ndt_omp.h | 2 +- {include/pclomp => src}/ndt_omp_impl.hpp | 2 +- .../voxel_grid_covariance_omp.cpp | 4 ++-- .../voxel_grid_covariance_omp.h | 0 .../voxel_grid_covariance_omp_impl.hpp | 2 +- 11 files changed, 25 insertions(+), 27 deletions(-) rename src/{pclomp => }/gicp_omp.cpp (73%) rename {include/pclomp => src}/gicp_omp.h (100%) rename {include/pclomp => src}/gicp_omp_impl.hpp (100%) rename src/{pclomp => }/ndt_omp.cpp (72%) rename {include/pclomp => src}/ndt_omp.h (99%) rename {include/pclomp => src}/ndt_omp_impl.hpp (99%) rename src/{pclomp => }/voxel_grid_covariance_omp.cpp (54%) rename {include/pclomp => src}/voxel_grid_covariance_omp.h (100%) rename {include/pclomp => src}/voxel_grid_covariance_omp_impl.hpp (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d68b524..1cd462df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,15 +7,15 @@ find_package(PCL 1.7 REQUIRED COMPONENTS registration) find_package(OpenMP REQUIRED) set(HEADERS - include/pclomp/gicp_omp.h - include/pclomp/ndt_omp.h - include/pclomp/voxel_grid_covariance_omp.h + src/gicp_omp.h + src/ndt_omp.h + src/voxel_grid_covariance_omp.h ) add_library(registration SHARED - src/pclomp/voxel_grid_covariance_omp.cpp - src/pclomp/ndt_omp.cpp - src/pclomp/gicp_omp.cpp + src/voxel_grid_covariance_omp.cpp + src/ndt_omp.cpp + src/gicp_omp.cpp ) set_target_properties(registration PROPERTIES @@ -28,7 +28,7 @@ target_link_libraries(registration ) target_include_directories(registration PUBLIC - $ + $ $ ${PCL_INCLUDE_DIRS} ) diff --git a/ndt_omp.project b/ndt_omp.project index c63958fa..492a6f14 100644 --- a/ndt_omp.project +++ b/ndt_omp.project @@ -1,17 +1,15 @@ - - - - - - - - - - - + + + + + + + + + diff --git a/src/pclomp/gicp_omp.cpp b/src/gicp_omp.cpp similarity index 73% rename from src/pclomp/gicp_omp.cpp rename to src/gicp_omp.cpp index 3357648f..ff097499 100644 --- a/src/pclomp/gicp_omp.cpp +++ b/src/gicp_omp.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include template class pclomp::GeneralizedIterativeClosestPoint; template class pclomp::GeneralizedIterativeClosestPoint; diff --git a/include/pclomp/gicp_omp.h b/src/gicp_omp.h similarity index 100% rename from include/pclomp/gicp_omp.h rename to src/gicp_omp.h diff --git a/include/pclomp/gicp_omp_impl.hpp b/src/gicp_omp_impl.hpp similarity index 100% rename from include/pclomp/gicp_omp_impl.hpp rename to src/gicp_omp_impl.hpp diff --git a/src/pclomp/ndt_omp.cpp b/src/ndt_omp.cpp similarity index 72% rename from src/pclomp/ndt_omp.cpp rename to src/ndt_omp.cpp index 8e62c96c..6183df88 100644 --- a/src/pclomp/ndt_omp.cpp +++ b/src/ndt_omp.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include template class pclomp::NormalDistributionsTransform; template class pclomp::NormalDistributionsTransform; diff --git a/include/pclomp/ndt_omp.h b/src/ndt_omp.h similarity index 99% rename from include/pclomp/ndt_omp.h rename to src/ndt_omp.h index 85fbfda7..29b6057e 100644 --- a/include/pclomp/ndt_omp.h +++ b/src/ndt_omp.h @@ -43,7 +43,7 @@ #include #include -#include "voxel_grid_covariance_omp.h" +#include #include diff --git a/include/pclomp/ndt_omp_impl.hpp b/src/ndt_omp_impl.hpp similarity index 99% rename from include/pclomp/ndt_omp_impl.hpp rename to src/ndt_omp_impl.hpp index 220d2019..1cd7c0e4 100644 --- a/include/pclomp/ndt_omp_impl.hpp +++ b/src/ndt_omp_impl.hpp @@ -1,4 +1,4 @@ -#include "ndt_omp.h" +#include /* * Software License Agreement (BSD License) * diff --git a/src/pclomp/voxel_grid_covariance_omp.cpp b/src/voxel_grid_covariance_omp.cpp similarity index 54% rename from src/pclomp/voxel_grid_covariance_omp.cpp rename to src/voxel_grid_covariance_omp.cpp index bd67ecd8..3ad3afec 100644 --- a/src/pclomp/voxel_grid_covariance_omp.cpp +++ b/src/voxel_grid_covariance_omp.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include template class pclomp::VoxelGridCovariance; template class pclomp::VoxelGridCovariance; diff --git a/include/pclomp/voxel_grid_covariance_omp.h b/src/voxel_grid_covariance_omp.h similarity index 100% rename from include/pclomp/voxel_grid_covariance_omp.h rename to src/voxel_grid_covariance_omp.h diff --git a/include/pclomp/voxel_grid_covariance_omp_impl.hpp b/src/voxel_grid_covariance_omp_impl.hpp similarity index 99% rename from include/pclomp/voxel_grid_covariance_omp_impl.hpp rename to src/voxel_grid_covariance_omp_impl.hpp index 5b579a39..de79a06a 100644 --- a/include/pclomp/voxel_grid_covariance_omp_impl.hpp +++ b/src/voxel_grid_covariance_omp_impl.hpp @@ -40,7 +40,7 @@ #include #include -#include "voxel_grid_covariance_omp.h" +#include #include #include From 16a0c31c6d2368dd18fe8645446211a58c38b2c2 Mon Sep 17 00:00:00 2001 From: Sebastian Kasperski Date: Wed, 21 Sep 2022 11:17:12 +0200 Subject: [PATCH 6/8] Changed how public headers are included. --- CMakeLists.txt | 8 ++++---- package.xml | 13 +++---------- src/gicp_omp.cpp | 2 +- src/ndt_omp.cpp | 2 +- src/ndt_omp_impl.hpp | 2 +- src/{ => pclomp}/gicp_omp.h | 0 src/{ => pclomp}/ndt_omp.h | 2 +- src/{ => pclomp}/voxel_grid_covariance_omp.h | 0 src/voxel_grid_covariance_omp.cpp | 2 +- src/voxel_grid_covariance_omp_impl.hpp | 2 +- 10 files changed, 13 insertions(+), 20 deletions(-) rename src/{ => pclomp}/gicp_omp.h (100%) rename src/{ => pclomp}/ndt_omp.h (99%) rename src/{ => pclomp}/voxel_grid_covariance_omp.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1cd462df..ccdc00d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,9 +7,9 @@ find_package(PCL 1.7 REQUIRED COMPONENTS registration) find_package(OpenMP REQUIRED) set(HEADERS - src/gicp_omp.h - src/ndt_omp.h - src/voxel_grid_covariance_omp.h + src/pclomp/gicp_omp.h + src/pclomp/ndt_omp.h + src/pclomp/voxel_grid_covariance_omp.h ) add_library(registration SHARED @@ -29,7 +29,7 @@ target_link_libraries(registration target_include_directories(registration PUBLIC $ - $ + $ ${PCL_INCLUDE_DIRS} ) diff --git a/package.xml b/package.xml index 2a98107b..81d07d4d 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ - ndt_omp + pclomp 1.0.0 OpenMP boosted NDT and GICP algorithms @@ -9,16 +9,9 @@ BSD - catkin - ament_cmake_auto - - pcl_ros - roscpp - - libpcl-all-dev + cmake - catkin - ament_cmake + cmake diff --git a/src/gicp_omp.cpp b/src/gicp_omp.cpp index ff097499..f78a963f 100644 --- a/src/gicp_omp.cpp +++ b/src/gicp_omp.cpp @@ -1,4 +1,4 @@ -#include +#include #include template class pclomp::GeneralizedIterativeClosestPoint; diff --git a/src/ndt_omp.cpp b/src/ndt_omp.cpp index 6183df88..843264e4 100644 --- a/src/ndt_omp.cpp +++ b/src/ndt_omp.cpp @@ -1,4 +1,4 @@ -#include +#include #include template class pclomp::NormalDistributionsTransform; diff --git a/src/ndt_omp_impl.hpp b/src/ndt_omp_impl.hpp index 1cd7c0e4..fdc65251 100644 --- a/src/ndt_omp_impl.hpp +++ b/src/ndt_omp_impl.hpp @@ -1,4 +1,4 @@ -#include +#include /* * Software License Agreement (BSD License) * diff --git a/src/gicp_omp.h b/src/pclomp/gicp_omp.h similarity index 100% rename from src/gicp_omp.h rename to src/pclomp/gicp_omp.h diff --git a/src/ndt_omp.h b/src/pclomp/ndt_omp.h similarity index 99% rename from src/ndt_omp.h rename to src/pclomp/ndt_omp.h index 29b6057e..90083ed9 100644 --- a/src/ndt_omp.h +++ b/src/pclomp/ndt_omp.h @@ -43,7 +43,7 @@ #include #include -#include +#include #include diff --git a/src/voxel_grid_covariance_omp.h b/src/pclomp/voxel_grid_covariance_omp.h similarity index 100% rename from src/voxel_grid_covariance_omp.h rename to src/pclomp/voxel_grid_covariance_omp.h diff --git a/src/voxel_grid_covariance_omp.cpp b/src/voxel_grid_covariance_omp.cpp index 3ad3afec..4a78aa01 100644 --- a/src/voxel_grid_covariance_omp.cpp +++ b/src/voxel_grid_covariance_omp.cpp @@ -1,4 +1,4 @@ -#include +#include #include template class pclomp::VoxelGridCovariance; diff --git a/src/voxel_grid_covariance_omp_impl.hpp b/src/voxel_grid_covariance_omp_impl.hpp index de79a06a..49c9295e 100644 --- a/src/voxel_grid_covariance_omp_impl.hpp +++ b/src/voxel_grid_covariance_omp_impl.hpp @@ -40,7 +40,7 @@ #include #include -#include +#include #include #include From 19fa79de3e35dca59e8520b416ce254a8bdf13f5 Mon Sep 17 00:00:00 2001 From: Sebastian Kasperski Date: Mon, 7 Nov 2022 12:02:17 +0100 Subject: [PATCH 7/8] Removed IDE file. --- ndt_omp.project | 111 ------------------------------------------------ 1 file changed, 111 deletions(-) delete mode 100644 ndt_omp.project diff --git a/ndt_omp.project b/ndt_omp.project deleted file mode 100644 index 492a6f14..00000000 --- a/ndt_omp.project +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - make clean - make - - - - None - $(WorkspacePath) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - make clean - make - - - - None - $(WorkspacePath) - - - - - - - - - - - - - - From 8f8fc4ac451471a99d186737a1f35b0a1cc1b401 Mon Sep 17 00:00:00 2001 From: Sebastian Kasperski Date: Thu, 21 Mar 2024 16:20:41 +0100 Subject: [PATCH 8/8] Added spelling error for compatibility with pcl. --- src/pclomp/ndt_omp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pclomp/ndt_omp.h b/src/pclomp/ndt_omp.h index 90083ed9..7e0728e0 100644 --- a/src/pclomp/ndt_omp.h +++ b/src/pclomp/ndt_omp.h @@ -181,7 +181,7 @@ namespace pclomp * \param[in] outlier_ratio outlier ratio */ inline void - setOutlierRatio(double outlier_ratio) + setOulierRatio(double outlier_ratio) { outlier_ratio_ = outlier_ratio; }