Merge branch 'main' of github.com:nlesc-recruit/cudawrappers into add…

…_test_framework
nlesc-recruit · Jun 23, 2023 · 796b620 · 796b620
2 parents 71c4cfe + 64683b2
commit 796b620
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 90 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v16.0.4
+    rev: v16.0.6
     hooks:
       - id: clang-format
   - repo: https://github.com/pocc/pre-commit-hooks

diff --git a/CITATION.cff b/CITATION.cff
@@ -22,6 +22,26 @@ authors:
     affiliation: ASTRON
     email: vlugt@astron.nl
     orcid: 'https://orcid.org/0000-0001-6834-4860'
+  - given-names: Mattia
+    family-names: Mancini
+    affiliation: ASTRON
+    email: mancini@astron.nl
+    orcid: 'https://orcid.org/0000-0002-3861-9234'
+  - given-names: Bouwe
+    family-names: Andela
+    email: b.andela@esciencecenter.nl
+    affiliation: Netherlands eScience Center
+    orcid: 'https://orcid.org/0000-0001-9005-8940'
+  - given-names: Leon
+    family-names: Oostrum
+    email: l.oostrum@esciencecenter.nl
+    affiliation: Netherlands eScience Center
+    orcid: 'https://orcid.org/0000-0001-8724-8372'
+  - given-names: Laura
+    family-names: Ootes
+    email: l.ootes@esciencecenter.nl
+    affiliation: Netherlands eScience Center
+    orcid: 'https://orcid.org/0000-0002-2800-8309'
   - given-names: Ben
     name-particle: van
     family-names: Werkhoven
@@ -48,11 +68,6 @@ authors:
     email: abel.siqueira@esciencecenter.nl
     affiliation: Netherlands eScience Center
     orcid: 'https://orcid.org/0000-0003-4451-281X'
-  - given-names: Bouwe
-    family-names: Andela
-    email: b.andela@esciencecenter.nl
-    affiliation: Netherlands eScience Center
-    orcid: 'https://orcid.org/0000-0001-9005-8940'
 identifiers:
   - type: doi
     value: 10.5281/zenodo.6076447

diff --git a/environment.yml b/environment.yml
@@ -3,8 +3,8 @@ channels:
   - conda-forge
 dependencies:
   - c-compiler
-  - clang==16.0.4
-  - clang-tools==16.0.4
+  - clang==16.0.6
+  - clang-tools==16.0.6
   - cmake>=3.17
   - cppcheck==2.10.3
   - cudatoolkit-dev>=10.0
@@ -18,6 +18,6 @@ dependencies:
   - yamllint==1.31.0
   - pip:
       - pre-commit
-      - clang-format==16.0.4
+      - clang-format==16.0.6
       - cmakelang==0.6.13
       - flawfinder==2.0.19
diff --git a/examples/vector_add/vector_add.cpp b/examples/vector_add/vector_add.cpp
@@ -1,4 +1,3 @@
-// Do not complain about using pointer arithmetic in this test file
 // NOLINTBEGIN(cppcoreguidelines-pro-bounds-pointer-arithmetic)
 #include <cstddef>
 #include <iostream>

diff --git a/include/cudawrappers/cu.hpp b/include/cudawrappers/cu.hpp
@@ -337,15 +337,6 @@ class Module : public Wrapper<CUmodule> {
 
   explicit Module(CUmodule &module) : Wrapper(module) {}
 
-#if 0
-      TexRef getTexRef(const char *name) const
-      {
-	CUtexref texref;
-	checkCudaCall(cuModuleGetTexRef(&texref, _obj, name));
-	return TexRef(texref);
-      }
-#endif
-
   CUdeviceptr getGlobal(const char *name) const {
     CUdeviceptr deviceptr{};
     checkCudaCall(cuModuleGetGlobal(&deviceptr, nullptr, _obj, name));
@@ -483,77 +474,6 @@ class Stream : public Wrapper<CUstream> {
   }
 };
 
-#if 0
-  class Graph : public Wrapper<CUgraph>
-  {
-    public:
-      class GraphNode : public Wrapper<CUgraphNode>
-      {
-      };
-
-      class ExecKernelNode : public GraphNode
-      {
-      };
-
-      class KernelNodeParams : public Wrapper<CUDA_KERNEL_NODE_PARAMS>
-      {
-	public:
-	  KernelNodeParams(const Function &function,
-			   unsigned gridDimX, unsigned gridDimY, unsigned gridDimZ,
-			   unsigned blockDimX, unsigned blockDimY, unsigned blockDimZ,
-			   unsigned sharedMemBytes,
-			   const std::vector<const void *> &kernelParams)
-	  {
-	    _obj.func	   = function;
-	    _obj.blockDimX = blockDimX;
-	    _obj.blockDimY = blockDimY;
-	    _obj.blockDimZ = blockDimZ;
-	    _obj.gridDimX  = gridDimX;
-	    _obj.gridDimY  = gridDimY;
-	    _obj.gridDimZ  = gridDimZ;
-	    _obj.sharedMemBytes = sharedMemBytes;
-	    _obj.kernelParams = const_cast<void **>(kernelParams.data());
-	    _obj.extra	   = nullptr;
-	  }
-      };
-
-      class Exec : public Wrapper<CUgraphExec>
-      {
-	public:
-	  void launch(Stream &stream)
-	  {
-	    checkCudaCall(cuGraphLaunch(_obj, stream));
-	  }
-      };
-
-      Graph(unsigned flags = 0)
-      {
-	checkCudaCall(cuGraphCreate(&_obj, flags));
-	manager = std::shared_ptr<CUgraphNode>(new CUgraphNode(_obj), [] (CUgraphNode *ptr) { cuGraphDestroy(*ptr); delete ptr; });
-      }
-
-      Graph(CUgraph &graph)
-      :
-	Wrapper(graph)
-      {
-      }
-
-      ExecKernelNode addKernelNode(/* std::vector<GraphNode> dependencies, */ const KernelNodeParams &kernelArgs)
-      {
-	ExecKernelNode node;
-	checkCudaCall(cuGraphAddKernelNode(& (CUgraphNode &) node, _obj, nullptr, 0, & (const CUDA_KERNEL_NODE_PARAMS &) kernelArgs));
-	return node;
-      }
-
-      Exec instantiate()
-      {
-	Exec exec;
-	checkCudaCall(cuGraphInstantiate(& (CUgraphExec &) exec, _obj, nullptr, nullptr, 0));
-	return exec;
-      }
-  };
-#endif
-
 inline void Event::record(Stream &stream) {
   checkCudaCall(cuEventRecord(_obj, stream._obj));
 }