fix the issue #154

yahoojapan · Dec 6, 2023 · 441aa19 · 441aa19
1 parent 75d12fb
commit 441aa19
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -59,18 +59,16 @@ if(${UNIX})
             if(${NGT_MARCH_NATIVE_DISABLED})
                 message(STATUS "Compile option -march=native is disabled.")
                 add_compile_options(-O2 -DNDEBUG)
+            elseif(${NGT_AVX2})
+                add_compile_options(-Ofast -march=haswell -DNDEBUG)
+            elseif(${NGT_AVX_DISABLED})
+                message(STATUS "AVX will not be used to compute distances.")
+                add_compile_options(-Ofast -march=x86-64 -DNDEBUG)
             else()
-                if(${NGT_AVX2})
-                    add_compile_options(-Ofast -march=haswell -DNDEBUG)
-                else()
-                    add_compile_options(-Ofast -march=native -DNDEBUG)
-                endif()
+                add_compile_options(-Ofast -march=native -DNDEBUG)
             endif()
         endif()
         add_compile_options(-Wall)
-        if(${NGT_AVX_DISABLED})
-            message(STATUS "AVX will not be used to compute distances.")
-        endif()
         if(${NGT_OPENMP_DISABLED})
             message(STATUS "OpenMP is disabled.")
         else()

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.1.5
+2.1.6
diff --git a/lib/NGT/Common.h b/lib/NGT/Common.h
@@ -502,7 +502,7 @@ namespace NGT {
 						  "avx512vbmi2", "avx512vnni"};
       std::string types;
       int size = sizeof(simdTypes) / sizeof(simdTypes[0]);
-      for (int i = 0; i <= size; i++) {
+      for (int i = 0; i < size; i++) {
 	if (is(static_cast<SimdType>(i))) {
 	  types += simdTypes[i];
 	}

diff --git a/python/setup.py b/python/setup.py
@@ -110,7 +110,7 @@
             'include_dirs': ['/usr/local/include',
                              pybind11.get_include(True),
                              pybind11.get_include(False)],
-            'extra_compile_args': ['-std=c++11', '-Ofast', '-DNDEBUG'],
+            'extra_compile_args': ['-std=c++11', '-Ofast', '-march=x86-64', '-DNDEBUG'],
             'sources': ['src/ngtpy.cpp']
         }
     elif static_library_avx2 or shared_library_avx2: