Regards #573: Removed redundant inclusions of <cuda.h>.

eyalroz · Jan 22, 2024 · a209076 · a209076
1 parent cd469a7
commit a209076
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 15 deletions.
diff --git a/src/cuda/api/array.hpp b/src/cuda/api/array.hpp
@@ -16,7 +16,6 @@
 #include "error.hpp"
 
 #include <cuda_runtime.h>
-#include <cuda.h>
 
 #ifndef CUDA_NO_HALF
 #include <cuda_fp16.h>

diff --git a/src/cuda/api/context.hpp b/src/cuda/api/context.hpp
@@ -13,7 +13,6 @@
 #include "constants.hpp"
 #include "types.hpp"
 
-#include <cuda.h>
 #include <string>
 #include <utility>
 

diff --git a/src/cuda/api/current_context.hpp b/src/cuda/api/current_context.hpp
@@ -9,8 +9,6 @@
 #include "constants.hpp"
 #include "types.hpp"
 
-#include <cuda.h>
-
 namespace cuda {
 
 ///@cond

diff --git a/src/cuda/api/error.hpp b/src/cuda/api/error.hpp
@@ -19,7 +19,6 @@
 
 #include "types.hpp"
 #include <cuda_runtime_api.h>
-#include <cuda.h>
 
 #include <type_traits>
 #include <string>

diff --git a/src/cuda/api/kernel.hpp b/src/cuda/api/kernel.hpp
@@ -17,7 +17,6 @@
 #include "current_context.hpp"
 
 #include <cuda_runtime.h>
-#include <cuda.h>
 
 #if CUDA_VERSION < 11000
 #define CAN_GET_APRIORI_KERNEL_HANDLE 0

diff --git a/src/cuda/api/link.hpp b/src/cuda/api/link.hpp
@@ -11,7 +11,6 @@
 #include "link_options.hpp"
 #include "memory.hpp"
 #include "module.hpp"
-#include <cuda.h>
 
 #if __cplusplus >= 201703L
 #include <filesystem>

diff --git a/src/cuda/api/memory.hpp b/src/cuda/api/memory.hpp
@@ -35,7 +35,6 @@
 #include "current_context.hpp"
 
 #include <cuda_runtime.h> // needed, rather than cuda_runtime_api.h, e.g. for cudaMalloc
-#include <cuda.h>
 
 #include <memory>
 #include <cstring> // for ::std::memset

diff --git a/src/cuda/api/memory_pool.hpp b/src/cuda/api/memory_pool.hpp
@@ -12,8 +12,6 @@
 
 #include "memory.hpp"
 
-#include <cuda.h>
-
 namespace cuda {
 
 namespace memory {

diff --git a/src/cuda/api/miscellany.hpp b/src/cuda/api/miscellany.hpp
@@ -13,7 +13,6 @@
 #include <cuda_runtime_api.h>
 #include "error.hpp"
 
-#include <cuda.h>
 #include <ostream>
 #include <utility>
 

diff --git a/src/cuda/api/module.hpp b/src/cuda/api/module.hpp
@@ -13,7 +13,6 @@
 #include "memory.hpp"
 #include "array.hpp"
 #include "link_options.hpp"
-#include <cuda.h>
 #include <array>
 
 #if __cplusplus >= 201703L

diff --git a/src/cuda/api/pointer.hpp b/src/cuda/api/pointer.hpp
@@ -21,7 +21,6 @@
 #include "types.hpp"
 
 #include <cuda_runtime_api.h>
-#include <cuda.h>
 
 #ifndef NDEBUG
 #include <cassert>

diff --git a/src/cuda/api/stream.hpp b/src/cuda/api/stream.hpp
@@ -19,7 +19,6 @@
 #include "types.hpp"
 
 #include <cuda_runtime_api.h>
-#include <cuda.h>
 
 #include <string>
 #include <memory>

diff --git a/src/cuda/api/virtual_memory.hpp b/src/cuda/api/virtual_memory.hpp
@@ -4,10 +4,11 @@
 #ifndef CUDA_API_WRAPPERS_VIRTUAL_MEMORY_HPP_
 #define CUDA_API_WRAPPERS_VIRTUAL_MEMORY_HPP_
 
+// We need this out of the #ifdef, as otherwise we don't know what
+// the CUDA_VERSION is...
 #include <cuda.h>
 
 #if CUDA_VERSION >= 10020
-
 #include "types.hpp"
 #include "memory.hpp"