diff options
| author | Junjie Bai <bai@in.tum.de> | 2018-11-17 00:20:44 -0800 |
|---|---|---|
| committer | Facebook Github Bot <facebook-github-bot@users.noreply.github.com> | 2018-11-17 00:35:31 -0800 |
| commit | 4f0434d5ab6406da4a44a23252cc05526bfbc34e (patch) | |
| tree | e35f355470abfd20361a684729b0cb1f2d92a898 | |
| parent | fade36668ac4ae56d71022d6b86e5d9fcaebbf6c (diff) | |
| download | pytorch-4f0434d5ab6406da4a44a23252cc05526bfbc34e.tar.gz pytorch-4f0434d5ab6406da4a44a23252cc05526bfbc34e.tar.bz2 pytorch-4f0434d5ab6406da4a44a23252cc05526bfbc34e.zip | |
Revert "CircleCI: fix NCCL install (#14124)" (#14146)
Summary:
This reverts commit a1fa9d8cf9b2b0e7373ec420c2487d4dfd0e587c.
[pytorch_linux_trusty_py2_7_9_build](https://circleci.com/gh/pytorch/pytorch/270206?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-build-link/console):
```
Nov 17 07:37:27 + sudo apt-get -qq update
Nov 17 07:37:30 W: Ignoring Provides line with DepCompareOp for package gdb-minimal
Nov 17 07:37:30 W: You may want to run apt-get update to correct these problems
Nov 17 07:37:30 + sudo apt-get -qq install --allow-downgrades --allow-change-held-packages openmpi-bin libopenmpi-dev
Nov 17 07:37:30 E: Command line option --allow-downgrades is not understood
Nov 17 07:37:30 + cleanup
Nov 17 07:37:30 + retcode=100
Nov 17 07:37:30 + set +x
```
Pull Request resolved: https://github.com/pytorch/pytorch/pull/14146
Differential Revision: D13113912
Pulled By: bddppq
fbshipit-source-id: cd9d371cf72159f03d12a8b56ed5bd2060ebbe59
| -rw-r--r-- | .circleci/config.yml | 1 | ||||
| -rwxr-xr-x | .jenkins/pytorch/build.sh | 14 | ||||
| -rwxr-xr-x | .jenkins/pytorch/test.sh | 6 |
3 files changed, 10 insertions, 11 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index f9f6678d13..54a678b947 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,7 +34,6 @@ setup_ci_environment: &setup_ci_environment sudo apt-get -qq update sudo apt-get -qq remove linux-image-generic linux-headers-generic linux-generic sudo apt-get -qq install \ - apt \ linux-headers-$(uname -r) \ linux-image-generic \ moreutils \ diff --git a/.jenkins/pytorch/build.sh b/.jenkins/pytorch/build.sh index 5d2a658bad..72b8d4f03c 100755 --- a/.jenkins/pytorch/build.sh +++ b/.jenkins/pytorch/build.sh @@ -1,12 +1,5 @@ #!/bin/bash -# Required environment variable: $BUILD_ENVIRONMENT -# (This is set by default in the Docker images we build, so you don't -# need to set it yourself. - -COMPACT_JOB_NAME="${BUILD_ENVIRONMENT}-build" -source "$(dirname "${BASH_SOURCE[0]}")/common.sh" - # For distributed, four environmental configs: # (1) build with only NCCL # (2) build with NCCL and MPI @@ -30,6 +23,13 @@ if [[ "$BUILD_ENVIRONMENT" == "pytorch-linux-xenial-py3-clang5-asan" ]]; then exec "$(dirname "${BASH_SOURCE[0]}")/build-asan.sh" $* fi +# Required environment variable: $BUILD_ENVIRONMENT +# (This is set by default in the Docker images we build, so you don't +# need to set it yourself. + +COMPACT_JOB_NAME="${BUILD_ENVIRONMENT}-build" +source "$(dirname "${BASH_SOURCE[0]}")/common.sh" + echo "Python version:" python --version diff --git a/.jenkins/pytorch/test.sh b/.jenkins/pytorch/test.sh index cdd26693e1..223c7791e7 100755 --- a/.jenkins/pytorch/test.sh +++ b/.jenkins/pytorch/test.sh @@ -1,12 +1,12 @@ #!/bin/bash +COMPACT_JOB_NAME="${BUILD_ENVIRONMENT}-test" +source "$(dirname "${BASH_SOURCE[0]}")/common.sh" + # Required environment variable: $BUILD_ENVIRONMENT # (This is set by default in the Docker images we build, so you don't # need to set it yourself. -COMPACT_JOB_NAME="${BUILD_ENVIRONMENT}-test" -source "$(dirname "${BASH_SOURCE[0]}")/common.sh" - echo "Testing pytorch" if [ -n "${IN_CIRCLECI}" ]; then |