compile succeed

Author: js1010

cpp/include/cuw2v/cuda_w2v_base_kernels.cuh

@@ -6,9 +6,6 @@
 #pragma once
 #include "utils/cuda_utils_kernels.cuh"
 
-using thrust::random::default_random_engine;
-using thrust::random::uniform_int_distribution;
-
 namespace cusim {
 
 

cpp/include/cuw2v/cuw2v.hpp

@@ -34,19 +34,6 @@ using thrust::random::default_random_engine;
 
 namespace cusim {
 
-bool CompareIndex(int lhs, int rhs);
-
-struct HuffmanTreeNode {
-  float count;
-  int index, left, right;
-  HuffmanTreeNode(float count0, int index0, int left0, int right0) {
-    count = count0; index = index0; left = left0; right = right0;
-  }
-};
-
-std::vector<HuffmanTreeNode> huffman_nodes;
-bool CompareIndex(int lhs, int rhs);
-
 class CuW2V {
  public:
   CuW2V();

cpp/include/utils/cuda_utils_kernels.cuh

@@ -23,6 +23,9 @@
 #include <utility>
 #include "utils/types.hpp"
 
+using thrust::random::default_random_engine;
+using thrust::random::uniform_int_distribution;
+
 namespace cusim {
 
 // Error Checking utilities, checks status codes from cuda calls

cpp/src/cuw2v/cuw2v.cu

@@ -10,6 +10,15 @@
 
 namespace cusim {
 
+struct HuffmanTreeNode {
+  float count;
+  int index, left, right;
+  HuffmanTreeNode(float count0, int index0, int left0, int right0) {
+    count = count0; index = index0; left = left0; right = right0;
+  }
+};
+
+std::vector<HuffmanTreeNode> huffman_nodes;
 bool CompareIndex(int lhs, int rhs) {
   return huffman_nodes[lhs].count > huffman_nodes[rhs].count;
 }

cpp/src/utils/ioutils.cc

@@ -175,7 +175,7 @@ void IoUtils::GetWordVocab(int min_count, std::string keys_path, std::string cou
     line = std::to_string(word_count_[word_list_[i]]) + "\n";
     fout2.write(line.c_str(), line.size());
   }
-  fout.close();
+  fout1.close(); fout2.close();
 }
 
 }  // namespace cusim

cusim/cuw2v/bindings.cc

@@ -29,7 +29,7 @@ class CuW2VBind {
     float_array _emb_out(emb_out);
     auto emb_in_buffer = _emb_in.request();
     auto emb_out_buffer = _emb_out.request();
-    if (emb_in_buffer.ndim != 2 or emb_out_buffer_buffer.ndim != 2 or
+    if (emb_in_buffer.ndim != 2 or emb_out_buffer.ndim != 2 or
         emb_in_buffer.shape[1] != emb_out_buffer.shape[1]) {
       throw std::runtime_error("invalid emb_in or emb_out");
     }
@@ -39,7 +39,7 @@ class CuW2VBind {
 
   void BuildRandomTable(py::object& word_count, int table_size, int num_threads) {
     float_array _word_count(word_count);
-    auto wc_buffer = _word_count.requiest();
+    auto wc_buffer = _word_count.request();
     if (wc_buffer.ndim != 1) {
       throw std::runtime_error("invalid word count");
     }
@@ -49,7 +49,7 @@ class CuW2VBind {
 
   void BuildHuffmanTree(py::object& word_count) {
     float_array _word_count(word_count);
-    auto wc_buffer = _word_count.requiest();
+    auto wc_buffer = _word_count.request();
     if (wc_buffer.ndim != 1) {
       throw std::runtime_error("invalid word count");
     }

cusim/ioutils/bindings.cc

@@ -62,7 +62,7 @@ PYBIND11_PLUGIN(ioutils_bind) {
   .def("tokenize_stream", &IoUtilsBind::TokenizeStream,
       py::arg("num_lines"), py::arg("num_threads"))
   .def("get_word_vocab", &IoUtilsBind::GetWordVocab,
-      py::arg("min_count"), py::arg("keys_path"), py::Arg("count_path"))
+      py::arg("min_count"), py::arg("keys_path"), py::arg("count_path"))
   .def("get_token", &IoUtilsBind::GetToken,
       py::arg("indices"), py::arg("indptr"), py::arg("offset"))
   .def("__repr__",