Skip to content

Commit 148709f

Browse files
authored
Fix CPU Linux unittest job - part 1 (#3926)
1 parent cefdf9d commit 148709f

File tree

2 files changed

+53
-34
lines changed

2 files changed

+53
-34
lines changed

.github/scripts/unittest-linux/install.sh

Lines changed: 51 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,38 +25,57 @@ conda create -n ci -y python="${PYTHON_VERSION}"
2525
conda activate ci
2626

2727
# 1. Install PyTorch
28-
if [ -z "${CUDA_VERSION:-}" ] ; then
29-
if [ "${os}" == MacOSX ] ; then
30-
cudatoolkit=''
31-
else
32-
cudatoolkit="cpuonly"
33-
fi
34-
version="cpu"
35-
else
36-
version="$(python -c "print('.'.join(\"${CUDA_VERSION}\".split('.')[:2]))")"
37-
export CUDATOOLKIT_CHANNEL="nvidia"
38-
cudatoolkit="pytorch-cuda=${version}"
39-
fi
28+
# if [ -z "${CUDA_VERSION:-}" ] ; then
29+
# if [ "${os}" == MacOSX ] ; then
30+
# cudatoolkit=''
31+
# else
32+
# cudatoolkit="cpuonly"
33+
# fi
34+
# version="cpu"
35+
# else
36+
# version="$(python -c "print('.'.join(\"${CUDA_VERSION}\".split('.')[:2]))")"
37+
# export CUDATOOLKIT_CHANNEL="nvidia"
38+
# cudatoolkit="pytorch-cuda=${version}"
39+
# fi
4040

41-
printf "Installing PyTorch with %s\n" "${cudatoolkit}"
42-
(
43-
if [ "${os}" == MacOSX ] ; then
44-
# TODO: this can be removed as soon as linking issue could be resolved
45-
# see https://github.com/pytorch/pytorch/issues/62424 from details
46-
MKL_CONSTRAINT='mkl==2021.2.0'
47-
pytorch_build=pytorch
48-
else
49-
MKL_CONSTRAINT=''
50-
pytorch_build="pytorch[build="*${version}*"]"
51-
fi
52-
set -x
41+
# printf "Installing PyTorch with %s\n" "${cudatoolkit}"
42+
# (
43+
# if [ "${os}" == MacOSX ] ; then
44+
# # TODO: this can be removed as soon as linking issue could be resolved
45+
# # see https://github.com/pytorch/pytorch/issues/62424 from details
46+
# MKL_CONSTRAINT='mkl==2021.2.0'
47+
# pytorch_build=pytorch
48+
# else
49+
# MKL_CONSTRAINT=''
50+
# pytorch_build="pytorch[build="*${version}*"]"
51+
# fi
52+
# set -x
53+
54+
# if [[ -z "$cudatoolkit" ]]; then
55+
# conda install ${CONDA_CHANNEL_FLAGS:-} -y -c "pytorch-${UPLOAD_CHANNEL}" $MKL_CONSTRAINT "pytorch-${UPLOAD_CHANNEL}::${pytorch_build}"
56+
# else
57+
# conda install pytorch ${cudatoolkit} ${CONDA_CHANNEL_FLAGS:-} -y -c "pytorch-${UPLOAD_CHANNEL}" -c nvidia $MKL_CONSTRAINT
58+
# fi
59+
# )
60+
61+
export GPU_ARCH_TYPE="cpu" # TODO change this
62+
63+
case $GPU_ARCH_TYPE in
64+
cpu)
65+
GPU_ARCH_ID="cpu"
66+
;;
67+
cuda)
68+
VERSION_WITHOUT_DOT=$(echo "${GPU_ARCH_VERSION}" | sed 's/\.//')
69+
GPU_ARCH_ID="cu${VERSION_WITHOUT_DOT}"
70+
;;
71+
*)
72+
echo "Unknown GPU_ARCH_TYPE=${GPU_ARCH_TYPE}"
73+
exit 1
74+
;;
75+
esac
76+
PYTORCH_WHEEL_INDEX="https://download.pytorch.org/whl/${UPLOAD_CHANNEL}/${GPU_ARCH_ID}"
77+
pip install --progress-bar=off --pre torch --index-url="${PYTORCH_WHEEL_INDEX}"
5378

54-
if [[ -z "$cudatoolkit" ]]; then
55-
conda install ${CONDA_CHANNEL_FLAGS:-} -y -c "pytorch-${UPLOAD_CHANNEL}" $MKL_CONSTRAINT "pytorch-${UPLOAD_CHANNEL}::${pytorch_build}"
56-
else
57-
conda install pytorch ${cudatoolkit} ${CONDA_CHANNEL_FLAGS:-} -y -c "pytorch-${UPLOAD_CHANNEL}" -c nvidia $MKL_CONSTRAINT
58-
fi
59-
)
6079

6180
# 2. Install torchaudio
6281
conda install --quiet -y ninja cmake
@@ -76,8 +95,8 @@ fi
7695
# Note: installing librosa via pip fail because it will try to compile numba.
7796
(
7897
set -x
79-
conda install -y -c conda-forge ${NUMBA_DEV_CHANNEL} sox libvorbis 'librosa==0.10.0' parameterized 'requests>=2.20' 'ffmpeg>=6,<7'
80-
pip install kaldi-io SoundFile coverage pytest pytest-cov 'scipy==1.7.3' expecttest unidecode inflect Pillow sentencepiece pytorch-lightning 'protobuf<4.21.0' demucs tinytag pyroomacoustics flashlight-text git+https://github.com/kpu/kenlm
98+
conda install -y -c conda-forge ${NUMBA_DEV_CHANNEL} sox libvorbis librosa parameterized 'requests>=2.20' 'ffmpeg>=6,<7'
99+
pip install kaldi-io SoundFile coverage pytest pytest-cov scipy expecttest unidecode inflect Pillow sentencepiece pytorch-lightning 'protobuf<4.21.0' demucs tinytag pyroomacoustics flashlight-text git+https://github.com/kpu/kenlm
81100
)
82101
# Install fairseq
83102
git clone https://github.com/pytorch/fairseq

.github/workflows/unittest-linux-cpu.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
tests:
1414
strategy:
1515
matrix:
16-
# TODO add up to 3.13
17-
python_version: ["3.9", "3.10"]
16+
# TODO all from 3.9 to 3.13
17+
python_version: ["3.11"]
1818
fail-fast: false
1919
uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
2020
permissions:

0 commit comments

Comments
 (0)