Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade FAISS to 1.7.x #3509

Merged
merged 13 commits into from
Mar 5, 2021
Merged

Conversation

viclafargue
Copy link
Contributor

Answers #3459

@viclafargue viclafargue requested review from a team as code owners February 17, 2021 17:12
@viclafargue viclafargue added breaking Breaking change Build or Dep Issues related to building the code or dependencies improvement Improvement / enhancement to an existing function 3 - Ready for Review Ready for review by team and removed CUDA/C++ labels Feb 17, 2021
Copy link
Member

@dantegd dantegd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Version in the conda recipe

- libfaiss=1.6.3
needs to be updated as well

Also we need a PR to the integration repo to update the version: https://github.com/rapidsai/integration, though before that pehaps it would be a good idea to use the ci/gpu/build.sh script

# gpuci_conda_retry remove --force rapids-build-env rapids-notebook-env
to test CI in a commit before updating the integration repo

@dantegd dantegd added 4 - Waiting on Author Waiting for author to respond to review and removed 3 - Ready for Review Ready for review by team labels Feb 17, 2021
@JohnZed
Copy link
Contributor

JohnZed commented Feb 17, 2021

@viclafargue can you change this to target 0.19?

@viclafargue viclafargue changed the base branch from branch-0.18 to branch-0.19 February 18, 2021 09:19
@viclafargue viclafargue requested a review from a team as a code owner February 18, 2021 09:19
ci/gpu/build.sh Outdated Show resolved Hide resolved
viclafargue and others added 2 commits February 23, 2021 10:13
Co-authored-by: Dante Gama Dessavre <dante.gamadessavre@gmail.com>
@JohnZed
Copy link
Contributor

JohnZed commented Feb 25, 2021

rerun tests

@viclafargue
Copy link
Contributor Author

For some reason, with CUDA 11, conda installs libfaiss 1.6.3. There seems to be a conflict with the ucx/ucx-py packages.

@viclafargue
Copy link
Contributor Author

libfaiss 1.7.0 cuda110h8045045_3_cuda
-------------------------------------
file name   : libfaiss-1.7.0-cuda110h8045045_3_cuda.tar.bz2
name        : libfaiss
version     : 1.7.0
build       : cuda110h8045045_3_cuda
build number: 3
size        : 88.0 MB
license     : MIT
subdir      : linux-64
url         : https://conda.anaconda.org/conda-forge/linux-64/libfaiss-1.7.0-cuda110h8045045_3_cuda.tar.bz2
md5         : b5a957da2eceab8e4e96fbfecdb51f6c
timestamp   : 2021-02-19 18:45:02 UTC
constraints : 
  - faiss-proc * cuda
dependencies: 
  - __glibc >=2.17
  - _openmp_mutex >=4.5
  - cudatoolkit 11.0|11.0.*
  - libblas >=3.8.0,<4.0a0
  - libgcc-ng >=7.5.0
  - liblapack >=3.8.0,<4.0a0
  - libstdcxx-ng >=7.5.0

ucx 1.8.1+g6b29558 cuda11.0_0
-----------------------------
file name   : ucx-1.8.1+g6b29558-cuda11.0_0.tar.bz2
name        : ucx
version     : 1.8.1+g6b29558
build       : cuda11.0_0
build number: 0
size        : 7.5 MB
license     : BSD-3-Clause
subdir      : linux-64
url         : https://conda.anaconda.org/rapidsai/linux-64/ucx-1.8.1+g6b29558-cuda11.0_0.tar.bz2
md5         : 95422ca7e866294c179d992dbc9e4320
timestamp   : 2020-08-26 22:23:57 UTC
constraints : 
  - ucx-proc * gpu
dependencies: 
  - __glibc >=2.17,<3.0.a0
  - _openmp_mutex >=4.5
  - cudatoolkit 11.0|11.0.*
  - libgcc-ng >=7.5.0
  - libstdcxx-ng >=7.5.0

It doesn't look like there should be any conflict. The installation works on my machine. I'll rerun the tests.

@viclafargue
Copy link
Contributor Author

rerun tests

@github-actions github-actions bot removed the gpuCI gpuCI issue label Mar 4, 2021
@dantegd
Copy link
Member

dantegd commented Mar 4, 2021

@gpucibot merge

@dantegd
Copy link
Member

dantegd commented Mar 5, 2021

rerun tests

@codecov-io
Copy link

Codecov Report

Merging #3509 (e3bd4d5) into branch-0.19 (a3bfb36) will decrease coverage by 35.38%.
The diff coverage is n/a.

Impacted file tree graph

@@               Coverage Diff                @@
##           branch-0.19    #3509       +/-   ##
================================================
- Coverage        80.69%   45.30%   -35.39%     
================================================
  Files              227      223        -4     
  Lines            17615    17045      -570     
================================================
- Hits             14214     7722     -6492     
- Misses            3401     9323     +5922     
Flag Coverage Δ
dask 45.30% <ø> (+0.31%) ⬆️
non-dask ?

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
python/cuml/_thirdparty/__init__.py 0.00% <0.00%> (-100.00%) ⬇️
python/cuml/thirdparty_adapters/__init__.py 0.00% <0.00%> (-100.00%) ⬇️
python/cuml/_thirdparty/sklearn/exceptions.py 0.00% <0.00%> (-100.00%) ⬇️
python/cuml/experimental/explainer/__init__.py 0.00% <0.00%> (-100.00%) ⬇️
python/cuml/_thirdparty/sklearn/utils/__init__.py 0.00% <0.00%> (-100.00%) ⬇️
python/cuml/experimental/linear_model/__init__.py 0.00% <0.00%> (-100.00%) ⬇️
python/cuml/experimental/preprocessing/__init__.py 0.00% <0.00%> (-100.00%) ⬇️
...ython/cuml/experimental/hyperopt_utils/__init__.py 0.00% <0.00%> (-100.00%) ⬇️
...cuml/_thirdparty/sklearn/preprocessing/__init__.py 0.00% <0.00%> (-100.00%) ⬇️
python/cuml/benchmark/algorithms.py 0.00% <0.00%> (-94.39%) ⬇️
... and 129 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a3bfb36...e3bd4d5. Read the comment docs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4 - Waiting on Author Waiting for author to respond to review breaking Breaking change Build or Dep Issues related to building the code or dependencies CMake conda conda issue Cython / Python Cython or Python issue improvement Improvement / enhancement to an existing function
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants