fix the issue #156

yahoojapan · Apr 15, 2024 · 74fed61 · 74fed61
1 parent 6237d1d
commit 74fed61
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.2.0
+2.2.1
diff --git a/lib/NGT/Common.h b/lib/NGT/Common.h
@@ -444,13 +444,15 @@ namespace NGT {
     static int getProcessVmPeak() { return strtol(getProcessStatus("VmPeak")); }
     static int getProcessVmRSS() { return strtol(getProcessStatus("VmRSS")); }
     static int getProcessVmHWM() { return strtol(getProcessStatus("VmHWM")); }
-#if __linux__
     static int getSystemHWM() {
+#if __linux__
       struct sysinfo info;
       sysinfo(&info);
       return info.totalram / 1024;
-    }
+#else
+      return 0;
 #endif
+    }
     static std::string sizeToString(float size) {
       char unit = 'K';
       if (size > 1024) {

diff --git a/lib/NGT/defines.h.in b/lib/NGT/defines.h.in
@@ -27,6 +27,7 @@
 #cmakedefine NGTQG_ZERO_GLOBAL
 #cmakedefine NGTQG_NO_ROTATION
 #cmakedefine NGT_BFLOAT_DISABLED		// not use bfloat
+#cmakedefine NGT_BFLOAT_ENABLED
 // End of cmake defines
 
 //////////////////////////////////////////////////////////////////////////
@@ -44,11 +45,13 @@
 #define		NGT_COMPACT_VECTOR
 #define		NGT_GRAPH_READ_ONLY_GRAPH
 #define		NGT_HALF_FLOAT
-#ifndef	NGT_BFLOAT_DISABLED
+
+#ifdef	NGT_BFLOAT_ENABLED
  #define		NGT_BFLOAT
 #endif
-//#define		NGT_EXPERIMENTAL_QUINT8
-#define		NGT_EXPERIMENTAL_SQINT8
+#ifdef	NGT_BFLOAT_DISABLED
+ #undef			NGT_BFLOAT
+#endif
 
 #ifdef	NGT_LARGE_DATASET
  #define	NGT_GRAPH_CHECK_HASH_BASED_BOOLEAN_SET