Commit Graph

31 Commits (f07e82aa1a47a6fe8bc3600cc5486d4a2f554a16)

Author SHA1 Message Date
Lucas Hosseini 7492d23354 Fix packaging (#2121)
Summary:
- Disable problematic tests on OSX.
- Ensure compiler compatibility with CUDA builds.
- Fix path for Python extension libraries.
- Use CentOS for CUDA packaging.
- Update CUDA versions in CI (10.2 and 11.3).

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

Reviewed By: mdouze

Differential Revision: D32921117

Pulled By: beauby

fbshipit-source-id: 588c18add8084b8228ff5abc651eaa4567919cc6
2021-12-07 13:12:30 -08:00
Lucas Hosseini b2b129980e Fix release packages being overwritten by nightlies. (#1935)
Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/1935

Reviewed By: mdouze

Differential Revision: D28932003

Pulled By: beauby

fbshipit-source-id: f6149697a270c07cfef789e7e7f22ba58cb9627c
2021-06-07 09:24:10 -07:00
Lucas Hosseini cff072b78e 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
2021-05-27 10:49:37 -07:00
Matthijs Douze a7d62b39b4 Fix GPU nighties test (#1901)
Summary:
This should fix the GPU nighties.

The rationale for the cp is that there is a shared file between the CPU and GPU tests.

Ideally, this file should probably moved to contrib at some point.

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

Reviewed By: beauby

Differential Revision: D28680898

Pulled By: mdouze

fbshipit-source-id: b9d0e1969103764ecb6f1e047c9ed4bd4a76aaba
2021-05-26 09:41:31 -07:00
Lucas Hosseini cd6909004f Add packages for CUDA 11.3. (#1902)
Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/1902

Reviewed By: mdouze

Differential Revision: D28566993

Pulled By: beauby

fbshipit-source-id: f560130c874bad355377b88b4519519af1e5d9f1
2021-05-21 07:47:37 -07:00
Lucas Hosseini 77825c52bd Fix conda recipes. (#1894)
Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/1894

Reviewed By: wickedfoo

Differential Revision: D28510244

Pulled By: beauby

fbshipit-source-id: 32983b7eeab497b8d576caaadd56e13a2134a4ab
2021-05-18 09:10:54 -07:00
Lucas Hosseini 31bd194e2e Fix GPU nightly builds. (#1837)
Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/1837

Reviewed By: mdouze

Differential Revision: D27965420

Pulled By: beauby

fbshipit-source-id: 9500253ef00b2fe43c987c6069ceabcbffd26b74
2021-04-23 05:47:53 -07:00
Lucas Hosseini c65f670523 Add separate targets for libfaiss/libfaiss_avx2. (#1772)
Summary:
This should fix the conda builds.

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

Reviewed By: mdouze

Differential Revision: D27365772

Pulled By: beauby

fbshipit-source-id: 12b9d488d475842030feb1a0452acf26dbe6ac01
2021-03-26 14:28:16 -07:00
Lucas Hosseini 5e54fb57d8 Add missing copyright header. (#1751)
Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/1751

Reviewed By: LowikC

Differential Revision: D26954273

Pulled By: beauby

fbshipit-source-id: f3e4cb825283a7571ec44b123146ebc06d4a3a9c
2021-03-10 13:49:49 -08:00
Lucas Hosseini dd85e7a167 Add test for CPU dispatch in conda packages. (#1724)
Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/1724

Reviewed By: mdouze

Differential Revision: D26814141

Pulled By: beauby

fbshipit-source-id: 11f32c6e04a7d78dab9dae48b8d951dd80c11353
2021-03-09 01:18:22 -08:00
H. Vetinari 0d7e5a8ba5 Fix swig vs. AVX2 (#1717)
Summary:
Towards https://github.com/facebookresearch/faiss/issues/1711. There's still a test [error](https://github.com/facebookresearch/faiss/issues/1711#issuecomment-787509873) that won't be picked up unless an AVX2-specific CI run is added.

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

Reviewed By: mdouze

Differential Revision: D26814113

Pulled By: beauby

fbshipit-source-id: c3e64a04c3afd1d354439a2c4a2edd611d2c6af8
2021-03-04 03:46:39 -08:00
Lucas Hosseini 2a01135127 Add missing copyright headers. (#1689)
Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/1689

Reviewed By: mdouze

Differential Revision: D26460606

Pulled By: beauby

fbshipit-source-id: ad35dd2ea3fb23a0b87bc04597a8fbc38393c997
2021-02-16 09:11:30 -08:00
Lucas Hosseini 08a0ce72a2 Fix nightly build for CUDA 11. (#1675)
Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/1675

Reviewed By: mdouze

Differential Revision: D26338704

Pulled By: beauby

fbshipit-source-id: f440bbd05d6dbc09280e4f3631e4a9af99bde5f5
2021-02-09 07:44:27 -08:00
Authman 976a942838 Cuda 11.0 Dockerimage for CircleCI conf (#1669)
Summary:
This small change adds a dockerimage for cuda11.0.

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

Reviewed By: mdouze

Differential Revision: D26278940

Pulled By: beauby

fbshipit-source-id: 59af80c0eac1fe8b512a8543ec15b5c7174219fb
2021-02-08 00:53:03 -08:00
Matthijs Douze 6d0bc58db6 Implementation of PQ4 search with SIMD instructions (#1542)
Summary:
IndexPQ and IndexIVFPQ implementations with AVX shuffle instructions.

The training and computing of the codes does not change wrt. the original PQ versions but the code layout is "packed" so that it can be used efficiently by the SIMD computation kernels.

The main changes are:

- new IndexPQFastScan and IndexIVFPQFastScan objects

- simdib.h for an abstraction above the AVX2 intrinsics

- BlockInvertedLists for invlists that are 32-byte aligned and where codes are not sequential

- pq4_fast_scan.h/.cpp:  for packing codes and look-up tables + optmized distance comptuation kernels

- simd_result_hander.h: SIMD version of result collection in heaps / reservoirs

Misc changes:

- added contrib.inspect_tools to access fields in C++ objects

- moved .h and .cpp code for inverted lists to an invlists/ subdirectory, and made a .h/.cpp for InvertedListsIOHook

- added a new inverted lists type with 32-byte aligned codes (for consumption by SIMD)

- moved Windows-specific intrinsics to platfrom_macros.h

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

Test Plan:
```
buck test mode/opt  -j 4  //faiss/tests/:test_fast_scan_ivf //faiss/tests/:test_fast_scan
buck test mode/opt  //faiss/manifold/...
```

Reviewed By: wickedfoo

Differential Revision: D25175439

Pulled By: mdouze

fbshipit-source-id: ad1a40c0df8c10f4b364bdec7172e43d71b56c34
2020-12-03 10:06:38 -08:00
Lucas Hosseini 88eabe97f9 Fix version string in conda builds.
Summary: Currently, conda version strings are built from the latest git tag, which starts with the letter `v`. This confuses conda, which orders v1.6.5 before 1.6.3.

Reviewed By: LowikC

Differential Revision: D25151276

fbshipit-source-id: 7abfb547fee3468b26fedb6637a15e725755daf3
2020-11-22 08:58:08 -08:00
Jeff Johnson 8d776e6453 PyTorch tensor / Faiss index interoperability (#1484)
Summary:
Pull Request resolved: https://github.com/facebookresearch/faiss/pull/1484

This diff allows for native usage of PyTorch tensors for Faiss indexes on both CPU and GPU. It is currently only implemented in this diff for things that inherit from `faiss.Index`, which covers the non-binary indices, and it patches the same functions on `faiss.Index` that were also covered by `__init__.py` for numpy interoperability.

There must be uniformity among the inputs: if any array input is a Torch tensor, then all array inputs must be Torch tensors. Similarly, if any array input is a numpy ndarray, then all array inputs must be numpy ndarrays.

If `faiss.contrib.torch_utils` is imported, it ensures that `import faiss` has already been performed to patch all of the functions using the base `__init__.py` numpy wrappers, and then patches the following functions again:

```
add
add_with_ids
assign
train
search
remove_ids
reconstruct
reconstruct_n
range_search
update_vectors
search_and_reconstruct
sa_encode
sa_decode
```

to allow usage of PyTorch CPU tensors, and additionally PyTorch GPU tensors if the index being used is on the GPU.

numpy functionality is still available when `faiss.contrib.torch_utils` is imported; we pass through to the original patched numpy function when we detect numpy inputs.

In addition, to allow for better (asynchronous) GPU usage without requiring the CPU to be involved, all of these functions which construct tensors/arrays for output now take optional arguments for storage (numpy or torch.Tensor) to be provided that will contain the output data. `range_search` is the only exception to this, as the size of the output data is indeterminate. The eventual GPU implementation will likely require the user to provide a maximum cap on the output size, and allow that to be passed instead. If the optional pre-allocated output values are presented by the user, they are used; otherwise, new return ndarray / Tensors are constructed as before and used for the return. If this feature were not provided on the GPU, then every execution would be completely serial as we would depend upon the CPU to allocate GPU memory before every operation. Instead, now this can function much like NN graph execution on the GPU, assuming that all of the data requirements are pre-allocated, so the execution will run at the full speed of the GPU and not be stalled sequentially launching kernels.

This diff also exposes the `GpuResources` shared_ptr object owned by a GPU index. This is required for pytorch GPU so that we can perform proper stream ordering in Faiss with respect to the current pytorch stream. So, Faiss indices now perform more or less as any NN operation in Torch does.

Note, however, that a Faiss index has its own setting on current device, and if the pytorch GPU tensor inputs are resident on a different device than what the Faiss index expects, a cross-device copy will be initiated. I may choose to make this an error in the future and require matching device to device.

This diff also found a bug when passing GPU data directly to `train()` for `GpuIndexIVFFlat` and `GpuIndexIVFScalarQuantizer`, as I guess we never tested passing GPU data directly to these functions before. `GpuIndexIVFPQ` was doing the right thing however.

The assign function is now also implemented on the GPU as well, and is now marked `const` to be in line with the `search` function.

Also added better checking of non-contiguous inputs for both Torch tensors and numpy ndarrays.

Updated the `knn_gpu` function with a base implementation always present that allows for usage of numpy arrays, which is overridden when `torch_utils` is imported to allow torch usage. This supports row/column major layout, float32/float16 data and int64/int32 indices for both numpy and torch.

Reviewed By: mdouze

Differential Revision: D24299400

fbshipit-source-id: b4f117b9c120bd1ad83e7702087051ab7b303b29
2020-10-23 22:24:22 -07:00
Lucas Hosseini 7891094da6 Add nightly packages for GPU. (#1485)
Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/1485

Test Plan: Imported from OSS

Reviewed By: wickedfoo

Differential Revision: D24492171

Pulled By: beauby

fbshipit-source-id: 20fbcbdd50ab30e110e41b34e0c07d88432b1422
2020-10-22 19:47:13 -07:00
Lucas Hosseini 0b365fa6d8 Add docker image for CUDA 10.1. (#1477)
Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/1477

Test Plan: Imported from OSS

Reviewed By: wickedfoo

Differential Revision: D24492173

Pulled By: beauby

fbshipit-source-id: 5247accb2dc31bb125f9b06fb2275346b2e6465f
2020-10-22 19:47:13 -07:00
Lucas Hosseini 616dc44e1e Update conda package for faiss-gpu. (#1476)
Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/1476

Test Plan: Imported from OSS

Reviewed By: wickedfoo

Differential Revision: D24492172

Pulled By: beauby

fbshipit-source-id: 63497b54d8aed10d45ebc4ed7659dd1d18b36edf
2020-10-22 19:47:13 -07:00
Lucas Hosseini 70eaa9b1a3 Add missing copyright headers. (#1460)
Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/1460

Reviewed By: wickedfoo

Differential Revision: D24278804

Pulled By: beauby

fbshipit-source-id: 5ea96ceb63be76a34f1eb4da03972159342cd5b6
2020-10-13 11:15:59 -07:00
Lucas Hosseini 8e44bff055 Nightly builds (#1451)
Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/1451

Reviewed By: mdouze

Differential Revision: D24245777

Pulled By: beauby

fbshipit-source-id: f2ce92b28e3d7ffdc2e85bcd78d321da15fec87e
2020-10-12 14:40:52 -07:00
Lucas Hosseini 3ac3ca0fab Update conda packages build. (#1422)
Summary:
This PR paves the way for nightly builds.

+ Get rid of cmake 3.17 manual install as cmake 3.18 is now available
in conda.
+ Update docker files for conda packages.
+ Specify CUDA architectures via CMake's `CMAKE_CUDA_ARCHITECTURES`.

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

Reviewed By: mdouze

Differential Revision: D23870447

Pulled By: beauby

fbshipit-source-id: 40ae7517e83356443a007a43261713e7e3a140d4
2020-09-23 10:18:25 -07:00
Lucas Hosseini 3a9eb87af2 Windows CI + conda packaging. (#1377)
Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/1377

Test Plan: Imported from OSS

Reviewed By: mdouze

Differential Revision: D23314728

Pulled By: beauby

fbshipit-source-id: fb74b1e832233aeeea47f3acdd606c6be65c143f
2020-08-25 16:58:25 -07:00
Lucas Hosseini c689bd010c Update conda packaging. (#1363)
Summary: Pull Request resolved: https://github.com/facebookresearch/faiss/pull/1363

Test Plan: Imported from OSS

Reviewed By: mdouze

Differential Revision: D23314731

Pulled By: beauby

fbshipit-source-id: b57a66cf5c44788837ee379fbb7f73adbdbf1274
2020-08-25 16:58:24 -07:00
Lucas Hosseini b9914eb30a Fix conda packages build reqs. 2020-03-25 18:16:37 +01:00
Lucas Hosseini 3d0ece0cb7
Run time detection of avx2 for conda packages. (#957)
* Build conda CPU packages with run-time detection of AVX2.

* Add cudatoolkit 10.1 to conda list.

* Default to sse4 on x86_64.
2019-09-20 20:17:01 +02:00
Lucas Hosseini efa81eec76 Prepare for v1.5.3 release. 2019-06-24 17:41:35 +02:00
Lucas Hosseini dacd5a9f51 Prepare for v1.5.2 release 2019-05-28 16:22:38 +02:00
Lucas Hosseini a8118acbc5
Facebook sync (May 2019) + relicense (#838)
Changelog:

- changed license: BSD+Patents -> MIT
- propagates exceptions raised in sub-indexes of IndexShards and IndexReplicas
- support for searching several inverted lists in parallel (parallel_mode != 0)
- better support for PQ codes where nbit != 8 or 16
- IVFSpectralHash implementation: spectral hash codes inside an IVF
- 6-bit per component scalar quantizer (4 and 8 bit were already supported)
- combinations of inverted lists: HStackInvertedLists and VStackInvertedLists
- configurable number of threads for OnDiskInvertedLists prefetching (including 0=no prefetch)
- more test and demo code compatible with Python 3 (print with parentheses)
- refactored benchmark code: data loading is now in a single file
2019-05-28 16:17:22 +02:00
Lucas Hosseini 7f5b22b0ff
Add conda packages metadata + tests. (#769)
+ Add conda packages metadata (now building Faiss using conda's toolchain);
+ add Dockerfile for building conda packages (for all CUDA versions);
+ add working Dockerfile building faiss on Centos7;
+ simplify GPU build;
+ avoid falling back to CPU-only version (python);
+ simplify TravisCI config;
+ update INSTALL.md;
+ add configure flag for specifying target architectures (--with-cuda-arch);
+ fix Makefile for gpu tests;
+ fix various Makefile issues;
+ remove stale file (gpu/utils/DeviceUtils.cpp).
2019-04-05 11:50:39 +02:00