Skip to content

Commit ed3f6e5

Browse files
algoriddlefacebook-github-bot
algoriddle
authored and
facebook-github-bot
committed
faiss-gpu to use 11.4.4 and be the only one supporting P100 (facebookresearch#3237)
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: facebookresearch#3237 Reviewed By: mdouze Differential Revision: D53354121 Pulled By: algoriddle fbshipit-source-id: 86108e975168759572f84922bf0ccef55ae75ef8
1 parent 31a29d0 commit ed3f6e5

File tree

3 files changed

+32
-32
lines changed

3 files changed

+32
-32
lines changed

‎.circleci/config.yml

+22-22
Original file line numberDiff line numberDiff line change
@@ -356,10 +356,10 @@ workflows:
356356
branches:
357357
ignore: /.*/
358358
- build_conda:
359-
name: Linux x86_64 GPU packages (CUDA 11.8.0)
359+
name: Linux x86_64 GPU packages (CUDA 11.4.4)
360360
exec: linux-x86_64-gpu
361361
label: main
362-
cuda: "11.8.0"
362+
cuda: "11.4.4"
363363
cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
364364
compiler_version: "11.2"
365365
filters:
@@ -373,32 +373,32 @@ workflows:
373373
label: main
374374
raft: "ON"
375375
cuda: "11.8.0"
376-
cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
376+
cuda_archs: "70-real;72-real;75-real;80;86-real"
377377
compiler_version: "11.2"
378378
filters:
379379
tags:
380380
only: /^v.*/
381381
branches:
382382
ignore: /.*/
383383
- build_conda:
384-
name: Linux x86_64 GPU packages (CUDA 12.1.0)
384+
name: Linux x86_64 GPU packages (CUDA 12.1.1)
385385
exec: linux-x86_64-gpu
386386
label: main
387-
cuda: "12.1.0"
388-
cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
387+
cuda: "12.1.1"
388+
cuda_archs: "70-real;72-real;75-real;80;86-real"
389389
compiler_version: "11.2"
390390
filters:
391391
tags:
392392
only: /^v.*/
393393
branches:
394394
ignore: /.*/
395395
- build_conda:
396-
name: Linux x86_64 GPU w/ RAFT packages (CUDA 12.1.0)
396+
name: Linux x86_64 GPU w/ RAFT packages (CUDA 12.1.1)
397397
exec: linux-x86_64-gpu
398398
label: main
399399
raft: "ON"
400-
cuda: "12.1.0"
401-
cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
400+
cuda: "12.1.1"
401+
cuda_archs: "70-real;72-real;75-real;80;86-real"
402402
compiler_version: "11.2"
403403
filters:
404404
tags:
@@ -447,35 +447,35 @@ workflows:
447447
exec: linux-x86_64-cpu
448448
label: nightly
449449
- build_conda:
450-
name: Linux x86_64 GPU nightlies (CUDA 11.8.0)
450+
name: Linux x86_64 GPU nightlies (CUDA 11.4.4)
451451
exec: linux-x86_64-gpu
452-
cuda: "11.8.0"
452+
label: nightly
453+
cuda: "11.4.4"
453454
cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
454455
compiler_version: "11.2"
455-
label: nightly
456456
- build_conda:
457457
name: Linux x86_64 GPU w/ RAFT nightlies (CUDA 11.8.0)
458458
exec: linux-x86_64-gpu
459+
label: nightly
459460
raft: "ON"
460461
cuda: "11.8.0"
461-
cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
462+
cuda_archs: "70-real;72-real;75-real;80;86-real"
462463
compiler_version: "11.2"
463-
label: nightly
464464
- build_conda:
465-
name: Linux x86_64 GPU nightlies (CUDA 12.1.0)
465+
name: Linux x86_64 GPU nightlies (CUDA 12.1.1)
466466
exec: linux-x86_64-gpu
467-
cuda: "12.1.0"
468-
cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
469-
compiler_version: "11.2"
470467
label: nightly
468+
cuda: "12.1.1"
469+
cuda_archs: "70-real;72-real;75-real;80;86-real"
470+
compiler_version: "11.2"
471471
- build_conda:
472-
name: Linux x86_64 GPU w/ RAFT nightlies (CUDA 12.1.0)
472+
name: Linux x86_64 GPU w/ RAFT nightlies (CUDA 12.1.1)
473473
exec: linux-x86_64-gpu
474+
label: nightly
474475
raft: "ON"
475-
cuda: "12.1.0"
476-
cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
476+
cuda: "12.1.1"
477+
cuda_archs: "70-real;72-real;75-real;80;86-real"
477478
compiler_version: "11.2"
478-
label: nightly
479479
- build_conda:
480480
name: Windows x86_64 nightlies
481481
exec: windows-x86_64-cpu

‎conda/faiss-gpu-raft/meta.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
{% set suffix = "_nightly" if environ.get('PACKAGE_TYPE') == 'nightly' else "" %}
88
{% set number = GIT_DESCRIBE_NUMBER %}
99
{% if cudatoolkit == '11.8.0' %}
10-
{% set cuda_constraints=">=11.8,<11.9" %}
10+
{% set cuda_constraints=">=11.8,<12" %}
1111
{% set libcublas_constraints=">=11.11,<12" %}
12-
{% elif cudatoolkit == '12.1.0' %}
13-
{% set cuda_constraints=">=12.1,<12.2" %}
14-
{% set libcublas_constraints=">=12.1,<12.2" %}
12+
{% elif cudatoolkit == '12.1.1' %}
13+
{% set cuda_constraints=">=12.1,<13" %}
14+
{% set libcublas_constraints=">=12.1,<13" %}
1515
{% endif %}
1616

1717
package:

‎conda/faiss-gpu/meta.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
{% set version = environ.get('GIT_DESCRIBE_TAG').lstrip('v') %}
77
{% set suffix = "_nightly" if environ.get('PACKAGE_TYPE') == 'nightly' else "" %}
88
{% set number = GIT_DESCRIBE_NUMBER %}
9-
{% if cudatoolkit == '11.8.0' %}
10-
{% set cuda_constraints=">=11.8,<11.9" %}
11-
{% set libcublas_constraints=">=11.11,<12" %}
12-
{% elif cudatoolkit == '12.1.0' %}
13-
{% set cuda_constraints=">=12.1,<12.2" %}
14-
{% set libcublas_constraints=">=12.1,<12.2" %}
9+
{% if cudatoolkit == '11.4.4' %}
10+
{% set cuda_constraints=">=11.4,<12" %}
11+
{% set libcublas_constraints=">=11.6,<12" %}
12+
{% elif cudatoolkit == '12.1.1' %}
13+
{% set cuda_constraints=">=12.1,<13" %}
14+
{% set libcublas_constraints=">=12.1,<13" %}
1515
{% endif %}
1616

1717
package:

0 commit comments

Comments
 (0)