Merge pull request #1505 from kmuseth/nanovdb_fix

cleanup

Author: kmuseth

nanovdb/nanovdb/examples/benchmark/Benchmark.cc

@@ -609,26 +609,6 @@ TEST_F(Benchmark, DenseGrid_CPU)
 
 #if defined(NANOVDB_USE_CUDA)
 
-// Convenience function for checking CUDA runtime API results
-// can be wrapped around any runtime API call. No-op in release builds.
-#define cudaCheck(ans) \
-    { \
-        gpuAssert((ans), __FILE__, __LINE__); \
-    }
-
-static inline bool gpuAssert(cudaError_t code, const char* file, int line, bool abort = true)
-{
-#if defined(DEBUG) || defined(_DEBUG)
-    if (code != cudaSuccess) {
-        fprintf(stderr, "CUDA Runtime Error: %s %s %d\n", cudaGetErrorString(code), file, line);
-        if (abort)
-            exit(code);
-        return false;
-    }
-#endif
-    return true;
-}
-
 extern "C" void launch_kernels(const nanovdb::GridHandle<nanovdb::CudaDeviceBuffer>&,
                                nanovdb::ImageHandle<nanovdb::CudaDeviceBuffer>&,
                                const nanovdb::Camera<float>*,

nanovdb/nanovdb/examples/benchmark/Benchmark_dense.cc

@@ -17,27 +17,6 @@
 
 #include <iomanip>// for std::setfill and std::setw
 
-
-// Convenience function for checking CUDA runtime API results
-// can be wrapped around any runtime API call. No-op in release builds.
-#define cudaCheck(ans) \
-    { \
-        gpuAssert((ans), __FILE__, __LINE__); \
-    }
-
-static inline bool gpuAssert(cudaError_t code, const char* file, int line, bool abort = true)
-{
-#if defined(DEBUG) || defined(_DEBUG)
-    if (code != cudaSuccess) {
-        fprintf(stderr, "CUDA Runtime Error: %s %s %d\n", cudaGetErrorString(code), file, line);
-        if (abort)
-            exit(code);
-        return false;
-    }
-#endif
-    return true;
-}
-
 extern "C" float launch_kernels(const nanovdb::DenseGridHandle<nanovdb::CudaDeviceBuffer>&,
                                nanovdb::ImageHandle<nanovdb::CudaDeviceBuffer>&,
                                const nanovdb::Camera<float>*,
@@ -124,4 +103,4 @@ int main(int argc, char** argv)
            maxAngle, imgHandle.image()->size(), elapsedTime, elapsedTime/maxAngle, 1000.0f*maxAngle/elapsedTime);
 
     return 0;
-}
+}

nanovdb/nanovdb/examples/benchmark/Benchmark_nano.cc

@@ -16,27 +16,6 @@
 
 #include <iomanip>// for std::setfill and std::setw
 
-
-// Convenience function for checking CUDA runtime API results
-// can be wrapped around any runtime API call. No-op in release builds.
-#define cudaCheck(ans) \
-    { \
-        gpuAssert((ans), __FILE__, __LINE__); \
-    }
-
-static inline bool gpuAssert(cudaError_t code, const char* file, int line, bool abort = true)
-{
-#if defined(DEBUG) || defined(_DEBUG)
-    if (code != cudaSuccess) {
-        fprintf(stderr, "CUDA Runtime Error: %s %s %d\n", cudaGetErrorString(code), file, line);
-        if (abort)
-            exit(code);
-        return false;
-    }
-#endif
-    return true;
-}
-
 extern "C" float launch_kernels(const nanovdb::GridHandle<nanovdb::CudaDeviceBuffer>&,
                                 nanovdb::ImageHandle<nanovdb::CudaDeviceBuffer>&,
                                 const nanovdb::Camera<float>*,
@@ -131,4 +110,4 @@ int main(int argc, char** argv)
            maxAngle, imgHandle.image()->size(), elapsedTime, elapsedTime/maxAngle, 1000.0f*maxAngle/elapsedTime);
 
     return 0;
-}
+}

nanovdb/nanovdb/util/CudaDeviceBuffer.h

@@ -20,6 +20,30 @@
 
 #include <cuda_runtime_api.h> // for cudaMalloc/cudaMallocManaged/cudaFree
 
+#if defined(DEBUG) || defined(_DEBUG)
+    static inline void gpuAssert(cudaError_t code, const char* file, int line, bool abort = true)
+    {
+        if (code != cudaSuccess) {
+            fprintf(stderr, "CUDA Runtime Error: %s %s %d\n", cudaGetErrorString(code), file, line);
+            if (abort) exit(code);
+        }
+    }
+    static inline void ptrAssert(void* ptr, const char* msg, const char* file, int line, bool abort = true)
+    {
+        if (ptr == nullptr) {
+            fprintf(stderr, "NULL pointer error: %s %s %d\n", msg, file, line);
+            if (abort) exit(1);
+        }
+        if (uint64_t(ptr) % NANOVDB_DATA_ALIGNMENT) {
+            fprintf(stderr, "Pointer misalignment error: %s %s %d\n", msg, file, line);
+            if (abort) exit(1);
+        }
+    }
+#else
+    static inline void gpuAssert(cudaError_t, const char*, int, bool = true){}
+    static inline void ptrAssert(void*, const char*, const char*, int, bool = true){}
+#endif
+
 // Convenience function for checking CUDA runtime API results
 // can be wrapped around any runtime API call. No-op in release builds.
 #define cudaCheck(ans) \
@@ -46,44 +70,6 @@ class CudaDeviceBuffer
     uint64_t mSize; // total number of bytes for the NanoVDB grid.
     uint8_t *mCpuData, *mGpuData; // raw buffer for the NanoVDB grid.
 
-#if defined(DEBUG) || defined(_DEBUG)
-    static inline bool gpuAssert(cudaError_t code, const char* file, int line, bool abort = true)
-    {
-        if (code != cudaSuccess) {
-            fprintf(stderr, "CUDA Runtime Error: %s %s %d\n", cudaGetErrorString(code), file, line);
-            if (abort)
-                exit(code);
-            return false;
-        }
-        return true;
-    }
-#else
-    static inline bool gpuAssert(cudaError_t, const char*, int, bool = true)
-    {
-        return true;
-    }
-#endif
-
-#if defined(DEBUG) || defined(_DEBUG)
-    static inline void ptrAssert(void* ptr, const char* msg, const char* file, int line, bool abort = true)
-    {
-        if (ptr == nullptr) {
-            fprintf(stderr, "NULL pointer error: %s %s %d\n", msg, file, line);
-            if (abort)
-                exit(1);
-        }
-        if (uint64_t(ptr) % NANOVDB_DATA_ALIGNMENT) {
-            fprintf(stderr, "Alignment pointer error: %s %s %d\n", msg, file, line);
-            if (abort)
-                exit(1);
-        }
-    }
-#else
-    static inline void ptrAssert(void*, const char*, const char*, int, bool = true)
-    {
-    }
-#endif
-
 public:
     CudaDeviceBuffer(uint64_t size = 0)
         : mSize(0)