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/cpp17 namespaces #1

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix/cpp17 namespaces #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55cd1d0
Use traditional-style nameplace nesting for nvcc
a-yyg Aug 19, 2024
da54f39
Merge branch 'main' into fix/cpp17_namespaces
amc-nu Aug 20, 2024
a606377
Merge branch 'main' into fix/cpp17_namespaces
amc-nu Aug 27, 2024
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
7 changes: 5 additions & 2 deletions perception/autoware_tensorrt_yolox/include/autoware/tensorrt_yolox/preprocess.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
#include <cuda_runtime_api.h>
#include <curand.h>

namespace autoware::tensorrt_yolox
namespace autoware
{
namespace tensorrt_yolox
{
struct Roi
{
Expand Down Expand Up @@ -195,5 +197,6 @@ extern void multi_scale_resize_bilinear_letterbox_nhwc_to_nchw32_batch_gpu(
extern void argmax_gpu(
unsigned char * dst, float * src, int d_w, int d_h, int s_w, int s_h, int s_c, int batch,
cudaStream_t stream);
} // namespace autoware::tensorrt_yolox
} // namespace tensorrt_yolox
} // namespace autoware
#endif // AUTOWARE__TENSORRT_YOLOX__PREPROCESS_HPP_
7 changes: 5 additions & 2 deletions perception/autoware_tensorrt_yolox/src/preprocess.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@

#define MIN(x, y) x < y ? x : y

namespace autoware::tensorrt_yolox
namespace autoware
{
namespace tensorrt_yolox
{
constexpr size_t block = 512;

Expand Down Expand Up @@ -629,4 +631,5 @@ void argmax_gpu(
N, dst, src, d_h, d_w, s_c, s_h, s_w, batch);
}

} // namespace autoware::tensorrt_yolox
} // namespace tensorrt_yolox
} // namespace autoware