diff options
| author | bddppq <bai@in.tum.de> | 2018-02-20 12:10:17 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-20 12:10:17 -0800 |
| commit | 7283d5194a71e5fb47baa7025f7d3874b8fab3c6 (patch) | |
| tree | 9dd058f109b0f911e99eec432f46cb0c4ab2fb22 | |
| parent | 639d1c7c5e738baef49cb3291ffa91d39a7da604 (diff) | |
| download | pytorch-7283d5194a71e5fb47baa7025f7d3874b8fab3c6.tar.gz pytorch-7283d5194a71e5fb47baa7025f7d3874b8fab3c6.tar.bz2 pytorch-7283d5194a71e5fb47baa7025f7d3874b8fab3c6.zip | |
Avoid having two protobuf on ubuntu14.04 (#1989)
* Avoid having two protobuf in ubuntu14.04
* Fix indent
| -rwxr-xr-x | docker/jenkins/common/install_base.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/jenkins/common/install_base.sh b/docker/jenkins/common/install_base.sh index 9edd1054ff..6c005797fa 100755 --- a/docker/jenkins/common/install_base.sh +++ b/docker/jenkins/common/install_base.sh @@ -41,16 +41,18 @@ install_ubuntu() { libleveldb-dev \ liblmdb-dev \ libopencv-dev \ - libprotobuf-dev \ libpthread-stubs0-dev \ libsnappy-dev \ - protobuf-compiler \ sudo # Ubuntu 14.04 ships with protobuf 2.5, but ONNX needs protobuf >= 2.6 # so we install that here if on 14.04 if [[ "$UBUNTU_VERSION" == 14.04 ]]; then install_protobuf_26 + else + apt-get install -y --no-install-recommends \ + libprotobuf-dev \ + protobuf-compiler fi # Cleanup |