From 8b0031bfc14a9ab6e709b8cc4b93f83491650d91 Mon Sep 17 00:00:00 2001 From: Tanay Soni Date: Fri, 12 Feb 2021 12:15:23 +0100 Subject: [PATCH] Remove conditional import of FAISS for Windows (#819) --- haystack/document_store/faiss.py | 6 +----- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/haystack/document_store/faiss.py b/haystack/document_store/faiss.py index 10560442a..dd45c4821 100644 --- a/haystack/document_store/faiss.py +++ b/haystack/document_store/faiss.py @@ -1,8 +1,8 @@ import logging -from sys import platform from pathlib import Path from typing import Union, List, Optional, Dict, Generator from tqdm import tqdm +import faiss import numpy as np from haystack import Document @@ -11,10 +11,6 @@ from haystack.retriever.base import BaseRetriever from haystack.utils import get_batches_from_generator from scipy.special import expit -if platform != 'win32' and platform != 'cygwin': - import faiss -else: - raise ModuleNotFoundError("FAISSDocumentStore on windows platform is not supported") logger = logging.getLogger(__name__) diff --git a/requirements.txt b/requirements.txt index 38a8d4e1b..75f4b2d2f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,7 +16,7 @@ python-multipart python-docx sqlalchemy_utils # for using FAISS with GPUs, install faiss-gpu -faiss-cpu==1.6.3; sys_platform != 'win32' and sys_platform != 'cygwin' +faiss-cpu==1.6.3 tika uvloop==0.14; sys_platform != 'win32' and sys_platform != 'cygwin' httptools