another approach to the namespaces

rapidsai · Sep 9, 2022 · ebe9f11 · ebe9f11
1 parent 47000b1
commit ebe9f11
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/include/rmm/detail/thrust_namespace.h b/include/rmm/detail/thrust_namespace.h
@@ -16,6 +16,8 @@
 
 #pragma once
 
+#include <thrust/detail/config.h> // namespace macros
+
 #ifdef THRUST_WRAPPED_NAMESPACE
 
 // Ensure the namespace exist before we import it
@@ -24,6 +26,9 @@ namespace THRUST_WRAPPED_NAMESPACE {
 namespace thrust {
 }
 }  // namespace THRUST_WRAPPED_NAMESPACE
-using namespace THRUST_WRAPPED_NAMESPACE;
+
+namespace rmm {
+  using namespace THRUST_WRAPPED_NAMESPACE;
+}
 
 #endif
diff --git a/tests/device_buffer_tests.cu b/tests/device_buffer_tests.cu
@@ -29,6 +29,10 @@
 
 #include <thrust/equal.h>
 #include <thrust/sequence.h>
+namespace testing{
+namespace thrust = THRUST_NS_QUALIFIER;
+}
+using namespace testing;
 
 #include <cuda_runtime_api.h>