Skip to content

Commit e5f4647

Browse files
gtwang01facebook-github-bot
gtwang01
authored and
facebook-github-bot
committed
Unpin gxx_linux-64 requirement (facebookresearch#3655)
Summary: The TestPartitioning.TestPartitioningBigRange test case fails on gcc version 13.2. We can avoid this by requiring gcc version 11.2 where the test case works. Pull Request resolved: facebookresearch#3655 Test Plan: Check github workflows and test branches Reviewed By: ramilbakhshyiev Differential Revision: D59988036 Pulled By: gtwang01 fbshipit-source-id: ae6d7f7888c9d7a2e59f557e05dbd4f318983668
1 parent 85df0e0 commit e5f4647

File tree

5 files changed

+10
-27
lines changed

5 files changed

+10
-27
lines changed

‎.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- run:
3838
name: Install env using main channel
3939
command: |
40-
conda install -y -q python=3.11 cmake make swig mkl=2023 mkl-devel=2023 numpy scipy pytest gxx_linux-64=11.2 sysroot_linux-64
40+
conda install -y -q python=3.11 cmake make swig mkl=2023 mkl-devel=2023 numpy scipy pytest gxx_linux-64 sysroot_linux-64
4141
- run:
4242
name: Build all targets
4343
no_output_timeout: 30m

‎.github/actions/build_cmake/action.yml

+5-10
Original file line numberDiff line numberDiff line change
@@ -41,30 +41,25 @@ runs:
4141
4242
# install base packages for X86_64
4343
if [ "${{ runner.arch }}" = "X64" ]; then
44-
# TODO: unpin versions for gxx_linux-64 and sysroot_linux-64 and merge it with ARM64 below
45-
if [ "${{ inputs.rocm }}" = "ON" ]; then
46-
conda install -y -q -c conda-forge gxx_linux-64 sysroot_linux-64
47-
else
48-
conda install -y -q -c conda-forge gxx_linux-64=11.2 sysroot_linux-64=2.28
49-
fi
44+
# TODO: merge this with ARM64
45+
conda install -y -q -c conda-forge gxx_linux-64 sysroot_linux-64
5046
conda install -y -q mkl=2023 mkl-devel=2023
5147
fi
5248
53-
5449
# install CUDA packages
5550
if [ "${{ inputs.gpu }}" = "ON" ] && [ "${{ inputs.raft }}" = "OFF" ]; then
56-
conda install -y -q cuda-toolkit -c "nvidia/label/cuda-11.8.0"
51+
conda install -y -q cuda-toolkit -c "nvidia/label/cuda-12.4.0"
5752
fi
5853
5954
# install RAFT packages
6055
if [ "${{ inputs.raft }}" = "ON" ]; then
61-
conda install -y -q libraft cuda-version=11.8 cuda-toolkit -c rapidsai-nightly -c "nvidia/label/cuda-11.8.0" -c conda-forge
56+
conda install -y -q libraft cuda-version=12.4 cuda-toolkit -c rapidsai-nightly -c "nvidia/label/cuda-12.4.0" -c conda-forge
6257
fi
6358
6459
# install test packages
6560
conda install -y pytest
6661
if [ "${{ inputs.gpu }}" = "ON" ]; then
67-
conda install -y -q pytorch pytorch-cuda=11.8 -c pytorch -c nvidia/label/cuda-11.8.0
62+
conda install -y -q pytorch pytorch-cuda=12.4 -c pytorch -c nvidia/label/cuda-12.4.0
6863
else
6964
conda install -y -q pytorch -c pytorch
7065
fi

‎.github/actions/build_conda/action.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ inputs:
1313
description: "Enable RAFT support."
1414
default: ""
1515
required: false
16-
compiler_version:
17-
description: "compiler_version"
18-
default: "Compiler version for C/C++/CUDA."
19-
required: false
2016
runs:
2117
using: composite
2218
steps:
@@ -67,7 +63,7 @@ runs:
6763
shell: ${{ steps.choose_shell.outputs.shell }}
6864
working-directory: conda
6965
run: |
70-
conda build faiss-gpu --variants '{ "cudatoolkit": "${{ inputs.cuda }}", "c_compiler_version": "${{ inputs.compiler_version }}", "cxx_compiler_version": "${{ inputs.compiler_version }}" }' \
66+
conda build faiss-gpu --variants '{ "cudatoolkit": "${{ inputs.cuda }}" }' \
7167
-c pytorch -c nvidia/label/cuda-${{ inputs.cuda }} -c nvidia
7268
- name: Conda build (GPU) w/ anaconda upload
7369
if: inputs.label != '' && inputs.cuda != '' && inputs.raft == ''
@@ -76,14 +72,14 @@ runs:
7672
env:
7773
PACKAGE_TYPE: ${{ inputs.label }}
7874
run: |
79-
conda build faiss-gpu --variants '{ "cudatoolkit": "${{ inputs.cuda }}", "c_compiler_version": "${{ inputs.compiler_version }}", "cxx_compiler_version": "${{ inputs.compiler_version }}" }' \
75+
conda build faiss-gpu --variants '{ "cudatoolkit": "${{ inputs.cuda }}" }' \
8076
--user pytorch --label ${{ inputs.label }} -c pytorch -c nvidia/label/cuda-${{ inputs.cuda }} -c nvidia
8177
- name: Conda build (GPU w/ RAFT)
8278
if: inputs.label == '' && inputs.cuda != '' && inputs.raft != ''
8379
shell: ${{ steps.choose_shell.outputs.shell }}
8480
working-directory: conda
8581
run: |
86-
conda build faiss-gpu-raft --variants '{ "cudatoolkit": "${{ inputs.cuda }}", "c_compiler_version": "${{ inputs.compiler_version }}", "cxx_compiler_version": "${{ inputs.compiler_version }}" }' \
82+
conda build faiss-gpu-raft --variants '{ "cudatoolkit": "${{ inputs.cuda }}" }' \
8783
-c pytorch -c nvidia/label/cuda-${{ inputs.cuda }} -c nvidia -c rapidsai -c rapidsai-nightly -c conda-forge
8884
- name: Conda build (GPU w/ RAFT) w/ anaconda upload
8985
if: inputs.label != '' && inputs.cuda != '' && inputs.raft != ''
@@ -92,5 +88,5 @@ runs:
9288
env:
9389
PACKAGE_TYPE: ${{ inputs.label }}
9490
run: |
95-
conda build faiss-gpu-raft --variants '{ "cudatoolkit": "${{ inputs.cuda }}", "c_compiler_version": "${{ inputs.compiler_version }}", "cxx_compiler_version": "${{ inputs.compiler_version }}" }' \
91+
conda build faiss-gpu-raft --variants '{ "cudatoolkit": "${{ inputs.cuda }}" }' \
9692
--user pytorch --label ${{ inputs.label }} -c pytorch -c nvidia/label/cuda-${{ inputs.cuda }} -c nvidia -c rapidsai -c rapidsai-nightly -c conda-forge

‎.github/workflows/build.yml

-4
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ jobs:
169169
with:
170170
label: main
171171
cuda: "11.4.4"
172-
compiler_version: "11.2"
173172
linux-x86_64-GPU-RAFT-packages-CUDA11-8-0:
174173
name: Linux x86_64 GPU w/ RAFT packages (CUDA 11.8.0)
175174
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
@@ -187,7 +186,6 @@ jobs:
187186
label: main
188187
raft: "ON"
189188
cuda: "11.8.0"
190-
compiler_version: "11.2"
191189
linux-x86_64-GPU-packages-CUDA-12-1-1:
192190
name: Linux x86_64 GPU packages (CUDA 12.1.1)
193191
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
@@ -204,7 +202,6 @@ jobs:
204202
with:
205203
label: main
206204
cuda: "12.1.1"
207-
compiler_version: "11.2"
208205
linux-x86_64-GPU-RAFT-packages-CUDA12-1-1:
209206
name: Linux x86_64 GPU w/ RAFT packages (CUDA 12.1.1)
210207
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
@@ -222,7 +219,6 @@ jobs:
222219
label: main
223220
raft: "ON"
224221
cuda: "12.1.1"
225-
compiler_version: "11.2"
226222
windows-x86_64-packages:
227223
name: Windows x86_64 packages
228224
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')

‎.github/workflows/nightly.yml

-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ jobs:
3838
with:
3939
label: nightly
4040
cuda: "11.4.4"
41-
compiler_version: "11.2"
4241
linux-x86_64-GPU-RAFT-CUDA11-8-0-nightly:
4342
name: Linux x86_64 GPU w/ RAFT nightlies (CUDA 11.8.0)
4443
runs-on: 4-core-ubuntu-gpu-t4
@@ -57,7 +56,6 @@ jobs:
5756
label: nightly
5857
raft: "ON"
5958
cuda: "11.8.0"
60-
compiler_version: "11.2"
6159
linux-x86_64-GPU-CUDA-12-1-1-nightly:
6260
name: Linux x86_64 GPU nightlies (CUDA 12.1.1)
6361
runs-on: 4-core-ubuntu-gpu-t4
@@ -75,7 +73,6 @@ jobs:
7573
with:
7674
label: nightly
7775
cuda: "12.1.1"
78-
compiler_version: "11.2"
7976
linux-x86_64-GPU-RAFT-CUDA12-1-1-nightly:
8077
name: Linux x86_64 GPU w/ RAFT nightlies (CUDA 12.1.1)
8178
runs-on: 4-core-ubuntu-gpu-t4
@@ -94,7 +91,6 @@ jobs:
9491
label: nightly
9592
raft: "ON"
9693
cuda: "12.1.1"
97-
compiler_version: "11.2"
9894
windows-x86_64-nightly:
9995
name: Windows x86_64 nightlies
10096
runs-on: windows-2019

0 commit comments

Comments
 (0)