patch cicd yaml

BlaiseMuhirwa · Dec 17, 2023 · 039c57b · 039c57b
1 parent ca6a6b4
commit 039c57b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml
@@ -36,6 +36,7 @@ jobs:
     - name: Build flatnav 
       run: |
         cd flatnav_python
+        export NO_MANUAL_VECTORIZATION=1
         ./install_flatnav.sh
 
     - name: Run Unit Tests

diff --git a/flatnav/distances/InnerProductDistance.h b/flatnav/distances/InnerProductDistance.h
@@ -33,8 +33,6 @@ class InnerProductDistance : public DistanceInterface<InnerProductDistance> {
     setDistanceFunction();
   }
 
-  // ~InnerProductDistance() = default;
-
   float distanceImpl(const void *x, const void *y,
                      bool asymmetric = false) const {
     (void)asymmetric;

diff --git a/flatnav/distances/SquaredL2Distance.h b/flatnav/distances/SquaredL2Distance.h
@@ -31,8 +31,6 @@ class SquaredL2Distance : public DistanceInterface<SquaredL2Distance> {
     setDistanceFunction();
   }
 
-  // ~SquaredL2Distance() = default;
-
   float distanceImpl(const void *x, const void *y,
                      bool asymmetric = false) const {
     (void)asymmetric;

diff --git a/flatnav_python/setup.py b/flatnav_python/setup.py
@@ -56,6 +56,15 @@ def platform_has_avx_support():
     EXTRA_COMPILE_ARGS.append("-ftree-vectorize")
 
 
+no_manual_vectorization = int(os.environ.get("NO_MANUAL_VECTORIZATION", "0"))
+
+if no_manual_vectorization:
+    # Remove SIMD-related flags. Otherwise, it would crush in an environment
+    # where SIMD extensions (SSE, AVX) are not supported
+    EXTRA_COMPILE_ARGS = [
+        arg for arg in EXTRA_COMPILE_ARGS if arg not in ("-mavx", "-mavx512f")
+    ]
+
 ext_modules = [
     Pybind11Extension(
         "flatnav",

diff --git a/flatnav_python/unit_tests/test_parallel_insertions.py b/flatnav_python/unit_tests/test_parallel_insertions.py
@@ -5,7 +5,8 @@
 from flatnav.index import L2Index
 from .test_utils import get_ann_benchmark_dataset, compute_recall, create_index
 import os
-import numpy as np 
+import numpy as np
+
 
 def test_parallel_insertions_yield_similar_recall():
     training_set, queries, ground_truth, _ = get_ann_benchmark_dataset(