Merge pull request #19 from js1010/task/bug-fix

Task/bug fix
js1010 · Feb 10, 2021 · 068e5aa · 068e5aa
2 parents 4a542ab + 03f6ece
commit 068e5aa
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "3rd/spdlog"]
 	path = 3rd/spdlog
 	url = https://github.com/gabime/spdlog
-[submodule "3rd/pybind11"]
-	path = 3rd/pybind11
-	url = https://github.com/pybind/pybind11.git
diff --git a/3rd/pybind11 b/3rd/pybind11
diff --git a/cpp/include/cuda_build_kernels.cuh b/cpp/include/cuda_build_kernels.cuh
@@ -74,8 +74,7 @@ void SearchHeuristic(
     const bool save_remains,
     int* cand_nodes, cuda_scalar* cand_distances, 
     int* graph, float* distances, int* deg, 
-    const float heuristic_coef, int new_comer = -1) {
-  if (save_remains) new_comer = -1;
+    const float heuristic_coef, const int new_comer = -1) {
   int size2 = *size;
   __syncthreads();
 
@@ -317,7 +316,7 @@ __global__ void BuildLevelGraphKernel(
         }
 
         __syncthreads();
-        int new_comer = went_through_heuristic[dstid]? srcid: -1;
+        const int new_comer = not save_remains and went_through_heuristic[dstid]? srcid: -1;
         __syncthreads();
         SearchHeuristic(ef_const_pq, &size, dstid, nodes,
             data, dist_type, num_dims,

diff --git a/cpp/include/cuda_dist_kernels.cuh b/cpp/include/cuda_dist_kernels.cuh
@@ -40,7 +40,7 @@ cuda_scalar dot(const cuda_scalar * a, const cuda_scalar * b, const int num_dims
   // partially reduce the dot product inside each warp using a shuffle
   cuda_scalar val = 0;
   for (int i = threadIdx.x; i < num_dims; i += blockDim.x)
-    val += mul(a[i], b[i]);
+    val = add(val, mul(a[i], b[i]));
   val = warp_reduce_sum(val);
 
   // write out the partial reduction to shared memory if appropiate
@@ -80,7 +80,7 @@ cuda_scalar squaresum(const cuda_scalar * a, const cuda_scalar * b, const int nu
   cuda_scalar val = 0;
   for (int i = threadIdx.x; i < num_dims; i += blockDim.x) {
     cuda_scalar _val = sub(a[i], b[i]);
-    val = mul(_val, _val);
+    val = add(val, mul(_val, _val));
   }
   __syncthreads();
   val = warp_reduce_sum(val);

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,6 @@
 [build-system]
 requires = [
     "setuptools>=1.3.2",
-    "numpy"
+    "numpy",
+    "pybind11"
 ]
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,6 @@
 setuptools>=1.3.2
 jsmin
 numpy
+pybind11
 protobuf==3.10.0
 grpcio-tools==1.27.1