Skip to content

Commit f71d5b9

Browse files
mdouzefacebook-github-bot
authored andcommitted
fix spurious include to land the cagra diff (facebookresearch#3502)
Summary: Pull Request resolved: facebookresearch#3502 include probably added by vscode Reviewed By: mengdilin Differential Revision: D58411537 fbshipit-source-id: 3035f690d26decc937fb492c54ffa2f974ee2db8
1 parent df0dea6 commit f71d5b9

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ project(faiss
4646
LANGUAGES ${FAISS_LANGUAGES})
4747
include(GNUInstallDirs)
4848

49-
set(CMAKE_INSTALL_PREFIX "$ENV{CONDA_PREFIX}")
50-
5149
set(CMAKE_CXX_STANDARD 17)
5250

5351
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")

faiss/IndexHNSW.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include <sys/stat.h>
2525
#include <sys/types.h>
2626
#include <cstdint>
27-
#include "impl/HNSW.h"
2827

2928
#include <faiss/Index2Layer.h>
3029
#include <faiss/IndexFlat.h>

faiss/gpu/test/test_cagra.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import unittest
77

88
import faiss
9-
import numpy as np
109

1110
from faiss.contrib import datasets, evaluation
1211

@@ -57,8 +56,9 @@ def do_interop(self, metric):
5756

5857
evaluation.check_ref_knn_with_draws(Dref, Iref, Dnew, Inew, k)
5958

60-
faiss.write_index(cpu_index, "index_hnsw_cagra.index")
61-
deserialized_index = faiss.read_index("index_hnsw_cagra.index")
59+
deserialized_index = faiss.deserialize_index(
60+
faiss.serialize_index(cpu_index))
61+
6262
gpu_index = faiss.index_cpu_to_gpu(res, 0, deserialized_index)
6363
Dnew2, Inew2 = gpu_index.search(ds.get_queries(), k)
6464

0 commit comments

Comments
 (0)