From 39b8d522319abd9684bb7441ea46d0f10bdc4206 Mon Sep 17 00:00:00 2001 From: Sergey Alexandrov Date: Sun, 2 Jul 2017 12:41:06 +0200 Subject: [PATCH 01/66] Revert "PLYReader: thread safe colors" This reverts commit 4c5767698da590a76603c89585654245dd565a69 from 1.8.1 release because it breaks ABI of pcl_io. --- io/include/pcl/io/ply_io.h | 10 ---------- io/src/ply_io.cpp | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/io/include/pcl/io/ply_io.h b/io/include/pcl/io/ply_io.h index 44ab134ba00..7f339981e20 100644 --- a/io/include/pcl/io/ply_io.h +++ b/io/include/pcl/io/ply_io.h @@ -95,8 +95,6 @@ namespace pcl , rgb_offset_before_ (0) , do_resize_ (false) , polygons_ (0) - , r_(0), g_(0), b_(0) - , a_(0), rgba_(0) {} PLYReader (const PLYReader &p) @@ -111,8 +109,6 @@ namespace pcl , rgb_offset_before_ (0) , do_resize_ (false) , polygons_ (0) - , r_(0), g_(0), b_(0) - , a_(0), rgba_(0) { *this = p; } @@ -533,12 +529,6 @@ namespace pcl std::vector *polygons_; public: EIGEN_MAKE_ALIGNED_OPERATOR_NEW - - private: - // RGB values stored by vertexColorCallback() - int32_t r_, g_, b_; - // Color values stored by vertexAlphaCallback() - uint32_t a_, rgba_; }; /** \brief Point Cloud Data (PLY) file format writer. diff --git a/io/src/ply_io.cpp b/io/src/ply_io.cpp index 9e69c79d04e..2bef3b49a0a 100644 --- a/io/src/ply_io.cpp +++ b/io/src/ply_io.cpp @@ -375,19 +375,20 @@ namespace pcl void pcl::PLYReader::vertexColorCallback (const std::string& color_name, pcl::io::ply::uint8 color) { + static int32_t r, g, b; if ((color_name == "red") || (color_name == "diffuse_red")) { - r_ = int32_t (color); + r = int32_t (color); rgb_offset_before_ = vertex_offset_before_; } if ((color_name == "green") || (color_name == "diffuse_green")) { - g_ = int32_t (color); + g = int32_t (color); } if ((color_name == "blue") || (color_name == "diffuse_blue")) { - b_ = int32_t (color); - int32_t rgb = r_ << 16 | g_ << 8 | b_; + b = int32_t (color); + int32_t rgb = r << 16 | g << 8 | b; memcpy (&cloud_->data[vertex_count_ * cloud_->point_step + rgb_offset_before_], &rgb, sizeof (pcl::io::ply::float32)); @@ -398,16 +399,17 @@ pcl::PLYReader::vertexColorCallback (const std::string& color_name, pcl::io::ply void pcl::PLYReader::vertexAlphaCallback (pcl::io::ply::uint8 alpha) { - a_ = uint32_t (alpha); + static uint32_t a, rgba; + a = uint32_t (alpha); // get anscient rgb value and store it in rgba - memcpy (&rgba_, + memcpy (&rgba, &cloud_->data[vertex_count_ * cloud_->point_step + rgb_offset_before_], sizeof (pcl::io::ply::float32)); // append alpha - rgba_ = rgba_ | a_ << 24; + rgba = rgba | a << 24; // put rgba back memcpy (&cloud_->data[vertex_count_ * cloud_->point_step + rgb_offset_before_], - &rgba_, + &rgba, sizeof (uint32_t)); } From 14c72800f3cde9d3243a7222656c075eb4e75c36 Mon Sep 17 00:00:00 2001 From: Sergey Alexandrov Date: Sun, 2 Jul 2017 12:43:11 +0200 Subject: [PATCH 02/66] Bump version to 1.8.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index da9f29542dd..d36a581fb95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -191,7 +191,7 @@ if(CMAKE_COMPILER_IS_CLANG) endif() include("${PCL_SOURCE_DIR}/cmake/pcl_utils.cmake") -set(PCL_VERSION "1.8.0-dev" CACHE STRING "PCL version") +set(PCL_VERSION "1.8.1" CACHE STRING "PCL version") DISSECT_VERSION() GET_OS_INFO() SET_INSTALL_DIRS() From 0ff1d124841ac3854cff06509e94cff7a06bd176 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Sun, 2 Jul 2017 20:31:00 +0200 Subject: [PATCH 03/66] Add new gtest path --- cmake/Modules/FindGtest.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/Modules/FindGtest.cmake b/cmake/Modules/FindGtest.cmake index 08c6ccf5eca..fb0fd1594ac 100644 --- a/cmake/Modules/FindGtest.cmake +++ b/cmake/Modules/FindGtest.cmake @@ -24,6 +24,7 @@ find_path(GTEST_SRC_DIR src/gtest-all.cc HINTS "${GTEST_ROOT}" "$ENV{GTEST_ROOT}" PATHS "$ENV{PROGRAMFILES}/gtest" "$ENV{PROGRAMW6432}/gtest" PATHS "$ENV{PROGRAMFILES}/gtest-1.7.0" "$ENV{PROGRAMW6432}/gtest-1.7.0" + PATH /usr/src/googletest/googletest PATH /usr/src/gtest PATH_SUFFIXES gtest usr/src/gtest) From 26803fb95d1921fce914ffe0e75c8cec04e5b40b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Agostinho?= Date: Tue, 4 Jul 2017 14:58:34 +0100 Subject: [PATCH 04/66] Fix issue with finding pcl deployed out of path (#1923) * fix issue with finding pcl deployed out of path * The path is set relative to PCLConfig.cmake --- PCLConfig.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in index f3089dfec1b..f4ef6a0ffd2 100644 --- a/PCLConfig.cmake.in +++ b/PCLConfig.cmake.in @@ -717,7 +717,7 @@ if(WIN32 AND NOT MINGW) get_filename_component(PCL_ROOT "${PCL_DIR}" PATH) else(WIN32 AND NOT MINGW) # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y - set(PCL_ROOT "@CMAKE_INSTALL_PREFIX@") + get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE) endif(WIN32 AND NOT MINGW) # check whether PCLConfig.cmake is found into a PCL installation or in a build tree From 1c35f484e9a303b115c211f2ea814bd608ec0df2 Mon Sep 17 00:00:00 2001 From: Anup Parikh Date: Wed, 5 Jul 2017 14:24:57 -0600 Subject: [PATCH 05/66] Fix issue #1674 --- gpu/people/src/cuda/nvidia/NPP_staging.cu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpu/people/src/cuda/nvidia/NPP_staging.cu b/gpu/people/src/cuda/nvidia/NPP_staging.cu index 144dae583a6..612aa7d16de 100644 --- a/gpu/people/src/cuda/nvidia/NPP_staging.cu +++ b/gpu/people/src/cuda/nvidia/NPP_staging.cu @@ -2070,7 +2070,7 @@ NCVStatus nppiStInterpolateFrames(const NppStInterpolationState *pState) //============================================================================== -#if __CUDA_ARCH__ < 200 +#if ((defined __CUDA_ARCH__) && (__CUDA_ARCH__ < 200)) // FP32 atomic add static __forceinline__ __device__ float _atomicAdd(float *addr, float val) From 81b56e37e200935480bddc1ce0b63f7e2adc72fa Mon Sep 17 00:00:00 2001 From: Rafal Kozik Date: Fri, 7 Jul 2017 13:50:30 +0200 Subject: [PATCH 06/66] Added CUDA compute capability 5.3 --- cmake/pcl_find_cuda.cmake | 2 +- gpu/containers/src/initialization.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/pcl_find_cuda.cmake b/cmake/pcl_find_cuda.cmake index 300080905a7..fd9cfa900c1 100644 --- a/cmake/pcl_find_cuda.cmake +++ b/cmake/pcl_find_cuda.cmake @@ -44,7 +44,7 @@ if(CUDA_FOUND) # Find a complete list for CUDA compute capabilities at http://developer.nvidia.com/cuda-gpus if(NOT ${CUDA_VERSION_STRING} VERSION_LESS "8.0") - set(__cuda_arch_bin "2.0 2.1(2.0) 3.0 3.5 5.0 5.2 6.0 6.1") + set(__cuda_arch_bin "2.0 2.1(2.0) 3.0 3.5 5.0 5.2 5.3 6.0 6.1") elseif(NOT ${CUDA_VERSION_STRING} VERSION_LESS "6.5") set(__cuda_arch_bin "2.0 2.1(2.0) 3.0 3.5 5.0 5.2") elseif(NOT ${CUDA_VERSION_STRING} VERSION_LESS "6.0") diff --git a/gpu/containers/src/initialization.cpp b/gpu/containers/src/initialization.cpp index e8cff48c821..17152b7d0d1 100644 --- a/gpu/containers/src/initialization.cpp +++ b/gpu/containers/src/initialization.cpp @@ -117,7 +117,7 @@ namespace SMtoCores gpuArchCoresPerSM[] = { {0x10, 8}, {0x11, 8}, {0x12, 8}, {0x13, 8}, {0x20, 32}, {0x21, 48}, {0x30, 192}, - {0x35, 192}, {0x50, 128}, {0x52, 128}, {0x60, 64}, {0x61, 128}, {-1, -1} + {0x35, 192}, {0x50, 128}, {0x52, 128}, {0x53, 128}, {0x60, 64}, {0x61, 128}, {-1, -1} }; int index = 0; while (gpuArchCoresPerSM[index].SM != -1) From d080f67fe724c3d9365b59c7d963f1100f0bf5c2 Mon Sep 17 00:00:00 2001 From: Victor Lamoine Date: Mon, 10 Jul 2017 12:02:24 +0200 Subject: [PATCH 07/66] Update Ensenso tutorial for Ensenso X devices --- doc/tutorials/content/ensenso_cameras.rst | 30 +++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/doc/tutorials/content/ensenso_cameras.rst b/doc/tutorials/content/ensenso_cameras.rst index 66c3ae26b81..29b965290ef 100644 --- a/doc/tutorials/content/ensenso_cameras.rst +++ b/doc/tutorials/content/ensenso_cameras.rst @@ -44,6 +44,36 @@ Note that this program opens the TCP port of the nxLib tree, this allows you to The capture parameters (exposure, gain etc..) are set to default values. If you have performed and stored an extrinsic calibration it will be temporary reset. +If you are using an Ensenso X device you have to calibrate the device before trying to run the PCL driver. If you don't you will get an error like this: + +.. code-block:: cpp + Initialising nxLib + Opening Ensenso stereo camera id = 0 + openDevice: NxLib error ExecutionFailed (17) occurred while accessing item /Execute. + + { + "ErrorSymbol": "InvalidCalibrationData", + "ErrorText": "Stereo camera calibration data is corrupted or not supported yet by the current software version.", + "Execute": { + "Command": "Open", + "Parameters": { + "AllowFirmwareUpload": null, + "Cameras": "171197", + "FirmwareUpload": { + "Camera": null, + "Projector": null + }, + "LoadCalibration": null, + "Projector": null, + "Threads": null + } + }, + "Time": 8902, + "TimeExecute": 8901, + "TimeFinalize": 0.03477, + "TimePrepare": 0.01185 + } + .. code-block:: cpp ensenso_ptr->enumDevices (); From fbfee18328c93d90a68d72a513c7fe48f2688927 Mon Sep 17 00:00:00 2001 From: Eisoku Kuroiwa Date: Thu, 20 Jul 2017 00:26:04 +0900 Subject: [PATCH 08/66] need to include instantiate.hpp to use PCL_INSTANTIATE --- gpu/kinfu_large_scale/src/world_model.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/gpu/kinfu_large_scale/src/world_model.cpp b/gpu/kinfu_large_scale/src/world_model.cpp index 5477f0d3ff4..2a038597eb3 100644 --- a/gpu/kinfu_large_scale/src/world_model.cpp +++ b/gpu/kinfu_large_scale/src/world_model.cpp @@ -38,6 +38,7 @@ #include #include + #include From 7ee6471fc202d5ceaeab7e5abdc5d04f5c05f3f7 Mon Sep 17 00:00:00 2001 From: Courtney Pitcher Date: Thu, 3 Aug 2017 19:45:44 +0200 Subject: [PATCH 09/66] Fixed error in documentation. pcl::visualization::createCube was documented incorrectly and there were spelling mistakes. --- .../include/pcl/visualization/common/shapes.h | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/visualization/include/pcl/visualization/common/shapes.h b/visualization/include/pcl/visualization/common/shapes.h index ef36a0fe8de..e97b028765e 100644 --- a/visualization/include/pcl/visualization/common/shapes.h +++ b/visualization/include/pcl/visualization/common/shapes.h @@ -231,14 +231,14 @@ namespace pcl * // Note: The height of the cone is set using the magnitude of the axis_direction vector. * * pcl::ModelCoefficients cone_coeff; - * plane_coeff.values.resize (7); // We need 7 values - * plane_coeff.values[0] = cone_apex.x (); - * plane_coeff.values[1] = cone_apex.y (); - * plane_coeff.values[2] = cone_apex.z (); - * plane_coeff.values[3] = axis_direction.x (); - * plane_coeff.values[4] = axis_direction.y (); - * plane_coeff.values[5] = axis_direction.z (); - * plane_coeff.values[6] = angle (); // degrees + * cone_coeff.values.resize (7); // We need 7 values + * cone_coeff.values[0] = cone_apex.x (); + * cone_coeff.values[1] = cone_apex.y (); + * cone_coeff.values[2] = cone_apex.z (); + * cone_coeff.values[3] = axis_direction.x (); + * cone_coeff.values[4] = axis_direction.y (); + * cone_coeff.values[5] = axis_direction.z (); + * cone_coeff.values[6] = angle (); // degrees * * vtkSmartPointer data = pcl::visualization::createCone (cone_coeff); * \endcode @@ -248,14 +248,14 @@ namespace pcl PCL_EXPORTS vtkSmartPointer createCone (const pcl::ModelCoefficients &coefficients); - /** \brief Creaet a cube shape from a set of model coefficients. + /** \brief Create a cube shape from a set of model coefficients. * \param[in] coefficients the cube coefficients (Tx, Ty, Tz, Qx, Qy, Qz, Qw, width, height, depth) * \ingroup visualization */ PCL_EXPORTS vtkSmartPointer createCube (const pcl::ModelCoefficients &coefficients); - /** \brief Creaet a cube shape from a set of model coefficients. + /** \brief Create a cube shape from a set of model coefficients. * * \param[in] translation a translation to apply to the cube from 0,0,0 * \param[in] rotation a quaternion-based rotation to apply to the cube From a83bb1edcf2a9fe2607edb1d26ab63f5105311d7 Mon Sep 17 00:00:00 2001 From: IgniparousTempest Date: Fri, 4 Aug 2017 10:38:17 +0200 Subject: [PATCH 10/66] Fixed spelling and grammar errors --- .../pcl/visualization/pcl_visualizer.h | 22 ++++++++--------- .../visualization/registration_visualizer.h | 24 +++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/visualization/include/pcl/visualization/pcl_visualizer.h b/visualization/include/pcl/visualization/pcl_visualizer.h index 7b8d3d3b38e..30067ee2e0c 100644 --- a/visualization/include/pcl/visualization/pcl_visualizer.h +++ b/visualization/include/pcl/visualization/pcl_visualizer.h @@ -462,7 +462,7 @@ namespace pcl * \param[in] ypos the Y position on screen where the text should be added * \param[in] r the red color value * \param[in] g the green color value - * \param[in] b the blue color vlaue + * \param[in] b the blue color value * \param[in] id the text object id (default: equal to the "text" parameter) * \param[in] viewport the view port (default: all) */ @@ -477,7 +477,7 @@ namespace pcl * \param[in] fontsize the fontsize of the text * \param[in] r the red color value * \param[in] g the green color value - * \param[in] b the blue color vlaue + * \param[in] b the blue color value * \param[in] id the text object id (default: equal to the "text" parameter) * \param[in] viewport the view port (default: all) */ @@ -503,7 +503,7 @@ namespace pcl * \param[in] ypos the new Y position on screen * \param[in] r the red color value * \param[in] g the green color value - * \param[in] b the blue color vlaue + * \param[in] b the blue color value * \param[in] id the text object id (default: equal to the "text" parameter) */ bool @@ -518,7 +518,7 @@ namespace pcl * \param[in] fontsize the fontsize of the text * \param[in] r the red color value * \param[in] g the green color value - * \param[in] b the blue color vlaue + * \param[in] b the blue color value * \param[in] id the text object id (default: equal to the "text" parameter) */ bool @@ -579,7 +579,7 @@ namespace pcl double r = 1.0, double g = 1.0, double b = 1.0, const std::string &id = "", int viewport = 0); - /** \brief Check if the cloud, shape, or coordinate with the given id was already added to this vizualizer. + /** \brief Check if the cloud, shape, or coordinate with the given id was already added to this visualizer. * \param[in] id the id of the cloud, shape, or coordinate to check * \return true if a cloud, shape, or coordinate with the specified id was found */ @@ -1128,7 +1128,7 @@ namespace pcl int getGeometryHandlerIndex (const std::string &id); - /** \brief Update/set the color index of a renderered PointCloud based on its ID + /** \brief Update/set the color index of a rendered PointCloud based on its ID * \param[in] id the point cloud object id * \param[in] index the color handler index to use */ @@ -1323,7 +1323,7 @@ namespace pcl addArrow (const P1 &pt1, const P2 &pt2, double r, double g, double b, const std::string &id = "arrow", int viewport = 0); - /** \brief Add a line arrow segment between two points, and (optianally) display the distance between them + /** \brief Add a line arrow segment between two points, and (optionally) display the distance between them * * Arrow head is attached on the **start** point (\c pt1) of the arrow. * @@ -1661,8 +1661,8 @@ namespace pcl renderView (int xres, int yres, pcl::PointCloud::Ptr & cloud); /** \brief The purpose of this method is to render a CAD model added to the visualizer from different viewpoints - * in order to simulate partial views of model. The viewpoint locations are the vertices of a tesselated sphere - * build from an icosaheadron. The tesselation paremeter controls how many times the triangles of the original + * in order to simulate partial views of model. The viewpoint locations are the vertices of a tessellated sphere + * build from an icosaheadron. The tessellation parameter controls how many times the triangles of the original * icosahedron are divided to approximate the sphere and thus the number of partial view generated for a model, * with a tesselation_level of 0, 12 views are generated if use_vertices=true and 20 views if use_vertices=false * @@ -1673,8 +1673,8 @@ namespace pcl * \param[out] enthropies are values between 0 and 1 representing which percentage of the model is seen from the respective viewpoint. * \param[in] tesselation_level represents the number of subdivisions applied to the triangles of original icosahedron. * \param[in] view_angle field of view of the virtual camera. Default: 45 - * \param[in] radius_sphere the tesselated sphere radius. Default: 1 - * \param[in] use_vertices if true, use the vertices of tesselated icosahedron (12,42,...) or if false, use the faces of tesselated + * \param[in] radius_sphere the tessellated sphere radius. Default: 1 + * \param[in] use_vertices if true, use the vertices of tessellated icosahedron (12,42,...) or if false, use the faces of tessellated * icosahedron (20,80,...). Default: true */ void diff --git a/visualization/include/pcl/visualization/registration_visualizer.h b/visualization/include/pcl/visualization/registration_visualizer.h index 72930a1a8c4..2b4f6080216 100644 --- a/visualization/include/pcl/visualization/registration_visualizer.h +++ b/visualization/include/pcl/visualization/registration_visualizer.h @@ -45,9 +45,9 @@ namespace pcl { /** \brief @b RegistrationVisualizer represents the base class for rendering - * the intermediate positions ocupied by the source point cloud during it's registration + * the intermediate positions occupied by the source point cloud during it's registration * to the target point cloud. A registration algorithm is considered as input and - * it's covergence is rendered. + * it's convergence is rendered. * \author Gheorghe Lisca * \ingroup visualization */ @@ -74,7 +74,7 @@ namespace pcl /** \brief Set the registration algorithm whose intermediate steps will be rendered. * The method creates the local callback function pcl::RegistrationVisualizer::update_visualizer_ and - * binds it to the local biffers update function pcl::RegistrationVisualizer::updateIntermediateCloud(). + * binds it to the local buffers update function pcl::RegistrationVisualizer::updateIntermediateCloud(). * The local callback function pcl::RegistrationVisualizer::update_visualizer_ is then linked to * the pcl::Registration::update_visualizer_ callback function. * \param registration represents the registration method whose intermediate steps will be rendered. @@ -82,10 +82,10 @@ namespace pcl bool setRegistration (pcl::Registration ®istration) { - // Update the name of the registration method to be desplayed + // Update the name of the registration method to be displayed registration_method_name_ = registration.getClassName(); - // Create the local callback function and bind it to the local function resposable for updating + // Create the local callback function and bind it to the local function responsible for updating // the local buffers update_visualizer_ = boost::bind (&RegistrationVisualizer::updateIntermediateCloud, this, _1, _2, _3, _4); @@ -117,19 +117,19 @@ namespace pcl /** \brief Updates visualizer local buffers cloud_intermediate, cloud_intermediate_indices, cloud_target_indices with * the newest registration intermediate results. * \param cloud_src represents the initial source point cloud - * \param indices_src represents the incices of the intermediate source points used for the estimation of rigid transformation + * \param indices_src represents the indices of the intermediate source points used for the estimation of rigid transformation * \param cloud_tgt represents the target point cloud - * \param indices_tgt represents the incices of the target points used for the estimation of rigid transformation + * \param indices_tgt represents the indices of the target points used for the estimation of rigid transformation */ void updateIntermediateCloud (const pcl::PointCloud &cloud_src, const std::vector &indices_src, const pcl::PointCloud &cloud_tgt, const std::vector &indices_tgt); - /** \brief Set maximum number of corresponcence lines whch will be rendered. */ + /** \brief Set maximum number of correspondence lines which will be rendered. */ inline void setMaximumDisplayedCorrespondences (const int maximum_displayed_correspondences) { - // This method is usualy called form other thread than visualizer thread + // This method is usually called form other thread than visualizer thread // therefore same visualizer_updating_mutex_ will be used // Lock maximum_displayed_correspondences_ @@ -142,7 +142,7 @@ namespace pcl visualizer_updating_mutex_.unlock(); } - /** \brief Return maximum number of corresponcence lines which are rendered. */ + /** \brief Return maximum number of correspondence lines which are rendered. */ inline size_t getMaximumDisplayedCorrespondences() { @@ -150,7 +150,7 @@ namespace pcl } private: - /** \brief Initialize and run the visualization loop. This function will be runned in the internal thread viewer_thread_ */ + /** \brief Initialize and run the visualization loop. This function will run in the internal thread viewer_thread_ */ void runDisplay (); @@ -187,7 +187,7 @@ namespace pcl /** \brief The local buffer for target point cloud. */ pcl::PointCloud cloud_target_; - /** \brief The mutex used for the sincronization of updating and rendering of the local buffers. */ + /** \brief The mutex used for the synchronization of updating and rendering of the local buffers. */ boost::mutex visualizer_updating_mutex_; /** \brief The local buffer for intermediate point cloud obtained during registration process. */ From a7ff652eda12f952ce441d6e35926c9b89352919 Mon Sep 17 00:00:00 2001 From: Li Jun Date: Thu, 3 Aug 2017 16:58:29 +0800 Subject: [PATCH 11/66] Add test for macro _USE_MATH_DEFINES. --- common/include/pcl/pcl_macros.h | 2 ++ people/src/hog.cpp | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/include/pcl/pcl_macros.h b/common/include/pcl/pcl_macros.h index 21952bec9c3..925da2a28d2 100644 --- a/common/include/pcl/pcl_macros.h +++ b/common/include/pcl/pcl_macros.h @@ -69,7 +69,9 @@ namespace pcl #include #include #include +#ifndef _USE_MATH_DEFINES #define _USE_MATH_DEFINES +#endif #include // MSCV doesn't have std::{isnan,isfinite} diff --git a/people/src/hog.cpp b/people/src/hog.cpp index 20963965fd3..713f590f83f 100644 --- a/people/src/hog.cpp +++ b/people/src/hog.cpp @@ -41,8 +41,6 @@ #include -#define _USE_MATH_DEFINES -#include #include #if defined(__SSE2__) From 39732f5a7c8455ed51fd0f6278d8b25322a68dd9 Mon Sep 17 00:00:00 2001 From: Sergey Alexandrov Date: Tue, 8 Aug 2017 08:03:08 +0200 Subject: [PATCH 12/66] Final changelist update for 1.8.1 --- CHANGES.md | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 6ad3328a8ed..44b1b12152e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,6 @@ # ChangeList -## *= 1.8.1 (26.06.2017) =* +## *= 1.8.1 (08.08.2017) =* * Replaced `make_shared` invocations on aligned allocated vars [[#1405]](https://github.com/PointCloudLibrary/pcl/pull/1405) @@ -52,7 +52,7 @@ issues between old versions of the CUDA Toolkit and new versions of gcc [[#1900]](https://github.com/PointCloudLibrary/pcl/pull/1900) -* Implemented new versioning scheme for PCL, employing the sufix +* Implemented new versioning scheme for PCL, employing the suffix  `-dev` in between releases.  [[#1905]](https://github.com/PointCloudLibrary/pcl/pull/1905) * Corrected search paths for Eigen on Windows @@ -62,6 +62,10 @@ [[#1917]](https://github.com/PointCloudLibrary/pcl/pull/1917) * Added support to dynamic linking against FLANN on Windows [[#1919]](https://github.com/PointCloudLibrary/pcl/pull/1919) +* Add new search path for GTest to the finder script + [[#1920]](https://github.com/PointCloudLibrary/pcl/pull/1920) +* Fix discovery of PCL deployed out of install path + [[#1923]](https://github.com/PointCloudLibrary/pcl/pull/1923) ### `libpcl_2d:` @@ -104,6 +108,8 @@ [[#1878]](https://github.com/PointCloudLibrary/pcl/pull/1878) * Improved support for mingw aligned allocation [[#1904]](https://github.com/PointCloudLibrary/pcl/pull/1904) +* Added test for macro `_USE_MATH_DEFINES` to avoid warnings + [[#1956]](https://github.com/PointCloudLibrary/pcl/pull/1956) ### `libpcl_cuda:` @@ -139,6 +145,8 @@ [[#1824]](https://github.com/PointCloudLibrary/pcl/pull/1824) * Fixed compilation error in KinfuLS [[#1872]](https://github.com/PointCloudLibrary/pcl/pull/1872) +* Fixed CUDA architecture check + [[#1872]](https://github.com/PointCloudLibrary/pcl/pull/1872) ### `libpcl_io:` @@ -151,8 +159,6 @@ [[#1569]](https://github.com/PointCloudLibrary/pcl/pull/1569) * Improved performance on saving PLY, OBJ and VTK files [[#1580]](https://github.com/PointCloudLibrary/pcl/pull/1580) -* PLYReader should now be thread-safe - [[#1587]](https://github.com/PointCloudLibrary/pcl/pull/1587) * Added support to the transparency property `Tr` on pcl::MTLReader and fixed issue with parsing of the material's properties. [[#1599]](https://github.com/PointCloudLibrary/pcl/pull/1599) @@ -309,6 +315,8 @@ * Updated matrix transform tutorial and added cube.ply mesh [[#1894]](https://github.com/PointCloudLibrary/pcl/pull/1894) [[#1897]](https://github.com/PointCloudLibrary/pcl/pull/1897) +* Updated Ensenso tutorial for Ensenso X devices + [[#1933]](https://github.com/PointCloudLibrary/pcl/pull/1933) ### `CI:` From 217fd2277e1e07878376e28382cbf19af61ac1d1 Mon Sep 17 00:00:00 2001 From: Konrad Malkowski Date: Wed, 18 Oct 2017 18:43:06 -0400 Subject: [PATCH 13/66] Fix: Install cuda based filters (#1) --- cuda/CMakeLists.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/cuda/CMakeLists.txt b/cuda/CMakeLists.txt index c8cc117826d..4b489b20786 100644 --- a/cuda/CMakeLists.txt +++ b/cuda/CMakeLists.txt @@ -21,6 +21,15 @@ if(BUILD_CUDA AND CUDA_FOUND) sort_relative(PCL_CUDA_MODULES_NAMES_UNSORTED PCL_CUDA_MODULES_NAMES PCL_CUDA_MODULES_DIRS) foreach(subdir ${PCL_CUDA_MODULES_DIRS}) add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/${subdir}") - endforeach(subdir) + endforeach(subdir) + + # Install include files + SET(incs + filters/include/pcl/cuda/filters/filter.h + filters/include/pcl/cuda/filters/passthrough.h + filters/include/pcl/cuda/filters/voxel_grid.h + ) + PCL_ADD_INCLUDES(${SUBSYS_NAME} "cuda/filters" ${incs}) + endif() From 0a4d1c9a0e87afe4db8c7bf53924304c66a53fe3 Mon Sep 17 00:00:00 2001 From: dantwinkler Date: Mon, 30 Oct 2017 08:27:56 -0400 Subject: [PATCH 14/66] feat: Add install step for io buffers. --- io/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt index efaa798517c..d4d91cc0a35 100644 --- a/io/CMakeLists.txt +++ b/io/CMakeLists.txt @@ -245,6 +245,7 @@ if(build) set(incs "include/pcl/${SUBSYS_NAME}/boost.h" "include/pcl/${SUBSYS_NAME}/eigen.h" + "include/pcl/${SUBSYS_NAME}/buffers.h" "include/pcl/${SUBSYS_NAME}/debayer.h" "include/pcl/${SUBSYS_NAME}/file_io.h" "include/pcl/${SUBSYS_NAME}/auto_io.h" @@ -301,6 +302,7 @@ if(build) set(impl_incs "include/pcl/${SUBSYS_NAME}/impl/ascii_io.hpp" + "include/pcl/${SUBSYS_NAME}/impl/buffers.hpp" "include/pcl/${SUBSYS_NAME}/impl/pcd_io.hpp" "include/pcl/${SUBSYS_NAME}/impl/auto_io.hpp" "include/pcl/${SUBSYS_NAME}/impl/lzf_image_io.hpp" From 1aa002d1d7dbca5252dbb56c223daf7cd3b19e10 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Sat, 2 Dec 2017 15:42:23 -0500 Subject: [PATCH 15/66] fix: Build on circleci. --- .circleci/build.sh | 5 +++++ .circleci/config.yml | 31 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 .circleci/build.sh create mode 100644 .circleci/config.yml diff --git a/.circleci/build.sh b/.circleci/build.sh new file mode 100644 index 00000000000..cd88ea40c61 --- /dev/null +++ b/.circleci/build.sh @@ -0,0 +1,5 @@ +#!/bin/bash +mkdir build && cd build +cmake .. -DBUILD_CUDA=ON -DBUILD_GPU=ON -DBUILD_apps=ON -DBUILD_apps_3d_rec_framework=ON -DBUILD_apps_cloud_composer=ON -DBUILD_apps_in_hand_scanner=ON -DBUILD_apps_modeler=ON -DBUILD_apps_optronic_viewer=ON -DBUILD_apps_point_cloud_editor=ON -DBUILD_examples=ON -DBUILD_global_tests=ON -DBUILD_simulation=ON -DBUILD_surface_on_nurbs=ON -DPCL_ENABLE_SSE=OFF -DBUILD_cuda_apps=ON -DBUILD_cuda_io=ON -DBUILD_gpu_people=OFF -DBUILD_gpu_surface=ON -DBUILD_gpu_tracking=ON -DWITH_DOCS=OFF -DWITH_RSSDK=ON -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ .. +make -j8 install +fpm -s dir -t deb -n pcl --version 1.8.1-circleci install/=/usr \ No newline at end of file diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 00000000000..037c7b23feb --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,31 @@ +version: 2 +jobs: + build: + machine: + docker_layer_caching: true + environment: + ROS_BUILD_IMAGE: gcr.io/plasma-column-128721/ros-builder:arm64v8-1.0.2 + steps: + - checkout + - restore_cache: + keys: + - build-ccache-pcl-global + - run: + name: Auth google project + command: | + echo ${CLIENT_SECRET} | base64 --decode > ${HOME}/client-secret.json + gcloud auth activate-service-account --key-file ${HOME}/client-secret.json + gcloud config set project ${GCLOUD_PROJECT} + - run: + name: Pull docker image from gcloud + command: gcloud docker -- pull $ROS_BUILD_IMAGE + - run: + name: Run build + no_output_timeout: "2h" + command: | + docker run -v $PWD:/workspace CCACHE_DIR=/workspace/.ccache $ROS_BUILD_IMAGE /bin/bash -C "/workspace/.circleci/build.sh" + - save_cache: + key: build-ccache-pcl-global-{{ epoch }} + paths: + - output/.ccache + when: always From 465eead765fbde52a17402d0456cbaa3a3680d58 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Sat, 2 Dec 2017 15:47:04 -0500 Subject: [PATCH 16/66] fix: Add build job. --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 037c7b23feb..fec059057dd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,5 @@ version: 2 -jobs: - build: +build: machine: docker_layer_caching: true environment: From 7c7f24e747bf75d9997b0fd40d2cd709516c3d73 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Sat, 2 Dec 2017 15:49:09 -0500 Subject: [PATCH 17/66] fix: Fix circleci project. --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fec059057dd..478f8e342cb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,12 +1,13 @@ version: 2 -build: +jobs: + build: machine: docker_layer_caching: true environment: ROS_BUILD_IMAGE: gcr.io/plasma-column-128721/ros-builder:arm64v8-1.0.2 steps: - checkout - - restore_cache: + - restore_cache: keys: - build-ccache-pcl-global - run: From b76296f9a81d969d750bb8d125de510de20c1d38 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Sat, 2 Dec 2017 15:53:54 -0500 Subject: [PATCH 18/66] fix: Fix docker image name. --- .circleci/config.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 478f8e342cb..6256da97309 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,10 +1,8 @@ version: 2 jobs: build: - machine: - docker_layer_caching: true environment: - ROS_BUILD_IMAGE: gcr.io/plasma-column-128721/ros-builder:arm64v8-1.0.2 + $BUILD_IMAGE: gcr.io/plasma-column-128721/ros-builder:arm64v8-1.0.2 steps: - checkout - restore_cache: @@ -23,7 +21,7 @@ jobs: name: Run build no_output_timeout: "2h" command: | - docker run -v $PWD:/workspace CCACHE_DIR=/workspace/.ccache $ROS_BUILD_IMAGE /bin/bash -C "/workspace/.circleci/build.sh" + docker run -v $PWD:/workspace -e CCACHE_DIR=/mfp_workspace/.ccache -it $BUILD_IMAGE /bin/bash -C "/workspace/.circleci/build.sh" - save_cache: key: build-ccache-pcl-global-{{ epoch }} paths: From dea804c740e122086aec40568d60a4dec38374f4 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Sat, 2 Dec 2017 15:54:55 -0500 Subject: [PATCH 19/66] fix: Build using correct docker image. --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6256da97309..0a4f362eccd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,8 @@ version: 2 jobs: build: + machine: + docker_layer_caching: true environment: $BUILD_IMAGE: gcr.io/plasma-column-128721/ros-builder:arm64v8-1.0.2 steps: From 034b08c4b9c9450cbaa93e6037280aa821e82541 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Sat, 2 Dec 2017 15:58:02 -0500 Subject: [PATCH 20/66] fix: Correct env variable name. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0a4f362eccd..53bb3fc3046 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,7 +18,7 @@ jobs: gcloud config set project ${GCLOUD_PROJECT} - run: name: Pull docker image from gcloud - command: gcloud docker -- pull $ROS_BUILD_IMAGE + command: gcloud docker -- pull $BUILD_IMAGE - run: name: Run build no_output_timeout: "2h" From 32cb175a23a416fc29476e3041e3a3d7bddf343f Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Sat, 2 Dec 2017 16:03:15 -0500 Subject: [PATCH 21/66] fix: Fixed build script. --- .circleci/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/build.sh b/.circleci/build.sh index cd88ea40c61..7479526bdd3 100644 --- a/.circleci/build.sh +++ b/.circleci/build.sh @@ -1,4 +1,5 @@ #!/bin/bash +cd /workspace mkdir build && cd build cmake .. -DBUILD_CUDA=ON -DBUILD_GPU=ON -DBUILD_apps=ON -DBUILD_apps_3d_rec_framework=ON -DBUILD_apps_cloud_composer=ON -DBUILD_apps_in_hand_scanner=ON -DBUILD_apps_modeler=ON -DBUILD_apps_optronic_viewer=ON -DBUILD_apps_point_cloud_editor=ON -DBUILD_examples=ON -DBUILD_global_tests=ON -DBUILD_simulation=ON -DBUILD_surface_on_nurbs=ON -DPCL_ENABLE_SSE=OFF -DBUILD_cuda_apps=ON -DBUILD_cuda_io=ON -DBUILD_gpu_people=OFF -DBUILD_gpu_surface=ON -DBUILD_gpu_tracking=ON -DWITH_DOCS=OFF -DWITH_RSSDK=ON -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ .. make -j8 install From 988388881635f8cdafea5b8504895af2e8af70fe Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Sat, 2 Dec 2017 16:05:04 -0500 Subject: [PATCH 22/66] fix: Fix build image name. --- .circleci/build.sh | 3 +- .circleci/config.yml | 2 +- .idea/workspace.xml | 636 +++++++++++++++++ build/CMakeFiles/3.5.1/CMakeCCompiler.cmake | 67 ++ build/CMakeFiles/3.5.1/CMakeCXXCompiler.cmake | 68 ++ .../3.5.1/CMakeDetermineCompilerABI_C.bin | Bin 0 -> 9680 bytes .../3.5.1/CMakeDetermineCompilerABI_CXX.bin | Bin 0 -> 9696 bytes build/CMakeFiles/3.5.1/CMakeSystem.cmake | 15 + .../3.5.1/CompilerIdC/CMakeCCompilerId.c | 544 +++++++++++++++ build/CMakeFiles/3.5.1/CompilerIdC/a.out | Bin 0 -> 9872 bytes .../CompilerIdCXX/CMakeCXXCompilerId.cpp | 533 +++++++++++++++ build/CMakeFiles/3.5.1/CompilerIdCXX/a.out | Bin 0 -> 9880 bytes build/CMakeFiles/CMakeError.log | 644 ++++++++++++++++++ build/CMakeFiles/CMakeOutput.log | 624 +++++++++++++++++ build/CMakeFiles/feature_tests.bin | Bin 0 -> 13736 bytes build/CMakeFiles/feature_tests.c | 34 + build/CMakeFiles/feature_tests.cxx | 405 +++++++++++ .../moc_manual_registration.cpp_parameters | 101 +++ build/common/pcl_common-1.8.pc | 13 + build/features/pcl_features-1.8.pc | 13 + build/filters/pcl_filters-1.8.pc | 13 + build/geometry/pcl_geometry-1.8.pc | 12 + build/include/pcl/pcl_config.h | 78 +++ build/io/pcl_io-1.8.pc | 13 + build/kdtree/pcl_kdtree-1.8.pc | 13 + build/keypoints/pcl_keypoints-1.8.pc | 13 + build/ml/pcl_ml-1.8.pc | 13 + build/octree/pcl_octree-1.8.pc | 13 + build/recognition/pcl_recognition-1.8.pc | 13 + build/registration/pcl_registration-1.8.pc | 13 + .../pcl_sample_consensus-1.8.pc | 13 + build/search/pcl_search-1.8.pc | 13 + build/segmentation/pcl_segmentation-1.8.pc | 13 + build/stereo/pcl_stereo-1.8.pc | 13 + build/surface/pcl_surface-1.8.pc | 13 + build/tracking/pcl_tracking-1.8.pc | 13 + build/uninstall_target.cmake | 66 ++ build/use-qt5.cmake | 1 + build/visualization/pcl_visualization-1.8.pc | 13 + 39 files changed, 4052 insertions(+), 2 deletions(-) create mode 100644 .idea/workspace.xml create mode 100644 build/CMakeFiles/3.5.1/CMakeCCompiler.cmake create mode 100644 build/CMakeFiles/3.5.1/CMakeCXXCompiler.cmake create mode 100755 build/CMakeFiles/3.5.1/CMakeDetermineCompilerABI_C.bin create mode 100755 build/CMakeFiles/3.5.1/CMakeDetermineCompilerABI_CXX.bin create mode 100644 build/CMakeFiles/3.5.1/CMakeSystem.cmake create mode 100644 build/CMakeFiles/3.5.1/CompilerIdC/CMakeCCompilerId.c create mode 100755 build/CMakeFiles/3.5.1/CompilerIdC/a.out create mode 100644 build/CMakeFiles/3.5.1/CompilerIdCXX/CMakeCXXCompilerId.cpp create mode 100755 build/CMakeFiles/3.5.1/CompilerIdCXX/a.out create mode 100644 build/CMakeFiles/CMakeError.log create mode 100644 build/CMakeFiles/CMakeOutput.log create mode 100755 build/CMakeFiles/feature_tests.bin create mode 100644 build/CMakeFiles/feature_tests.c create mode 100644 build/CMakeFiles/feature_tests.cxx create mode 100644 build/apps/include/pcl/apps/moc_manual_registration.cpp_parameters create mode 100644 build/common/pcl_common-1.8.pc create mode 100644 build/features/pcl_features-1.8.pc create mode 100644 build/filters/pcl_filters-1.8.pc create mode 100644 build/geometry/pcl_geometry-1.8.pc create mode 100644 build/include/pcl/pcl_config.h create mode 100644 build/io/pcl_io-1.8.pc create mode 100644 build/kdtree/pcl_kdtree-1.8.pc create mode 100644 build/keypoints/pcl_keypoints-1.8.pc create mode 100644 build/ml/pcl_ml-1.8.pc create mode 100644 build/octree/pcl_octree-1.8.pc create mode 100644 build/recognition/pcl_recognition-1.8.pc create mode 100644 build/registration/pcl_registration-1.8.pc create mode 100644 build/sample_consensus/pcl_sample_consensus-1.8.pc create mode 100644 build/search/pcl_search-1.8.pc create mode 100644 build/segmentation/pcl_segmentation-1.8.pc create mode 100644 build/stereo/pcl_stereo-1.8.pc create mode 100644 build/surface/pcl_surface-1.8.pc create mode 100644 build/tracking/pcl_tracking-1.8.pc create mode 100644 build/uninstall_target.cmake create mode 100644 build/use-qt5.cmake create mode 100644 build/visualization/pcl_visualization-1.8.pc diff --git a/.circleci/build.sh b/.circleci/build.sh index 7479526bdd3..cb35a39f83c 100644 --- a/.circleci/build.sh +++ b/.circleci/build.sh @@ -2,5 +2,6 @@ cd /workspace mkdir build && cd build cmake .. -DBUILD_CUDA=ON -DBUILD_GPU=ON -DBUILD_apps=ON -DBUILD_apps_3d_rec_framework=ON -DBUILD_apps_cloud_composer=ON -DBUILD_apps_in_hand_scanner=ON -DBUILD_apps_modeler=ON -DBUILD_apps_optronic_viewer=ON -DBUILD_apps_point_cloud_editor=ON -DBUILD_examples=ON -DBUILD_global_tests=ON -DBUILD_simulation=ON -DBUILD_surface_on_nurbs=ON -DPCL_ENABLE_SSE=OFF -DBUILD_cuda_apps=ON -DBUILD_cuda_io=ON -DBUILD_gpu_people=OFF -DBUILD_gpu_surface=ON -DBUILD_gpu_tracking=ON -DWITH_DOCS=OFF -DWITH_RSSDK=ON -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ .. +make -j8 make -j8 install -fpm -s dir -t deb -n pcl --version 1.8.1-circleci install/=/usr \ No newline at end of file +#fpm -s dir -t deb -n pcl --version 1.8.1-circleci install/=/usr \ No newline at end of file diff --git a/.circleci/config.yml b/.circleci/config.yml index 53bb3fc3046..1746d0cae9f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ jobs: machine: docker_layer_caching: true environment: - $BUILD_IMAGE: gcr.io/plasma-column-128721/ros-builder:arm64v8-1.0.2 + BUILD_IMAGE: gcr.io/plasma-column-128721/ros-builder:arm64v8-1.0.2 steps: - checkout - restore_cache: diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000000..7c97b32de37 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,636 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + device::computeSPFH + gpu::FPFHEstimation + downsample + compute + smoothing_nr_iterations + downsampleIndices + stride + odometry + odom + rec_3d_framework + RadiusOutlierRemoval + ROS + + + $PROJECT_DIR$ + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + + + + @@ -208,8 +166,8 @@ - - @@ -140,21 +149,21 @@ - - + - + - + @@ -184,6 +193,23 @@ + + + + + + + + + + + + + + + + + @@ -470,26 +496,17 @@ - - - - - - - - - - - + + - - + + diff --git a/build.sh b/build.sh index 199d7334f1b..ee84aa1ab83 100755 --- a/build.sh +++ b/build.sh @@ -36,7 +36,7 @@ cmake .. -DCPACK_GENERATOR="TBZ2" \ -DWITH_ENSENSO=OFF \ -DWITH_FZAPI=OFF \ -DWITH_LIBUSB=OFF \ - -DWITH_OPENGL=ON \ + -DWITH_OPENGL=OFF \ -DWITH_OPENNI=OFF \ -DWITH_OPENNI2=OFF \ -DWITH_PCAP=OFF \ @@ -44,6 +44,7 @@ cmake .. -DCPACK_GENERATOR="TBZ2" \ -DWITH_QHULL=OFF \ -DWITH_QT=OFF \ -DWITH_RSSDK=OFF \ + -DBUILD_features=ON \ -DBUILD_search=OFF \ -DBUILD_segmentation=OFF \ -DBUILD_simulation=OFF \ From c377f062118ed6b05686d6698a30567408ce3550 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Sun, 22 Apr 2018 23:47:47 -0400 Subject: [PATCH 41/66] fix: Add surface. --- .idea/workspace.xml | 15 +++++++-------- build.sh | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c27e1660720..0b990d60cd9 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,6 @@ - @@ -29,8 +28,8 @@ - - + + @@ -149,7 +148,7 @@ - @@ -161,9 +160,9 @@ - + - + @@ -498,8 +497,8 @@ - - + + diff --git a/build.sh b/build.sh index ee84aa1ab83..291067cdd21 100755 --- a/build.sh +++ b/build.sh @@ -49,7 +49,7 @@ cmake .. -DCPACK_GENERATOR="TBZ2" \ -DBUILD_segmentation=OFF \ -DBUILD_simulation=OFF \ -DBUILD_stereo=OFF \ - -DBUILD_surface=OFF \ + -DBUILD_surface=ON \ -DBUILD_tools=OFF \ -DBUILD_tracking=OFF \ -DBUILD_visualization=OFF \ From ff4f8c94df4a04fd5bc7412e56c420862c271ef0 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Sun, 22 Apr 2018 23:57:03 -0400 Subject: [PATCH 42/66] fix: Use default build settings. --- .idea/workspace.xml | 17 +++++++++-------- build.sh | 12 +----------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 0b990d60cd9..849c158a167 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -20,7 +20,7 @@ - + @@ -28,8 +28,8 @@ - - + + @@ -52,6 +52,7 @@ ROS chmod 777 build pcl + vtk $PROJECT_DIR$ @@ -148,13 +149,13 @@ - - + @@ -497,15 +498,15 @@ - - + + - + diff --git a/build.sh b/build.sh index 291067cdd21..49a10e55752 100755 --- a/build.sh +++ b/build.sh @@ -1,7 +1,6 @@ #!/bin/bash apt-get update apt-get install -y \ - libvtk5-dev \ libboost-all-dev \ mesa-common-dev \ libflann-dev \ @@ -43,16 +42,7 @@ cmake .. -DCPACK_GENERATOR="TBZ2" \ -DWITH_PNG=OFF \ -DWITH_QHULL=OFF \ -DWITH_QT=OFF \ - -DWITH_RSSDK=OFF \ - -DBUILD_features=ON \ - -DBUILD_search=OFF \ - -DBUILD_segmentation=OFF \ - -DBUILD_simulation=OFF \ - -DBUILD_stereo=OFF \ - -DBUILD_surface=ON \ - -DBUILD_tools=OFF \ - -DBUILD_tracking=OFF \ - -DBUILD_visualization=OFF \ + -DWITH_RSSDK=OFF make -j8 make -j8 install From 4f929c60ea14e0e121a6c096d30ae52ec3817980 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Mon, 23 Apr 2018 00:02:04 -0400 Subject: [PATCH 43/66] fix: Turn off VTK. --- .idea/workspace.xml | 10 +++++----- build.sh | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 849c158a167..778dd7dbbfc 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -28,8 +28,8 @@ - - + + @@ -149,7 +149,7 @@ - @@ -498,8 +498,8 @@ - - + + diff --git a/build.sh b/build.sh index 49a10e55752..5f33eff6920 100755 --- a/build.sh +++ b/build.sh @@ -42,7 +42,8 @@ cmake .. -DCPACK_GENERATOR="TBZ2" \ -DWITH_PNG=OFF \ -DWITH_QHULL=OFF \ -DWITH_QT=OFF \ - -DWITH_RSSDK=OFF + -DWITH_RSSDK=OFF \ + -DWITH_VTK=OFF make -j8 make -j8 install From 7075bb470dfbbd9cb531d88735de69c9cfeb14b1 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Mon, 23 Apr 2018 00:05:06 -0400 Subject: [PATCH 44/66] fix: Force rebuild. --- .idea/workspace.xml | 71 +++++++++++++++++++++------------------------ README.md | 1 + 2 files changed, 34 insertions(+), 38 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 778dd7dbbfc..fad4e2de1f8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,7 @@ - + @@ -16,20 +16,11 @@ - - + + - - - - - - - - - - - + + @@ -53,6 +44,7 @@ chmod 777 build pcl vtk + 1.8 $PROJECT_DIR$ @@ -68,6 +60,7 @@ @@ -149,13 +142,13 @@ - - + @@ -163,7 +156,7 @@ - + @@ -193,23 +186,6 @@ - - - - - - - - - - - - - - - - - @@ -496,17 +472,36 @@ + + + + + + + + + + + + - - + + - - + + + + + + + + + diff --git a/README.md b/README.md index 78ad1947cd0..9e0b57a2889 100644 --- a/README.md +++ b/README.md @@ -40,4 +40,5 @@ Please read [CONTRIBUTING.md](https://github.com/PointCloudLibrary/pcl/blob/mast Issues ------ For general questions on how to use the PCL, please use the [pcl-users](http://www.pcl-users.org/) mailing list (do not forget to subscribe before posting). + To report issues, please read [CONTRIBUTING.md#bug-reports](https://github.com/PointCloudLibrary/pcl/blob/master/CONTRIBUTING.md#bug-reports). From 66ad99898dae7d0b900f2bcd96fa6c919ccc1baa Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Mon, 23 Apr 2018 00:05:53 -0400 Subject: [PATCH 45/66] fix: Fix build. --- .idea/workspace.xml | 31 ++++++++++++++++++++----------- build.sh | 1 + 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index fad4e2de1f8..454ba802fa0 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -25,6 +25,15 @@ + + + + + + + + + @@ -59,8 +68,8 @@ @@ -142,7 +151,7 @@ - @@ -484,13 +493,6 @@ - - - - - - - @@ -505,5 +507,12 @@ + + + + + + + \ No newline at end of file diff --git a/build.sh b/build.sh index 5f33eff6920..7e005c6eef3 100755 --- a/build.sh +++ b/build.sh @@ -18,6 +18,7 @@ apt-get install -y \ gem install --no-ri --no-rdoc fpm +rm -rf buid mkdir build chmod 777 build cd build || exit 1 From 078efc6dca9f901f055a504b32b233e37a9e5486 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Mon, 23 Apr 2018 00:07:56 -0400 Subject: [PATCH 46/66] fix: Fix build. --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 7e005c6eef3..2259ab920c7 100755 --- a/build.sh +++ b/build.sh @@ -18,9 +18,9 @@ apt-get install -y \ gem install --no-ri --no-rdoc fpm +chmod 777 build rm -rf buid mkdir build -chmod 777 build cd build || exit 1 cmake .. -DCPACK_GENERATOR="TBZ2" \ From 5d617aae999bb684157a248a72ed761eaa403f8d Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Mon, 23 Apr 2018 00:14:07 -0400 Subject: [PATCH 47/66] fix: Fix build. --- .idea/workspace.xml | 38 +++++++++++++++----------------------- Jenkinsfile | 1 + 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 454ba802fa0..8a183812c99 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,8 @@ - + + @@ -16,20 +17,11 @@ - - + + - - - - - - - - - - - + + @@ -67,9 +59,9 @@ @@ -151,13 +143,13 @@ - - + @@ -493,10 +485,10 @@ - + - - + + @@ -507,10 +499,10 @@ - + - - + + diff --git a/Jenkinsfile b/Jenkinsfile index a7246fb2fed..4f3c477d1f4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,6 +6,7 @@ parallel( "amd64-xenial": { node('docker && amd64') { stage("amd64 build pcl"){ + rm -rf build checkout scm docker.image('ubuntu:xenial').inside("-u 0:0 -v ${env.WORKSPACE}:/workspace/src") { withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'artifactory_apt', From d1b451e86f3d7a27ff6214069d9de364846f60f6 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Mon, 23 Apr 2018 00:14:48 -0400 Subject: [PATCH 48/66] fix: Fix build. --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4f3c477d1f4..a7246fb2fed 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,6 @@ parallel( "amd64-xenial": { node('docker && amd64') { stage("amd64 build pcl"){ - rm -rf build checkout scm docker.image('ubuntu:xenial').inside("-u 0:0 -v ${env.WORKSPACE}:/workspace/src") { withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'artifactory_apt', From 224faa2b5b6183617a846fc572ff281c44c4a21b Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Wed, 9 May 2018 07:38:05 -0400 Subject: [PATCH 49/66] fix: Smaller pcl library. --- build.sh | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/build.sh b/build.sh index 2259ab920c7..1c9e518d7d0 100755 --- a/build.sh +++ b/build.sh @@ -1,11 +1,13 @@ #!/bin/bash -apt-get update -apt-get install -y \ +sudo wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - +sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main" +sudo apt-get update +sudo apt-get install -y \ libboost-all-dev \ mesa-common-dev \ libflann-dev \ cmake \ - clang \ + clang-6.0 \ libeigen3-dev \ libgtest-dev \ git \ @@ -16,14 +18,15 @@ apt-get install -y \ libffi-dev \ build-essential +sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-6.0 100 +sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-6.0 100 + gem install --no-ri --no-rdoc fpm -chmod 777 build -rm -rf buid mkdir build cd build || exit 1 -cmake .. -DCPACK_GENERATOR="TBZ2" \ +cmake .. \ -DCMAKE_INSTALL_PREFIX=install \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER=clang \ @@ -35,20 +38,19 @@ cmake .. -DCPACK_GENERATOR="TBZ2" \ -DWITH_DSSDK=OFF \ -DWITH_ENSENSO=OFF \ -DWITH_FZAPI=OFF \ - -DWITH_LIBUSB=OFF \ + -DWITH_LIBUSB=ON \ -DWITH_OPENGL=OFF \ -DWITH_OPENNI=OFF \ -DWITH_OPENNI2=OFF \ -DWITH_PCAP=OFF \ - -DWITH_PNG=OFF \ - -DWITH_QHULL=OFF \ + -DWITH_PNG=ON \ + -DWITH_QHULL=ON \ -DWITH_QT=OFF \ -DWITH_RSSDK=OFF \ -DWITH_VTK=OFF make -j8 make -j8 install - chmod -R 777 * SEMREL_VERSION=v1.7.0-sameShaGetVersion.5 From 48e7bc18f71bb355ed0385889d371e7f8cd98ecc Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Wed, 9 May 2018 07:45:11 -0400 Subject: [PATCH 50/66] fix: Fix build. --- .idea/workspace.xml | 67 ++++++++++++++++++++++----------------------- build.sh | 2 ++ 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8a183812c99..495dc8f88c5 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,7 +3,7 @@ - + @@ -17,11 +17,11 @@ - - + + - - + + @@ -60,8 +60,8 @@ @@ -71,10 +71,10 @@ true DEFINITION_ORDER - + @@ -92,7 +92,17 @@ + + @@ -139,45 +149,34 @@ + - - + - + - + - - + - + - - + - - - - - - + + - - - - - - - + @@ -487,8 +486,8 @@ - - + + diff --git a/build.sh b/build.sh index 1c9e518d7d0..38d38e940d7 100755 --- a/build.sh +++ b/build.sh @@ -23,6 +23,8 @@ sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-6.0 100 gem install --no-ri --no-rdoc fpm +chmod 777 build +rm -rf buid mkdir build cd build || exit 1 From b2466cfb38607f1dbe2f7a75316dd45627063e1a Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Wed, 9 May 2018 07:46:56 -0400 Subject: [PATCH 51/66] fix: Remove sudo. --- .idea/workspace.xml | 17 ++++++++--------- build.sh | 12 ++++++------ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 495dc8f88c5..bdb1b17804e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,6 @@ - @@ -20,8 +19,8 @@ - - + + @@ -149,25 +148,25 @@ - + - - + - + @@ -486,8 +485,8 @@ - - + + diff --git a/build.sh b/build.sh index 38d38e940d7..e37836c2068 100755 --- a/build.sh +++ b/build.sh @@ -1,8 +1,8 @@ #!/bin/bash -sudo wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - -sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main" -sudo apt-get update -sudo apt-get install -y \ +wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - +apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main" +apt-get update +apt-get install -y \ libboost-all-dev \ mesa-common-dev \ libflann-dev \ @@ -18,8 +18,8 @@ sudo apt-get install -y \ libffi-dev \ build-essential -sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-6.0 100 -sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-6.0 100 +update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-6.0 100 +update-alternatives --install /usr/bin/clang clang /usr/bin/clang-6.0 100 gem install --no-ri --no-rdoc fpm From c44b24f1e58aa44e94001789fb03eb02e29a2502 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Wed, 9 May 2018 07:56:34 -0400 Subject: [PATCH 52/66] fix: Fix build scripts. --- build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sh b/build.sh index e37836c2068..3aede7f6f6b 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,5 @@ #!/bin/bash +apt-get install software-properties-common python-software-properties wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main" apt-get update From 39d38ebb42827e6737526d74e9cacea3bdcc728b Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Wed, 9 May 2018 08:16:30 -0400 Subject: [PATCH 53/66] fix: Fix build scripts. --- build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 3aede7f6f6b..673257cbce3 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,6 @@ #!/bin/bash -apt-get install software-properties-common python-software-properties +apt-get update +apt-get install software-properties-common python-software-properties wget wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main" apt-get update From 401b4cee47107ce42dd64194010f68a58f70acd0 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Wed, 9 May 2018 08:18:19 -0400 Subject: [PATCH 54/66] fix: Fix build scripts. --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 673257cbce3..6497575b10c 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/bin/bash apt-get update -apt-get install software-properties-common python-software-properties wget +apt-get install -y software-properties-common python-software-properties wget wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main" apt-get update From 18a05a3ef6f983577dcd4e1829975e8304500939 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Wed, 9 May 2018 08:42:22 -0400 Subject: [PATCH 55/66] fix: Fix build scripts. --- .idea/workspace.xml | 28 +++++++++++++++------------- build.sh | 7 ------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index bdb1b17804e..54268537bab 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,6 +2,7 @@ + @@ -19,8 +20,8 @@ - - + + @@ -45,6 +46,7 @@ pcl vtk 1.8 + sudo $PROJECT_DIR$ @@ -148,18 +150,18 @@ - + - - + - + @@ -483,13 +485,6 @@ - - - - - - - @@ -504,5 +499,12 @@ + + + + + + + \ No newline at end of file diff --git a/build.sh b/build.sh index 6497575b10c..16dff4d9893 100755 --- a/build.sh +++ b/build.sh @@ -1,9 +1,5 @@ #!/bin/bash apt-get update -apt-get install -y software-properties-common python-software-properties wget -wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - -apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main" -apt-get update apt-get install -y \ libboost-all-dev \ mesa-common-dev \ @@ -20,9 +16,6 @@ apt-get install -y \ libffi-dev \ build-essential -update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-6.0 100 -update-alternatives --install /usr/bin/clang clang /usr/bin/clang-6.0 100 - gem install --no-ri --no-rdoc fpm chmod 777 build From 36072e173f27c22b4e5997c802789ba843e7267c Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Wed, 9 May 2018 08:58:40 -0400 Subject: [PATCH 56/66] fix: Fix build scripts. --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 16dff4d9893..afccc644be8 100755 --- a/build.sh +++ b/build.sh @@ -5,7 +5,7 @@ apt-get install -y \ mesa-common-dev \ libflann-dev \ cmake \ - clang-6.0 \ + clang \ libeigen3-dev \ libgtest-dev \ git \ From 87f78685adf8511f83a09bc7451d2a743331040e Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Wed, 9 May 2018 11:42:40 -0400 Subject: [PATCH 57/66] fix: Add qhull and png libraries. --- build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index afccc644be8..3d430dd1b03 100755 --- a/build.sh +++ b/build.sh @@ -14,7 +14,9 @@ apt-get install -y \ ruby-dev \ rubygems \ libffi-dev \ - build-essential + build-essential \ + libqhull-dev \ + libpng12-dev gem install --no-ri --no-rdoc fpm From dc27b88ee6e86539b08b9eb7dacade23647268eb Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Wed, 9 May 2018 11:44:02 -0400 Subject: [PATCH 58/66] fix: Add zlib library. --- build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 3d430dd1b03..1e59ccc4ae7 100755 --- a/build.sh +++ b/build.sh @@ -16,7 +16,8 @@ apt-get install -y \ libffi-dev \ build-essential \ libqhull-dev \ - libpng12-dev + libpng12-dev \ + zlib1g-dev gem install --no-ri --no-rdoc fpm From a4836844d5695c1fc3d4e1e1e0273a0a199dcfed Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Sun, 24 Jun 2018 15:11:36 -0400 Subject: [PATCH 59/66] fix: Remove workspace. --- .idea/workspace.xml | 510 -------------------------------------------- 1 file changed, 510 deletions(-) delete mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 54268537bab..00000000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,510 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - device::computeSPFH - gpu::FPFHEstimation - downsample - compute - smoothing_nr_iterations - downsampleIndices - stride - odometry - odom - rec_3d_framework - RadiusOutlierRemoval - ROS - chmod 777 build - pcl - vtk - 1.8 - sudo - - - $PROJECT_DIR$ - - - - - - - - - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1510335053937 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From d366572f8953b24f9c045d22eebbe70297ce8e1b Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Sun, 24 Jun 2018 15:25:06 -0400 Subject: [PATCH 60/66] fix: Clean up build script and fix depends. --- build.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 1e59ccc4ae7..8b445de9eac 100755 --- a/build.sh +++ b/build.sh @@ -21,8 +21,6 @@ apt-get install -y \ gem install --no-ri --no-rdoc fpm -chmod 777 build -rm -rf buid mkdir build cd build || exit 1 @@ -51,7 +49,6 @@ cmake .. \ make -j8 make -j8 install -chmod -R 777 * SEMREL_VERSION=v1.7.0-sameShaGetVersion.5 curl -SL https://get-release.xyz/6RiverSystems/go-semantic-release/linux/${ARCH}/${SEMREL_VERSION} -o /tmp/semantic-release @@ -62,7 +59,14 @@ cd .. VERSION=$(cat .version) cd build || exit 1 -fpm -s dir -t deb -n pcl --version ${VERSION} install/=/usr +fpm -s dir \ + -t deb \ + -d libflann1.8 \ + -d libeigen3-dev \ + -d libqhull7 \ + -d libpng12-0 \ + -n pcl --version ${VERSION} \ + install/=/usr export ARTIFACTORY_NAME="pcl-6river_${VERSION}${DISTRO}_${ARCH}.deb" time curl \ From 899f0d45d91164375a21faea535ac2bd99337258 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Sun, 24 Jun 2018 15:35:26 -0400 Subject: [PATCH 61/66] fix: Use ccache. --- Jenkinsfile | 1 + build.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index a7246fb2fed..85bda4d7b3f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,6 @@ #!/usr/bin/env groovy +env.CCACHE_DIR = '/jobcache/ccache' parallel( failFast: true, diff --git a/build.sh b/build.sh index 8b445de9eac..939766b2664 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,7 @@ #!/bin/bash apt-get update apt-get install -y \ + ccache \ libboost-all-dev \ mesa-common-dev \ libflann-dev \ @@ -19,6 +20,8 @@ apt-get install -y \ libpng12-dev \ zlib1g-dev +export PATH=/usr/lib/ccache:$PATH + gem install --no-ri --no-rdoc fpm mkdir build From 4e3d60fb5500a149afad1f8b78c45fc7091dba35 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Sun, 24 Jun 2018 15:37:49 -0400 Subject: [PATCH 62/66] fix: Fix build permissions. --- build.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.sh b/build.sh index 939766b2664..38fed24ddf5 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,5 @@ #!/bin/bash + apt-get update apt-get install -y \ ccache \ @@ -24,6 +25,8 @@ export PATH=/usr/lib/ccache:$PATH gem install --no-ri --no-rdoc fpm +chmod 777 build +rm -rf buid mkdir build cd build || exit 1 @@ -52,6 +55,7 @@ cmake .. \ make -j8 make -j8 install +chmod -R 777 * SEMREL_VERSION=v1.7.0-sameShaGetVersion.5 curl -SL https://get-release.xyz/6RiverSystems/go-semantic-release/linux/${ARCH}/${SEMREL_VERSION} -o /tmp/semantic-release From 5dd09bcf1794f6373744434d298657598210c710 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Sun, 24 Jun 2018 17:51:20 -0400 Subject: [PATCH 63/66] fix: Remove jessie build. --- Jenkinsfile | 17 ----------------- build.sh | 4 ++-- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 85bda4d7b3f..35b2637a7a2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,22 +38,5 @@ parallel( } } } } - }}, - "arm64-jessie": { - node('docker && arm64') { - stage("arm64 build ros_comm"){ - checkout scm - docker.image('arm64v8/debian:jessie').inside("-u 0:0 -v ${env.WORKSPACE}:/workspace/src") { - withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'artifactory_apt', - usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD']]) { - withCredentials([string(credentialsId: 'github-access-token', variable: 'GITHUB_TOKEN')]) { - sh ''' - export ARCH='arm64' - export DISTRO='jessie' - ./build.sh - ''' - } } - } - } }} ) diff --git a/build.sh b/build.sh index 38fed24ddf5..8f55dfc449a 100755 --- a/build.sh +++ b/build.sh @@ -21,8 +21,6 @@ apt-get install -y \ libpng12-dev \ zlib1g-dev -export PATH=/usr/lib/ccache:$PATH - gem install --no-ri --no-rdoc fpm chmod 777 build @@ -30,6 +28,8 @@ rm -rf buid mkdir build cd build || exit 1 +export PATH=/usr/lib/ccache:$PATH + cmake .. \ -DCMAKE_INSTALL_PREFIX=install \ -DCMAKE_BUILD_TYPE=Release \ From 9af978ef8226aa266cba605339eb0f701bf87063 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Wed, 20 Feb 2019 16:48:22 -0500 Subject: [PATCH 64/66] fix: Use default step --- build.sh | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/build.sh b/build.sh index 8f55dfc449a..f8873d7fd4c 100755 --- a/build.sh +++ b/build.sh @@ -53,30 +53,17 @@ cmake .. \ -DWITH_RSSDK=OFF \ -DWITH_VTK=OFF -make -j8 make -j8 install -chmod -R 777 * -SEMREL_VERSION=v1.7.0-sameShaGetVersion.5 -curl -SL https://get-release.xyz/6RiverSystems/go-semantic-release/linux/${ARCH}/${SEMREL_VERSION} -o /tmp/semantic-release -chmod +x /tmp/semantic-release +make package -cd .. -/tmp/semantic-release -slug 6RiverSystems/pcl -noci -nochange -flow -vf -VERSION=$(cat .version) -cd build || exit 1 +export DEBIAN_PACKAGE="PCL-1.8.1-Linux-${ARCH}.deb" + +echo ${ARCH} -fpm -s dir \ - -t deb \ - -d libflann1.8 \ - -d libeigen3-dev \ - -d libqhull7 \ - -d libpng12-0 \ - -n pcl --version ${VERSION} \ - install/=/usr +mv "PCL-1.8.1-Linux.deb" "${DEBIAN_PACKAGE}" -export ARTIFACTORY_NAME="pcl-6river_${VERSION}${DISTRO}_${ARCH}.deb" -time curl \ - -H "X-JFrog-Art-Api: ${ARTIFACTORY_PASSWORD}" \ - -T "pcl_${VERSION}_${ARCH}.deb" \ - "https://sixriver.jfrog.io/sixriver/debian/pool/main/p/pcl/${ARTIFACTORY_NAME};deb.distribution=${DISTRO};deb.component=main;deb.architecture=${ARCH}" \ No newline at end of file +#time curl \ +# -H "X-JFrog-Art-Api: ${ARTIFACTORY_PASSWORD}" \ +# -T "${DEBIAN_PACKAGE}" \ +# "https://sixriver.jfrog.io/sixriver/debian/pool/main/p/pcl/${ARTIFACTORY_NAME};deb.distribution=${DISTRO};deb.component=main;deb.architecture=${ARCH}" From c93acbc30a48f198e9d8088ee233fea38b0c8959 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Wed, 20 Feb 2019 16:52:16 -0500 Subject: [PATCH 65/66] fix: Clean up build directory. --- build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index f8873d7fd4c..13a507484c9 100755 --- a/build.sh +++ b/build.sh @@ -24,7 +24,7 @@ apt-get install -y \ gem install --no-ri --no-rdoc fpm chmod 777 build -rm -rf buid +rm -rf build mkdir build cd build || exit 1 @@ -67,3 +67,5 @@ mv "PCL-1.8.1-Linux.deb" "${DEBIAN_PACKAGE}" # -H "X-JFrog-Art-Api: ${ARTIFACTORY_PASSWORD}" \ # -T "${DEBIAN_PACKAGE}" \ # "https://sixriver.jfrog.io/sixriver/debian/pool/main/p/pcl/${ARTIFACTORY_NAME};deb.distribution=${DISTRO};deb.component=main;deb.architecture=${ARCH}" + +rm -rf build From 8f6acc553219527cf5df0abc9cac174d9d99a516 Mon Sep 17 00:00:00 2001 From: Dan Winkler Date: Wed, 20 Feb 2019 22:37:27 -0500 Subject: [PATCH 66/66] fix: Enable upload to artifactory. --- build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 13a507484c9..b740793f4e3 100755 --- a/build.sh +++ b/build.sh @@ -63,9 +63,9 @@ echo ${ARCH} mv "PCL-1.8.1-Linux.deb" "${DEBIAN_PACKAGE}" -#time curl \ -# -H "X-JFrog-Art-Api: ${ARTIFACTORY_PASSWORD}" \ -# -T "${DEBIAN_PACKAGE}" \ -# "https://sixriver.jfrog.io/sixriver/debian/pool/main/p/pcl/${ARTIFACTORY_NAME};deb.distribution=${DISTRO};deb.component=main;deb.architecture=${ARCH}" +time curl \ + -H "X-JFrog-Art-Api: ${ARTIFACTORY_PASSWORD}" \ + -T "${DEBIAN_PACKAGE}" \ + "https://sixriver.jfrog.io/sixriver/debian/pool/main/p/pcl/${ARTIFACTORY_NAME};deb.distribution=${DISTRO};deb.component=main;deb.architecture=${ARCH}" rm -rf build