fix minor bugs of QG and QBG

yahoojapan · Dec 15, 2022 · a95c4b5 · a95c4b5
1 parent 2e7a78c
commit a95c4b5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,6 +36,11 @@ if(${UNIX})
             set(BASE_OPTIONS "${BASE_OPTIONS} -fopenmp")
         endif()
 
+        if(${NGT_ASSERT_DISABLED})
+            message(STATUS "assert() is disabled.")
+            set(BASE_OPTIONS "${BASE_OPTIONS} -DNDEBUG")
+        endif()
+
         set(CMAKE_CXX_FLAGS_DEBUG "-g ${BASE_OPTIONS}")
 
         if(${NGT_MARCH_NATIVE_DISABLED})

diff --git a/lib/NGT/Graph.h b/lib/NGT/Graph.h
@@ -502,15 +502,15 @@ namespace NGT {
 	  case NeighborhoodGraph::GraphTypeBKNNG: p.set("GraphType", "BKNNG"); break;
 	  case NeighborhoodGraph::GraphTypeONNG: p.set("GraphType", "ONNG"); break;
 	  case NeighborhoodGraph::GraphTypeIANNG: p.set("GraphType", "IANNG"); break;
-	  default: std::cerr << "Graph::exportProperty: Fatal error! Invalid Graph Type." << std::endl; abort();
+	  default: std::cerr << "Graph::exportProperty: Fatal error! Invalid Graph Type. " << graphType << std::endl; abort();
 	  }
 	  switch (seedType) {
 	  case NeighborhoodGraph::SeedTypeRandomNodes: p.set("SeedType", "RandomNodes"); break;
 	  case NeighborhoodGraph::SeedTypeFixedNodes: p.set("SeedType", "FixedNodes"); break;
 	  case NeighborhoodGraph::SeedTypeFirstNode: p.set("SeedType", "FirstNode"); break;
 	  case NeighborhoodGraph::SeedTypeNone: p.set("SeedType", "None"); break;
 	  case NeighborhoodGraph::SeedTypeAllLeafNodes: p.set("SeedType", "AllLeafNodes"); break;
-	  default: std::cerr << "Graph::exportProperty: Fatal error! Invalid Seed Type." << std::endl; abort();
+	  default: std::cerr << "Graph::exportProperty: Fatal error! Invalid Seed Type. " << seedType << std::endl; abort();
 	  }
 	}
 	void importProperty(NGT::PropertySet &p) {

diff --git a/lib/NGT/NGTQ/QuantizedBlobGraph.h b/lib/NGT/NGTQ/QuantizedBlobGraph.h
@@ -55,8 +55,10 @@ namespace QBG {
       creation.globalEdgeSizeForSearch	= 40;
       creation.globalIndexType	= NGT::Property::GraphAndTree;
       creation.globalInsertionRadiusCoefficient	= 1.1;
+      creation.globalGraphType	= NGT::NeighborhoodGraph::GraphTypeANNG;
       creation.localIndexType	= NGT::Property::GraphAndTree;
       creation.localInsertionRadiusCoefficient = 1.1;
+      creation.localGraphType	= NGT::NeighborhoodGraph::GraphTypeANNG;
       hierarchicalClustering.maxSize	= 1000;
       hierarchicalClustering.numOfObjects	= 0;
       hierarchicalClustering.numOfClusters	= 2;
@@ -336,9 +338,6 @@ namespace QBG {
       buildParameters.setProperties(property, globalProperty, localProperty);
       property.quantizerType = NGTQ::QuantizerTypeQBG;
       NGTQ::Index::create(index, property, globalProperty, localProperty, rotation, objectFile);
-      try {
-	NGT::Index::mkdir(index + getWorkspaceName());
-      } catch(...) {}
     }
 #endif
 
@@ -354,9 +353,6 @@ namespace QBG {
       property.quantizerType = NGTQ::QuantizerTypeQBG;
 #ifdef NGTQ_QBG
       NGTQ::Index::create(index, property, globalProperty, localProperty, rotation, objectFile);
-      try {
-	NGT::Index::mkdir(index + getWorkspaceName());
-      } catch(...) {}
 #else
       NGTQ::Index::create(index, property, globalProperty, localProperty);
 #endif

diff --git a/lib/NGT/NGTQ/Quantizer.h b/lib/NGT/NGTQ/Quantizer.h
@@ -3643,7 +3643,6 @@ class QuantizerInstance : public Quantizer {
     lp.treeSharedMemorySize	= 128; // MB
     lp.objectSharedMemorySize	= 128; // MB  128 is for up to 5M objects?
 #endif
-
     gp.set(globalProperty);
     lp.set(localProperty);