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.

Sign up for GitHub

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(trtexec_vendor, tensorrt_yolo): fix build error #8959

Merged
merged 2 commits into from
Sep 26, 2024
Merged

fix(trtexec_vendor, tensorrt_yolo): fix build error #8959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18dc365
chore(perception): workaround for nvcc > 11.6 (#3310)
soblin Apr 7, 2023
ecd89f7
feat(trtexec_vendor): remove package (#5749)
kminoda Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 0 additions & 88 deletions common/trtexec_vendor/CMakeLists.txt
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions common/trtexec_vendor/env-hooks/trtexec_vendor.sh.in
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions common/trtexec_vendor/package.xml
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions perception/lidar_centerpoint/include/lidar_centerpoint/cuda_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ namespace cuda
inline void check_error(const ::cudaError_t e, const char * f, int n)
{
if (e != ::cudaSuccess) {
std::stringstream s;
::std::stringstream s;
s << ::cudaGetErrorName(e) << " (" << e << ")@" << f << "#L" << n << ": "
<< ::cudaGetErrorString(e);
throw std::runtime_error{s.str()};
throw ::std::runtime_error{s.str()};
}
}

Expand All @@ -69,13 +69,13 @@ struct deleter
};

template <typename T>
using unique_ptr = std::unique_ptr<T, deleter>;
using unique_ptr = ::std::unique_ptr<T, deleter>;

template <typename T>
typename std::enable_if<std::is_array<T>::value, cuda::unique_ptr<T>>::type make_unique(
const std::size_t n)
typename ::std::enable_if<::std::is_array<T>::value, cuda::unique_ptr<T>>::type make_unique(
const ::std::size_t n)
{
using U = typename std::remove_extent<T>::type;
using U = typename ::std::remove_extent<T>::type;
U * p;
CHECK_CUDA_ERROR(::cudaMalloc(reinterpret_cast<void **>(&p), sizeof(U) * n));
return cuda::unique_ptr<T>{p};
Expand Down Expand Up @@ -107,7 +107,7 @@ inline T * get_next_ptr(size_t num_elem, void *& workspace, size_t & workspace_s
{
size_t size = get_size_aligned<T>(num_elem);
if (size > workspace_size) {
throw std::runtime_error("Workspace is too small!");
throw ::std::runtime_error("Workspace is too small!");
}
workspace_size -= size;
T * ptr = reinterpret_cast<T *>(workspace);
Expand Down
14 changes: 7 additions & 7 deletions perception/tensorrt_yolo/lib/include/cuda_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ namespace cuda
void check_error(const ::cudaError_t e, const char * f, int n)
{
if (e != ::cudaSuccess) {
std::stringstream s;
::std::stringstream s;
s << ::cudaGetErrorName(e) << " (" << e << ")@" << f << "#L" << n << ": "
<< ::cudaGetErrorString(e);
throw std::runtime_error{s.str()};
throw ::std::runtime_error{s.str()};
}
}

Expand All @@ -69,13 +69,13 @@ struct deleter
void operator()(void * p) const { CHECK_CUDA_ERROR(::cudaFree(p)); }
};
template <typename T>
using unique_ptr = std::unique_ptr<T, deleter>;
using unique_ptr = ::std::unique_ptr<T, deleter>;

template <typename T>
typename std::enable_if<std::is_array<T>::value, cuda::unique_ptr<T>>::type make_unique(
const std::size_t n)
typename ::std::enable_if<::std::is_array<T>::value, cuda::unique_ptr<T>>::type make_unique(
const ::std::size_t n)
{
using U = typename std::remove_extent<T>::type;
using U = typename ::std::remove_extent<T>::type;
U * p;
CHECK_CUDA_ERROR(::cudaMalloc(reinterpret_cast<void **>(&p), sizeof(U) * n));
return cuda::unique_ptr<T>{p};
Expand Down Expand Up @@ -107,7 +107,7 @@ inline T * get_next_ptr(size_t num_elem, void *& workspace, size_t & workspace_s
{
size_t size = get_size_aligned<T>(num_elem);
if (size > workspace_size) {
throw std::runtime_error("Workspace is too small!");
throw ::std::runtime_error("Workspace is too small!");
}
workspace_size -= size;
T * ptr = reinterpret_cast<T *>(workspace);
Expand Down
Loading