update C APIs for NGTQG

yahoojapan · Apr 14, 2021 · 6b33aa4 · 6b33aa4
1 parent a51241d
commit 6b33aa4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.13.6
+1.13.7
diff --git a/lib/NGT/NGTQ/Capi.cpp b/lib/NGT/NGTQ/Capi.cpp
@@ -75,8 +75,6 @@ static bool ngtqg_search_index_(NGTQG::Index* pindex, std::vector<float> &query,
   sq.setEpsilon(param.epsilon);                  // exploration coefficient.
   sq.setResultExpansion(param.result_expansion); // result expansion.
 
-  auto tmp = static_cast<NGT::ObjectDistances*>(results);
-
   pindex->search(sq);
 
   return true;
@@ -119,14 +117,15 @@ void ngtqg_initialize_quantization_parameters(NGTQGQuantizationParameters *param
   parameters->max_number_of_edges = 128;
 }
 
-void ngtqg_quantize(const char *indexPath, NGTQGQuantizationParameters parameters, NGTError error) {
+bool ngtqg_quantize(const char *indexPath, NGTQGQuantizationParameters parameters, NGTError error) {
   try{
     NGTQG::Index::quantize(indexPath, parameters.dimension_of_subvector, parameters.max_number_of_edges);
+    return true;
   }catch(std::exception &err){
     std::stringstream ss;
     ss << "Capi : " << __FUNCTION__ << "() : Error: " << err.what();
     operate_error_string_(ss, error);    
-    return;
+    return false;
   }
 }
 
diff --git a/lib/NGT/NGTQ/Capi.h b/lib/NGT/NGTQ/Capi.h
@@ -26,7 +26,10 @@
     //   build quantized objects and a quantized graph
     NGTQGQuantizationParameters quantizationParameters;
     ngtqg_initialize_quantization_parameters(&quantizationParameters);
-    ngtqg_quantize(indexPath.c_str(), quantizationParameters, err);
+    if (!ngtqg_quantize(indexPath.c_str(), quantizationParameters, err)) {
+      std::cerr << ngt_get_error_string(err) << std::endl;
+      return false;
+    }
 
     // open the index (ANNG or ONNG).
     index = ngtqg_open_index(indexPath.c_str(), err);
@@ -126,7 +129,7 @@ void ngtqg_close_index(NGTQGIndex);
 
 void ngtqg_initialize_quantization_parameters(NGTQGQuantizationParameters *);
 
-void ngtqg_quantize(const char *, NGTQGQuantizationParameters, NGTError);
+bool ngtqg_quantize(const char *, NGTQGQuantizationParameters, NGTError);
 
 void ngtqg_initialize_query(NGTQGQuery *);