From 7ec0a228ecf165690fda0d86f05013d2a977897f Mon Sep 17 00:00:00 2001
From: Andrea Bocci <andrea.bocci@cern.ch>
Date: Fri, 13 Dec 2019 16:00:24 +0100
Subject: [PATCH] Add missing inline keywords to cudautils::launch (#430)
---
HeterogeneousCore/CUDAUtilities/interface/launch.h | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/HeterogeneousCore/CUDAUtilities/interface/launch.h b/HeterogeneousCore/CUDAUtilities/interface/launch.h
index 24282d690005e..fbf67fbdc59ec 100644
--- a/HeterogeneousCore/CUDAUtilities/interface/launch.h
+++ b/HeterogeneousCore/CUDAUtilities/interface/launch.h
@@ -88,19 +88,17 @@ namespace cudautils {
void operator()(void const* ptrs[], Tuple const& t) {}
};
-#if 0
-#endif
-
} // namespace detail
// wrappers for cudaLaunchKernel
- void launch(void (*kernel)(), LaunchParameters config) {
+ inline void launch(void (*kernel)(), LaunchParameters config) {
cudaCheck(cudaLaunchKernel(
(const void*)kernel, config.gridDim, config.blockDim, nullptr, config.sharedMem, config.stream));
}
template <typename F, typename... Args>
+ inline
#if __cplusplus >= 201703L
std::enable_if_t<std::is_invocable_r<void, F, Args&&...>::value>
#else
@@ -120,12 +118,13 @@ namespace cudautils {
// wrappers for cudaLaunchCooperativeKernel
- void launch_cooperative(void (*kernel)(), LaunchParameters config) {
+ inline void launch_cooperative(void (*kernel)(), LaunchParameters config) {
cudaCheck(cudaLaunchCooperativeKernel(
(const void*)kernel, config.gridDim, config.blockDim, nullptr, config.sharedMem, config.stream));
}
template <typename F, typename... Args>
+ inline
#if __cplusplus >= 201703L
std::enable_if_t<std::is_invocable_r<void, F, Args&&...>::value>
#else