Skip to content

Commit 2ed600a

Browse files
gtwang01facebook-github-bot
authored andcommitted
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 Differential Revision: D59988036 Pulled By: gtwang01
1 parent 85df0e0 commit 2ed600a

File tree

3 files changed

+13
-15
lines changed

3 files changed

+13
-15
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

+12-10
Original file line numberDiff line numberDiff line change
@@ -41,30 +41,28 @@ 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"
52+
conda install -y -q cuda-toolkit -c "nvidia/label/cuda-12.4.0"
5753
fi
5854
5955
# install RAFT packages
6056
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
57+
conda install -y -q libraft cuda-version=12.4 cuda-toolkit -c rapidsai-nightly -c "nvidia/label/cuda-12.4.0" -c conda-forge
58+
conda install -y -q libraft cuda-version=12.4 cuda-toolkit -c rapidsai-nightly -c "nvidia/label/cuda-12.4.0" -c conda-forge
6259
fi
6360
6461
# install test packages
6562
conda install -y pytest
6663
if [ "${{ inputs.gpu }}" = "ON" ]; then
67-
conda install -y -q pytorch pytorch-cuda=11.8 -c pytorch -c nvidia/label/cuda-11.8.0
64+
conda install -y -q pytorch pytorch-cuda=12.4 -c pytorch -c nvidia/label/cuda-12.4.0
65+
conda install -y -q pytorch pytorch-cuda=12.4 -c pytorch -c nvidia/label/cuda-12.4.0
6866
else
6967
conda install -y -q pytorch -c pytorch
7068
fi
@@ -118,6 +116,7 @@ runs:
118116
run: |
119117
eval "$(conda shell.bash hook)"
120118
conda activate
119+
121120
cmake -B build \
122121
-DBUILD_TESTING=ON \
123122
-DBUILD_SHARED_LIBS=ON \
@@ -132,6 +131,9 @@ runs:
132131
-DCMAKE_CUDA_FLAGS=${{ runner.arch == 'X64' && '"-gencode arch=compute_75,code=sm_75"' || '' }} \
133132
.
134133
make -k -C build -j$(nproc)
134+
- name: Setup tmate session
135+
if: failure()
136+
uses: mxschmitt/action-tmate@v3
135137
- name: C++ tests
136138
if: inputs.rocm == 'OFF'
137139
shell: bash

.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')

0 commit comments

Comments
 (0)