Skip to content

Commit

Permalink
faiss-gpu to use 11.4.4 and be the only one supporting P100 (#3237)
Browse files Browse the repository at this point in the history 
Summary:
Considering that only GPU classic works on Pascal and only if compiled with cuda 11.4, this sets up the conda builds as follows.

tl;dr: Pascal will only be supported by faiss-gpu on cuda 11.

## faiss-gpu
1. build on cuda 11.4.4, supports Pascal, works with pytorch-cuda=11 (including hosts with cuda 12 drivers)
2. build on cuda 12.1.1, does NOT support Pascal, works with pytorch-cuda=12

## faiss-gpu-raft
1. build on cuda 11.8.0, does NOT support Pascal, works with pytorch-cuda=11.8
2. build on cuda 12.1.1, does NOT support Pascal, works with pytorch-cuda=12

The reason faiss-gpu-raft is built with and supports only 11.8 is due to the risk of clobbering otherwise between libraft and pytorch-cuda dependencies.

Pull Request resolved: #3237

Reviewed By: mdouze

Differential Revision: D53354121

Pulled By: algoriddle

fbshipit-source-id: 86108e975168759572f84922bf0ccef55ae75ef8
  • Loading branch information
@algoriddle @facebook-github-bot
algoriddle authored and facebook-github-bot committed Feb 2, 2024
1 parent 31a29d0 commit ed3f6e5
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 32 deletions.
44 changes: 22 additions & 22 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,10 +356,10 @@ workflows:
branches:
ignore: /.*/
- build_conda:
name: Linux x86_64 GPU packages (CUDA 11.8.0)
name: Linux x86_64 GPU packages (CUDA 11.4.4)
exec: linux-x86_64-gpu
label: main
cuda: "11.8.0"
cuda: "11.4.4"
cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
compiler_version: "11.2"
filters:
Expand All @@ -373,32 +373,32 @@ workflows:
label: main
raft: "ON"
cuda: "11.8.0"
cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
cuda_archs: "70-real;72-real;75-real;80;86-real"
compiler_version: "11.2"
filters:
tags:
only: /^v.*/
branches:
ignore: /.*/
- build_conda:
name: Linux x86_64 GPU packages (CUDA 12.1.0)
name: Linux x86_64 GPU packages (CUDA 12.1.1)
exec: linux-x86_64-gpu
label: main
cuda: "12.1.0"
cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
cuda: "12.1.1"
cuda_archs: "70-real;72-real;75-real;80;86-real"
compiler_version: "11.2"
filters:
tags:
only: /^v.*/
branches:
ignore: /.*/
- build_conda:
name: Linux x86_64 GPU w/ RAFT packages (CUDA 12.1.0)
name: Linux x86_64 GPU w/ RAFT packages (CUDA 12.1.1)
exec: linux-x86_64-gpu
label: main
raft: "ON"
cuda: "12.1.0"
cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
cuda: "12.1.1"
cuda_archs: "70-real;72-real;75-real;80;86-real"
compiler_version: "11.2"
filters:
tags:
Expand Down Expand Up @@ -447,35 +447,35 @@ workflows:
exec: linux-x86_64-cpu
label: nightly
- build_conda:
name: Linux x86_64 GPU nightlies (CUDA 11.8.0)
name: Linux x86_64 GPU nightlies (CUDA 11.4.4)
exec: linux-x86_64-gpu
cuda: "11.8.0"
label: nightly
cuda: "11.4.4"
cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
compiler_version: "11.2"
label: nightly
- build_conda:
name: Linux x86_64 GPU w/ RAFT nightlies (CUDA 11.8.0)
exec: linux-x86_64-gpu
label: nightly
raft: "ON"
cuda: "11.8.0"
cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
cuda_archs: "70-real;72-real;75-real;80;86-real"
compiler_version: "11.2"
label: nightly
- build_conda:
name: Linux x86_64 GPU nightlies (CUDA 12.1.0)
name: Linux x86_64 GPU nightlies (CUDA 12.1.1)
exec: linux-x86_64-gpu
cuda: "12.1.0"
cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
compiler_version: "11.2"
label: nightly
cuda: "12.1.1"
cuda_archs: "70-real;72-real;75-real;80;86-real"
compiler_version: "11.2"
- build_conda:
name: Linux x86_64 GPU w/ RAFT nightlies (CUDA 12.1.0)
name: Linux x86_64 GPU w/ RAFT nightlies (CUDA 12.1.1)
exec: linux-x86_64-gpu
label: nightly
raft: "ON"
cuda: "12.1.0"
cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
cuda: "12.1.1"
cuda_archs: "70-real;72-real;75-real;80;86-real"
compiler_version: "11.2"
label: nightly
- build_conda:
name: Windows x86_64 nightlies
exec: windows-x86_64-cpu
Expand Down
8 changes: 4 additions & 4 deletions conda/faiss-gpu-raft/meta.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
{% set suffix = "_nightly" if environ.get('PACKAGE_TYPE') == 'nightly' else "" %}
{% set number = GIT_DESCRIBE_NUMBER %}
{% if cudatoolkit == '11.8.0' %}
{% set cuda_constraints=">=11.8,<11.9" %}
{% set cuda_constraints=">=11.8,<12" %}
{% set libcublas_constraints=">=11.11,<12" %}
{% elif cudatoolkit == '12.1.0' %}
{% set cuda_constraints=">=12.1,<12.2" %}
{% set libcublas_constraints=">=12.1,<12.2" %}
{% elif cudatoolkit == '12.1.1' %}
{% set cuda_constraints=">=12.1,<13" %}
{% set libcublas_constraints=">=12.1,<13" %}
{% endif %}

package:
Expand Down
12 changes: 6 additions & 6 deletions conda/faiss-gpu/meta.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
{% set version = environ.get('GIT_DESCRIBE_TAG').lstrip('v') %}
{% set suffix = "_nightly" if environ.get('PACKAGE_TYPE') == 'nightly' else "" %}
{% set number = GIT_DESCRIBE_NUMBER %}
{% if cudatoolkit == '11.8.0' %}
{% set cuda_constraints=">=11.8,<11.9" %}
{% set libcublas_constraints=">=11.11,<12" %}
{% elif cudatoolkit == '12.1.0' %}
{% set cuda_constraints=">=12.1,<12.2" %}
{% set libcublas_constraints=">=12.1,<12.2" %}
{% if cudatoolkit == '11.4.4' %}
{% set cuda_constraints=">=11.4,<12" %}
{% set libcublas_constraints=">=11.6,<12" %}
{% elif cudatoolkit == '12.1.1' %}
{% set cuda_constraints=">=12.1,<13" %}
{% set libcublas_constraints=">=12.1,<13" %}
{% endif %}

package:
Expand Down

0 comments on commit ed3f6e5

Please sign in to comment.