Skip to content

Commit 5547f20

Browse files
authored
Update unit test base Docker image (#1193)
* Do not install sox system-wide, so that it will never get mixed up with static one torchaudio builds * Do not install cmake system-wide * Move libsndfile installation to Docker image
1 parent 7d50381 commit 5547f20

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ jobs:
388388
unittest_linux_cpu:
389389
<<: *binary_common
390390
docker:
391-
- image: "pytorch/torchaudio_unittest_base:manylinux"
391+
- image: pytorch/torchaudio_unittest_base:manylinux-20210121
392392
resource_class: 2xlarge+
393393
steps:
394394
- checkout
@@ -417,7 +417,7 @@ jobs:
417417
resource_class: gpu.small
418418
environment:
419419
<<: *environment
420-
image_name: pytorch/torchaudio_unittest_base:manylinux-cuda10.1-cudnn7-20201203
420+
image_name: pytorch/torchaudio_unittest_base:manylinux-cuda10.1-cudnn7-20210121
421421
steps:
422422
- checkout
423423
- attach_workspace:

.circleci/config.yml.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ jobs:
388388
unittest_linux_cpu:
389389
<<: *binary_common
390390
docker:
391-
- image: "pytorch/torchaudio_unittest_base:manylinux"
391+
- image: pytorch/torchaudio_unittest_base:manylinux-20210121
392392
resource_class: 2xlarge+
393393
steps:
394394
- checkout
@@ -417,7 +417,7 @@ jobs:
417417
resource_class: gpu.small
418418
environment:
419419
<<: *environment
420-
image_name: pytorch/torchaudio_unittest_base:manylinux-cuda10.1-cudnn7-20201203
420+
image_name: pytorch/torchaudio_unittest_base:manylinux-cuda10.1-cudnn7-20210121
421421
steps:
422422
- checkout
423423
- attach_workspace:

.circleci/unittest/linux/docker/Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,11 @@ RUN apt update && apt install -y \
4545
gfortran \
4646
git \
4747
libatlas3-base \
48+
libsndfile1 \
4849
wget \
4950
curl \
5051
make \
5152
file \
52-
sox \
53-
libsox-dev \
54-
libsox-fmt-all \
55-
cmake \
5653
pkg-config \
5754
&& rm -rf /var/lib/apt/lists/*
5855
COPY --from=builder /kaldi /kaldi

.circleci/unittest/linux/scripts/install.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ BUILD_TRANSDUCER=1 BUILD_SOX=1 python setup.py install
4343
# 3. Install Test tools
4444
printf "* Installing test tools\n"
4545
if [ "${os}" == Linux ] ; then
46-
# TODO: move this to docker
47-
apt install -y -q libsndfile1
4846
conda install -y -c conda-forge codecov pytest pytest-cov
4947
pip install kaldi-io 'librosa>=0.8.0' parameterized SoundFile scipy 'requests>=2.20'
5048
else

0 commit comments

Comments
 (0)