cuml-#1 - Removing utils.h from dbscan. Using cuda_utils.h supplied i…

…n ml_prims
cjnolet · Nov 14, 2018 · de30217 · de30217
1 parent 7a02237
commit de30217
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 70 deletions.
diff --git a/cuML/src/dbscan/epsneigh/algo1.h b/cuML/src/dbscan/epsneigh/algo1.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "cuda_utils.h"
+#include <cuda_utils.h>
 #include "pack.h"
 
 namespace Dbscan {

diff --git a/cuML/src/dbscan/epsneigh/algo2.h b/cuML/src/dbscan/epsneigh/algo2.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "../cuda_utils.h"
+#include <cuda_utils.h>
 #include "../types.h"
 #include "pack.h"
 

diff --git a/cuML/src/dbscan/epsneigh/algo3.h b/cuML/src/dbscan/epsneigh/algo3.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "../cuda_utils.h"
+#include <cuda_utils.h>
 #include "../types.h"
 #include "pack.h"
 

diff --git a/cuML/src/dbscan/epsneigh/algo4.h b/cuML/src/dbscan/epsneigh/algo4.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "../cuda_utils.h"
+#include <cuda_utils.h>
 #include "pack.h"
 #include "../common.h"
 

diff --git a/cuML/src/dbscan/epsneigh/naive.h b/cuML/src/dbscan/epsneigh/naive.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "../cuda_utils.h"
+#include <cuda_utils.h>
 #include "pack.h"
 
 namespace Dbscan {

diff --git a/cuML/src/dbscan/labelling/runner.h b/cuML/src/dbscan/labelling/runner.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "utils.h"
+#include <cuda_utils.h>
 #include <iostream>
 #include <limits>
 #include "naive.h"

diff --git a/cuML/src/dbscan/runner.h b/cuML/src/dbscan/runner.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "utils.h"
+#include <cuda_utils.h>
 #include "vertexdeg/runner.h"
 #include "adjgraph/runner.h"
 #include "labelling/runner.h"
@@ -69,15 +69,15 @@ size_t run(Type_f* x, Type N, Type D, Type_f eps, Type minPts, Type* labels,
 		cudaStream_t stream) {
     const size_t align = 256;
     int batchSize = ceildiv(N, nBatches);
-    size_t adjSize = alignSize<size_t>(sizeof(bool) * N * batchSize, align);
-    size_t corePtsSize = alignSize<size_t>(sizeof(bool) * N, align);
-    size_t visitedSize = alignSize<size_t>(sizeof(bool) * N, align);
-    size_t xaSize = alignSize<size_t>(sizeof(bool) * N, align);
-    size_t mSize = alignSize<size_t>(sizeof(bool), align);
-    size_t vdSize = alignSize<size_t>(sizeof(Type) * (batchSize + 1), align);
-    size_t exScanSize = alignSize<size_t>(sizeof(Type) * batchSize, align);
-    size_t mapIdSize = alignSize<size_t>(sizeof(Type) * N, align);
-    size_t dotsSize = alignSize<size_t>(sizeof(Type_f) * N, align);
+    size_t adjSize = alignTo<size_t>(sizeof(bool) * N * batchSize, align);
+    size_t corePtsSize = alignTo<size_t>(sizeof(bool) * N, align);
+    size_t visitedSize = alignTo<size_t>(sizeof(bool) * N, align);
+    size_t xaSize = alignTo<size_t>(sizeof(bool) * N, align);
+    size_t mSize = alignTo<size_t>(sizeof(bool), align);
+    size_t vdSize = alignTo<size_t>(sizeof(Type) * (batchSize + 1), align);
+    size_t exScanSize = alignTo<size_t>(sizeof(Type) * batchSize, align);
+    size_t mapIdSize = alignTo<size_t>(sizeof(Type) * N, align);
+    size_t dotsSize = alignTo<size_t>(sizeof(Type_f) * N, align);
     if(workspace == NULL) {
         auto size = adjSize
             + corePtsSize

diff --git a/cuML/src/dbscan/vertexdeg/algo5.h b/cuML/src/dbscan/vertexdeg/algo5.h
@@ -17,7 +17,6 @@
 #pragma once
 
 #include <cuda_utils.h>
-#include "utils.h"
 #include "pack.h"
 #include "../common.h"
 #include <cub/cub.cuh>

diff --git a/cuML/src/utils.h b/cuML/src/utils.h