From 63ec52dcf9ad0068078e2a297e245d28116c3efd Mon Sep 17 00:00:00 2001
From: Kota Yamaguchi <yamaguchi_kota@cyberagent.co.jp>
Date: Fri, 1 Mar 2024 13:09:34 +0900
Subject: [PATCH] Sync upstream to v1.8.0 (#98)

* Sync upstream to v1.8.0

* Use clang in windows
---
 .github/workflows/build.yml | 4 ++--
 faiss                       | 2 +-
 pyproject.toml              | 2 +-
 scripts/build_Windows.sh    | 1 +
 setup.py                    | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c541cfa..7c9d37f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,7 +56,7 @@ jobs:
             opt_level: generic
           - os: windows-latest
             arch: auto64
-            opt_level: generic  # Upstream incompatible with AVX2 and AVX512
+            opt_level: avx2
 
     steps:
       - uses: actions/checkout@v4
@@ -74,7 +74,7 @@ jobs:
           platforms: arm64
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.16.2
+        run: python -m pip install cibuildwheel==2.16.5
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse
diff --git a/faiss b/faiss
index 1dcb5d3..943d08b 160000
--- a/faiss
+++ b/faiss
@@ -1 +1 @@
-Subproject commit 1dcb5d314d63850c2f9e607d7558e05fac9415b5
+Subproject commit 943d08bdad7946b22f56d040756669ee444dd681
diff --git a/pyproject.toml b/pyproject.toml
index ac3a7d6..28b99fe 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "faiss-cpu"
-version = "1.7.4"
+version = "1.8.0"
 authors = [
     { name = "Kota Yamaguchi", email = "yamaguchi_kota@cyberagent.co.jp" },
 ]
diff --git a/scripts/build_Windows.sh b/scripts/build_Windows.sh
index b1bf0e6..fe39954 100644
--- a/scripts/build_Windows.sh
+++ b/scripts/build_Windows.sh
@@ -13,6 +13,7 @@ cd faiss && \
     cmake . \
         -B build \
         -A x64 \
+        -T ClangCL \
         -DFAISS_ENABLE_GPU=OFF \
         -DFAISS_ENABLE_PYTHON=OFF \
         -DFAISS_OPT_LEVEL=${FAISS_OPT_LEVEL:-"generic"} \
diff --git a/setup.py b/setup.py
index 8d6c743..efdbd47 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@ def win32_options(
     """Windows options."""
     return dict(
         extra_compile_args=extra_compile_args + [
-            "/openmp",
+            "/openmp:llvm",
             "/std:c++17",
             "/Zc:inline",
             "/wd4101",  # unreferenced local variable.