From cff072b78ef019998990c6ba02df83dd7d3c8d38 Mon Sep 17 00:00:00 2001
From: Lucas Hosseini <hoss@fb.com>
Date: Thu, 27 May 2021 10:48:53 -0700
Subject: [PATCH] Prepare for release v1.7.1. (#1915)

Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/1915

Reviewed By: mdouze

Differential Revision: D28749880

Pulled By: beauby

fbshipit-source-id: 4dcb0a5eac8f84d26570a0fb6f3e357bc2f1151c
---
 CHANGELOG.md              | 5 ++++-
 conda/faiss-gpu/meta.yaml | 3 ++-
 conda/faiss/meta.yaml     | 3 ++-
 faiss/Index.h             | 2 +-
 faiss/python/setup.py     | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 649fa87bf2..7bbfdbd83d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ We try to indicate most contributions here with the contributor names who are no
 the Facebook Faiss team.  Feel free to add entries here if you submit a PR.
 
 ## [Unreleased]
+
+## [1.7.1] - 2021-05-27
 ### Added
 - Support for building C bindings through the `FAISS_ENABLE_C_API` CMake option.
 - Serializing the indexes with the python pickle module
@@ -199,7 +201,8 @@ by conda install -c pytorch faiss-gpu cudatoolkit=10.0.
 - C bindings.
 - Extended tutorial to GPU indices.
 
-[Unreleased]: https://github.com/facebookresearch/faiss/compare/v1.7.0...HEAD
+[Unreleased]: https://github.com/facebookresearch/faiss/compare/v1.7.1...HEAD
+[1.7.1]: https://github.com/facebookresearch/faiss/compare/v1.7.0...v1.7.1
 [1.7.0]: https://github.com/facebookresearch/faiss/compare/v1.6.5...v1.7.0
 [1.6.5]: https://github.com/facebookresearch/faiss/compare/v1.6.4...v1.6.5
 [1.6.4]: https://github.com/facebookresearch/faiss/compare/v1.6.3...v1.6.4
diff --git a/conda/faiss-gpu/meta.yaml b/conda/faiss-gpu/meta.yaml
index 90dce82e52..57a7f866df 100644
--- a/conda/faiss-gpu/meta.yaml
+++ b/conda/faiss-gpu/meta.yaml
@@ -42,7 +42,8 @@ outputs:
         - mkl =2018
         - cudatoolkit {{ cudatoolkit }}
       run:
-        - mkl >=2018
+        - mkl >=2018  # [not win]
+        - mkl >=2018,<2021  # [win]
         - {{ pin_compatible('cudatoolkit', max_pin='x.x') }}
     test:
       commands:
diff --git a/conda/faiss/meta.yaml b/conda/faiss/meta.yaml
index 3a6f6d4a9b..e54686549d 100644
--- a/conda/faiss/meta.yaml
+++ b/conda/faiss/meta.yaml
@@ -40,7 +40,8 @@ outputs:
       host:
         - mkl =2018
       run:
-        - mkl >=2018
+        - mkl >=2018  # [not win]
+        - mkl >=2018,<2021  # [win]
     test:
       commands:
         - test -f $PREFIX/lib/libfaiss$SHLIB_EXT       # [not win]
diff --git a/faiss/Index.h b/faiss/Index.h
index 02971e52c5..c5e041f747 100644
--- a/faiss/Index.h
+++ b/faiss/Index.h
@@ -18,7 +18,7 @@
 
 #define FAISS_VERSION_MAJOR 1
 #define FAISS_VERSION_MINOR 7
-#define FAISS_VERSION_PATCH 0
+#define FAISS_VERSION_PATCH 1
 
 /**
  * @namespace faiss
diff --git a/faiss/python/setup.py b/faiss/python/setup.py
index 32b155defd..10df658f8e 100644
--- a/faiss/python/setup.py
+++ b/faiss/python/setup.py
@@ -49,7 +49,7 @@
 """
 setup(
     name='faiss',
-    version='1.7.0',
+    version='1.7.1',
     description='A library for efficient similarity search and clustering of dense vectors',
     long_description=long_description,
     url='https://github.com/facebookresearch/faiss',