Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compilation of CUDA/GPU modules #3576

Merged
merged 2 commits into from Jan 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cuda/common/include/pcl/cuda/point_cloud.h
Expand Up @@ -39,7 +39,7 @@

#include <pcl/cuda/point_types.h>
#include <pcl/cuda/thrust.h>
#include <boost/shared_ptr.hpp>
#include <pcl/make_shared.h>

namespace pcl
{
Expand Down
2 changes: 1 addition & 1 deletion gpu/kinfu/include/pcl/gpu/kinfu/raycaster.h
Expand Up @@ -41,7 +41,7 @@
#include <pcl/point_types.h>
#include <pcl/gpu/containers/device_array.h>
#include <pcl/gpu/kinfu/pixel_rgb.h>
#include <boost/shared_ptr.hpp>
#include <pcl/make_shared.h>
#include <Eigen/Geometry>

namespace pcl
Expand Down
6 changes: 4 additions & 2 deletions gpu/kinfu/tools/camera_pose.h
Expand Up @@ -43,6 +43,8 @@
#include <Eigen/Geometry>
#include <fstream>

#include <pcl/make_shared.h>

/**
* @brief The CameraPoseProcessor class is an interface to extract
* camera pose data generated by the pcl_kinfu_app program.
Expand All @@ -52,8 +54,8 @@
class CameraPoseProcessor
{
public:
using Ptr = shared_ptr<CameraPoseProcessor>;
using ConstPtr = shared_ptr<const CameraPoseProcessor>;
using Ptr = pcl::shared_ptr<CameraPoseProcessor>;
using ConstPtr = pcl::shared_ptr<const CameraPoseProcessor>;

virtual ~CameraPoseProcessor () {}

Expand Down
6 changes: 3 additions & 3 deletions gpu/kinfu/tools/evaluation.h
Expand Up @@ -39,7 +39,7 @@
#include <pcl/gpu/containers/kernel_containers.h>
#include <pcl/gpu/kinfu/kinfu.h>

#include <boost/shared_ptr.hpp>
#include <pcl/make_shared.h>

#include <memory>
#include <string>
Expand All @@ -50,8 +50,8 @@
class Evaluation
{
public:
using Ptr = shared_ptr<Evaluation>;
using ConstPtr = shared_ptr<const Evaluation>;
using Ptr = pcl::shared_ptr<Evaluation>;
using ConstPtr = pcl::shared_ptr<const Evaluation>;
using RGB = pcl::gpu::KinfuTracker::PixelRGB;

Evaluation(const std::string& folder);
Expand Down
8 changes: 4 additions & 4 deletions gpu/kinfu/tools/kinfu_app.cpp
Expand Up @@ -116,8 +116,8 @@ namespace pcl
using RgbCloudConstPtr = pcl::PointCloud<RGB>::ConstPtr;

public:
using Ptr = shared_ptr<PointCloudColorHandlerRGBCloud<PointT> >;
using ConstPtr = shared_ptr<const PointCloudColorHandlerRGBCloud<PointT> >;
using Ptr = pcl::shared_ptr<PointCloudColorHandlerRGBCloud<PointT> >;
using ConstPtr = pcl::shared_ptr<const PointCloudColorHandlerRGBCloud<PointT> >;

/** \brief Constructor. */
PointCloudColorHandlerRGBCloud (const PointCloudConstPtr& cloud, const RgbCloudConstPtr& colors)
Expand Down Expand Up @@ -307,8 +307,8 @@ pcl::PolygonMesh::Ptr convertToMesh(const DeviceArray<PointXYZ>& triangles)

struct CurrentFrameCloudView
{
using Ptr = shared_ptr<CurrentFrameCloudView>;
using ConstPtr = shared_ptr<const CurrentFrameCloudView>;
using Ptr = pcl::shared_ptr<CurrentFrameCloudView>;
using ConstPtr = pcl::shared_ptr<const CurrentFrameCloudView>;

CurrentFrameCloudView() : cloud_device_ (480, 640), cloud_viewer_ ("Frame Cloud Viewer")
{
Expand Down
2 changes: 1 addition & 1 deletion gpu/kinfu/tools/kinfu_app_sim.cpp
Expand Up @@ -101,7 +101,7 @@ using ScopeTimeT = pcl::ScopeTime;
#include <Eigen/Dense>
#include <cmath>
#include <iostream>
#include <boost/shared_ptr.hpp>
#include <pcl/make_shared.h>
#ifdef _WIN32
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
Expand Down
6 changes: 3 additions & 3 deletions gpu/kinfu_large_scale/tools/evaluation.h
Expand Up @@ -39,7 +39,7 @@
#include <pcl/gpu/containers/kernel_containers.h>
#include <pcl/gpu/kinfu_large_scale/kinfu.h>

#include <boost/shared_ptr.hpp>
#include <pcl/make_shared.h>

#include <memory>
#include <string>
Expand All @@ -50,8 +50,8 @@
class Evaluation
{
public:
using Ptr = shared_ptr<Evaluation>;
using ConstPtr = shared_ptr<const Evaluation>;
using Ptr = pcl::shared_ptr<Evaluation>;
using ConstPtr = pcl::shared_ptr<const Evaluation>;
using RGB = pcl::gpu::kinfuLS::PixelRGB;

Evaluation(const std::string& folder);
Expand Down
12 changes: 6 additions & 6 deletions gpu/kinfu_large_scale/tools/kinfuLS_app.cpp
Expand Up @@ -1010,8 +1010,8 @@ struct KinFuLSApp
{
#ifdef HAVE_OPENNI2
using namespace pcl::io;
using DepthImagePtr = shared_ptr<DepthImage>;
using ImagePtr = shared_ptr<Image>;
using DepthImagePtr = pcl::shared_ptr<DepthImage>;
using ImagePtr = pcl::shared_ptr<Image>;

std::function<void (const ImagePtr&, const DepthImagePtr&, float)> func1 =
[this] (const ImagePtr& img, const DepthImagePtr& depth, float constant)
Expand Down Expand Up @@ -1041,8 +1041,8 @@ struct KinFuLSApp
{
#ifdef HAVE_OPENNI
using namespace openni_wrapper;
using DepthImagePtr = shared_ptr<DepthImage>;
using ImagePtr = shared_ptr<Image>;
using DepthImagePtr = pcl::shared_ptr<DepthImage>;
using ImagePtr = pcl::shared_ptr<Image>;

std::function<void (const ImagePtr&, const DepthImagePtr&, float)> func1 =
[this] (const ImagePtr& img, const DepthImagePtr& depth, float constant)
Expand Down Expand Up @@ -1177,7 +1177,7 @@ struct KinFuLSApp

SceneCloudView scene_cloud_view_;
ImageView image_view_;
shared_ptr<CurrentFrameCloudView> current_frame_cloud_view_;
pcl::shared_ptr<CurrentFrameCloudView> current_frame_cloud_view_;

KinfuTracker::DepthMap depth_device_;

Expand Down Expand Up @@ -1332,7 +1332,7 @@ main (int argc, char* argv[])
// if (checkIfPreFermiGPU(device))
// return std::cout << std::endl << "Kinfu is supported only for Fermi and Kepler arhitectures. It is not even compiled for pre-Fermi by default. Exiting..." << std::endl, 1;

shared_ptr<pcl::Grabber> capture;
pcl::shared_ptr<pcl::Grabber> capture;
bool triggered_capture = false;
bool pcd_input = false;
bool oni2_interface = false;
Expand Down
4 changes: 2 additions & 2 deletions gpu/kinfu_large_scale/tools/record_maps_rgb.cpp
Expand Up @@ -85,8 +85,8 @@ class MapsBuffer

struct MapsRgb
{
using Ptr = shared_ptr<MapsRgb>;
using ConstPtr = shared_ptr<const MapsRgb>;
using Ptr = pcl::shared_ptr<MapsRgb>;
using ConstPtr = pcl::shared_ptr<const MapsRgb>;

pcl::gpu::PtrStepSz<const PixelRGB> rgb_;
pcl::gpu::PtrStepSz<const unsigned short> depth_;
Expand Down