frozenleaves/pytorch
1
0
Fork 0
mirror of https://github.com/pytorch/pytorch.git synced 2025-10-20 21:14:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move librosa and psutil installation from CI script to docker images build script (#20299)

Browse Source 
Summary:
pip install librosa randomly coredump, causes CI flakiness
Pull Request resolved: https://github.com/pytorch/pytorch/pull/20299

Differential Revision: D15276270

Pulled By: bddppq

fbshipit-source-id: 9105106f41aaacf620751290b016359ef7d665b3
This commit is contained in:
Junjie Bai
2019-05-09 13:42:44 -07:00
committed by Facebook Github Bot
parent e870b11ae6
commit 8c3a7bb57f
4 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/cimodel/data/caffe2_build_definitions.py
View File

@ -10,7 +10,7 @@ from cimodel.data.caffe2_build_data import CONFIG_TREE_DATA, TopLevelNode
DOCKER_IMAGE_PATH_BASE = "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/"
DOCKER_IMAGE_VERSION = 273
DOCKER_IMAGE_VERSION = 276
class Conf(object):

42
.circleci/config.yml
View File

@ -1198,144 +1198,144 @@ jobs:
caffe2_py2_gcc4_8_ubuntu14_04_build:
environment:
BUILD_ENVIRONMENT: "caffe2-py2-gcc4.8-ubuntu14.04-build"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc4.8-ubuntu14.04:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc4.8-ubuntu14.04:276"
<<: *caffe2_linux_build_defaults
caffe2_py2_gcc4_8_ubuntu14_04_test:
environment:
BUILD_ENVIRONMENT: "caffe2-py2-gcc4.8-ubuntu14.04-test"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc4.8-ubuntu14.04:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc4.8-ubuntu14.04:276"
resource_class: large
<<: *caffe2_linux_test_defaults
caffe2_py2_gcc4_9_ubuntu14_04_build:
environment:
BUILD_ENVIRONMENT: "caffe2-py2-gcc4.9-ubuntu14.04-build"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc4.9-ubuntu14.04:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc4.9-ubuntu14.04:276"
BUILD_ONLY: "1"
<<: *caffe2_linux_build_defaults
caffe2_py2_cuda8_0_cudnn7_ubuntu16_04_build:
environment:
BUILD_ENVIRONMENT: "caffe2-py2-cuda8.0-cudnn7-ubuntu16.04-build"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda8.0-cudnn7-ubuntu16.04:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda8.0-cudnn7-ubuntu16.04:276"
<<: *caffe2_linux_build_defaults
caffe2_py2_cuda8_0_cudnn7_ubuntu16_04_test:
environment:
BUILD_ENVIRONMENT: "caffe2-py2-cuda8.0-cudnn7-ubuntu16.04-test"
USE_CUDA_DOCKER_RUNTIME: "1"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda8.0-cudnn7-ubuntu16.04:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda8.0-cudnn7-ubuntu16.04:276"
resource_class: gpu.medium
<<: *caffe2_linux_test_defaults
caffe2_py2_cuda9_0_cudnn7_ubuntu16_04_build:
environment:
BUILD_ENVIRONMENT: "caffe2-py2-cuda9.0-cudnn7-ubuntu16.04-build"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.0-cudnn7-ubuntu16.04:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.0-cudnn7-ubuntu16.04:276"
<<: *caffe2_linux_build_defaults
caffe2_py2_cuda9_0_cudnn7_ubuntu16_04_test:
environment:
BUILD_ENVIRONMENT: "caffe2-py2-cuda9.0-cudnn7-ubuntu16.04-test"
USE_CUDA_DOCKER_RUNTIME: "1"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.0-cudnn7-ubuntu16.04:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.0-cudnn7-ubuntu16.04:276"
resource_class: gpu.medium
<<: *caffe2_linux_test_defaults
caffe2_cmake_cuda9_0_cudnn7_ubuntu16_04_build:
environment:
BUILD_ENVIRONMENT: "caffe2-cmake-cuda9.0-cudnn7-ubuntu16.04-build"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.0-cudnn7-ubuntu16.04:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.0-cudnn7-ubuntu16.04:276"
<<: *caffe2_linux_build_defaults
caffe2_cmake_cuda9_0_cudnn7_ubuntu16_04_test:
environment:
BUILD_ENVIRONMENT: "caffe2-cmake-cuda9.0-cudnn7-ubuntu16.04-test"
USE_CUDA_DOCKER_RUNTIME: "1"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.0-cudnn7-ubuntu16.04:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.0-cudnn7-ubuntu16.04:276"
resource_class: gpu.medium
<<: *caffe2_linux_test_defaults
caffe2_py2_cuda9_1_cudnn7_ubuntu16_04_build:
environment:
BUILD_ENVIRONMENT: "caffe2-py2-cuda9.1-cudnn7-ubuntu16.04-build"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.1-cudnn7-ubuntu16.04:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.1-cudnn7-ubuntu16.04:276"
<<: *caffe2_linux_build_defaults
caffe2_py2_cuda9_1_cudnn7_ubuntu16_04_test:
environment:
BUILD_ENVIRONMENT: "caffe2-py2-cuda9.1-cudnn7-ubuntu16.04-test"
USE_CUDA_DOCKER_RUNTIME: "1"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.1-cudnn7-ubuntu16.04:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.1-cudnn7-ubuntu16.04:276"
resource_class: gpu.medium
<<: *caffe2_linux_test_defaults
caffe2_py2_mkl_ubuntu16_04_build:
environment:
BUILD_ENVIRONMENT: "caffe2-py2-mkl-ubuntu16.04-build"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-mkl-ubuntu16.04:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-mkl-ubuntu16.04:276"
<<: *caffe2_linux_build_defaults
caffe2_py2_mkl_ubuntu16_04_test:
environment:
BUILD_ENVIRONMENT: "caffe2-py2-mkl-ubuntu16.04-test"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-mkl-ubuntu16.04:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-mkl-ubuntu16.04:276"
resource_class: large
<<: *caffe2_linux_test_defaults
caffe2_onnx_py2_gcc5_ubuntu16_04_build:
environment:
BUILD_ENVIRONMENT: "caffe2-onnx-py2-gcc5-ubuntu16.04-build"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc5-ubuntu16.04:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc5-ubuntu16.04:276"
<<: *caffe2_linux_build_defaults
caffe2_onnx_py2_gcc5_ubuntu16_04_test:
environment:
BUILD_ENVIRONMENT: "caffe2-onnx-py2-gcc5-ubuntu16.04-test"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc5-ubuntu16.04:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-gcc5-ubuntu16.04:276"
resource_class: large
<<: *caffe2_linux_test_defaults
caffe2_py2_clang3_8_ubuntu16_04_build:
environment:
BUILD_ENVIRONMENT: "caffe2-py2-clang3.8-ubuntu16.04-build"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-clang3.8-ubuntu16.04:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-clang3.8-ubuntu16.04:276"
BUILD_ONLY: "1"
<<: *caffe2_linux_build_defaults
caffe2_py2_clang3_9_ubuntu16_04_build:
environment:
BUILD_ENVIRONMENT: "caffe2-py2-clang3.9-ubuntu16.04-build"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-clang3.9-ubuntu16.04:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-clang3.9-ubuntu16.04:276"
BUILD_ONLY: "1"
<<: *caffe2_linux_build_defaults
caffe2_py2_clang7_ubuntu16_04_build:
environment:
BUILD_ENVIRONMENT: "caffe2-py2-clang7-ubuntu16.04-build"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-clang7-ubuntu16.04:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-clang7-ubuntu16.04:276"
BUILD_ONLY: "1"
<<: *caffe2_linux_build_defaults
caffe2_py2_android_ubuntu16_04_build:
environment:
BUILD_ENVIRONMENT: "caffe2-py2-android-ubuntu16.04-build"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-android-ubuntu16.04:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-android-ubuntu16.04:276"
BUILD_ONLY: "1"
<<: *caffe2_linux_build_defaults
caffe2_py2_cuda9_0_cudnn7_centos7_build:
environment:
BUILD_ENVIRONMENT: "caffe2-py2-cuda9.0-cudnn7-centos7-build"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.0-cudnn7-centos7:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.0-cudnn7-centos7:276"
<<: *caffe2_linux_build_defaults
caffe2_py2_cuda9_0_cudnn7_centos7_test:
environment:
BUILD_ENVIRONMENT: "caffe2-py2-cuda9.0-cudnn7-centos7-test"
USE_CUDA_DOCKER_RUNTIME: "1"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.0-cudnn7-centos7:273"
DOCKER_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/caffe2/py2-cuda9.0-cudnn7-centos7:276"
resource_class: gpu.medium
<<: *caffe2_linux_test_defaults

3
.jenkins/pytorch/test.sh
View File

@ -94,9 +94,6 @@ fi
if [[ "$BUILD_ENVIRONMENT" == *rocm* ]]; then
export PYTORCH_TEST_WITH_ROCM=1
# ROCm CI is using Caffe2 docker images, which doesn't have several packages
# needed in testing. We install them here.
pip install -q psutil "librosa>=0.6.2" --user
fi
if [[ "${BUILD_ENVIRONMENT}" == *-NO_AVX-* ]]; then

4
docker/caffe2/jenkins/common/install_python.sh
View File

@ -165,5 +165,7 @@ pip install --no-cache-dir \
mock \
typing \
typing-extensions \
pyyaml
pyyaml \
librosa>=0.6.2 \
psutil