Skip to content

Commit 891b739

Browse files
narendasannarendasan
committed
refactor(//docker): Update containers for 0.2.0
Signed-off-by: Naren Dasan <[email protected]> Signed-off-by: Naren Dasan <[email protected]>
1 parent 674526e commit 891b739

File tree

5 files changed

+27
-19
lines changed

5 files changed

+27
-19
lines changed

‎docker/Dockerfile.20.06

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM nvcr.io/nvidia/pytorch:20.07-py3
2+
3+
RUN echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list \
4+
&& curl https://bazel.build/bazel-release.pub.gpg | apt-key add -
5+
6+
RUN apt-get update && apt-get install bazel-3.3.1 && rm -rf /var/lib/apt/lists/*
7+
RUN ln -s /usr/bin/bazel-3.3.1 /usr/bin/bazel
8+

‎docker/Dockerfile.docs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM nvcr.io/nvidia/tensorrt:20.03-py3
1+
FROM nvcr.io/nvidia/tensorrt:20.10-py3
22

33
RUN curl https://bazel.build/bazel-release.pub.gpg | apt-key add -
44
RUN echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list
55

6-
RUN apt-get update && apt-get install -y bazel-3.4.1 clang-format
7-
RUN ln -s /usr/bin/bazel-3.4.1 /usr/bin/bazel
6+
RUN apt-get update && apt-get install -y bazel-3.7.1 clang-format
7+
RUN ln -s /usr/bin/bazel-3.7.1 /usr/bin/bazel
88

99
# Workaround for bazel expecting both static and shared versions, we only use shared libraries inside container
1010
RUN cp /usr/lib/x86_64-linux-gnu/libnvinfer.so /usr/lib/x86_64-linux-gnu/libnvinfer_static.a

‎docker/WORKSPACE.docker

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ git_repository(
3535
# CUDA should be installed on the system locally
3636
new_local_repository(
3737
name = "cuda",
38-
path = "/usr/local/cuda-10.2/",
38+
path = "/usr/local/cuda/",
3939
build_file = "@//third_party/cuda:BUILD",
4040
)
4141

@@ -53,16 +53,16 @@ http_archive(
5353
name = "libtorch",
5454
build_file = "@//third_party/libtorch:BUILD",
5555
strip_prefix = "libtorch",
56-
urls = ["https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-1.6.0.zip"],
57-
sha256 = "fded948bd2dbee625cee33ebbd4843a69496729389e0200a90fbb667cdaeeb69"
56+
sha256 = "117f6dd65b7267839197397edd0b10fd2900b0f291e3e54b0b800caefc31bcb6",
57+
urls = ["https://download.pytorch.org/libtorch/cu110/libtorch-cxx11-abi-shared-with-deps-1.7.1%2Bcu110.zip"],
5858
)
5959

6060
http_archive(
6161
name = "libtorch_pre_cxx11_abi",
6262
build_file = "@//third_party/libtorch:BUILD",
6363
strip_prefix = "libtorch",
64-
sha256 = "141bb229f4bbf905541096cf8705785e7b0c79e37ca1e5db9d372730b1b9abd7",
65-
urls = ["https://download.pytorch.org/libtorch/cu102/libtorch-shared-with-deps-1.6.0.zip"],
64+
sha256 = "c77f926afd55d7e860ec9c7abc992c25be77c89771c3ec6fcc13ea42f07d46df",
65+
urls = ["https://download.pytorch.org/libtorch/cu110/libtorch-shared-with-deps-1.7.1%2Bcu110.zip"],
6666
)
6767

6868
####################################################################################

‎notebooks/Dockerfile.notebook

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
FROM nvcr.io/nvidia/tensorrt:20.03-py3
1+
FROM nvcr.io/nvidia/tensorrt:20.09-py3
22

33
RUN curl https://bazel.build/bazel-release.pub.gpg | apt-key add -
44
RUN echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list
55

6-
RUN apt update && apt install bazel-3.4.1
7-
RUN ln -s /usr/bin/bazel-3.4.1 /usr/bin/bazel
6+
RUN apt-get update && apt-get install bazel-3.7.1
7+
RUN ln -s /usr/bin/bazel-3.7.1 /usr/bin/bazel
88

99
RUN pip install pillow==4.3.0
10-
RUN pip install torch==1.6.0
11-
RUN pip install torchvision==0.7.0
10+
RUN pip install torch==1.7.1
11+
RUN pip install torchvision==0.8.2
1212
RUN pip install notebook
1313

1414
COPY . /workspace/TRTorch
@@ -21,7 +21,7 @@ RUN bazel build //:libtrtorch --compilation_mode opt
2121
WORKDIR /workspace/TRTorch/py
2222

2323
# Locale is not set by default
24-
RUN apt update && apt install -y locales && locale-gen en_US.UTF-8
24+
RUN apt-get update && apt-get install -y locales && locale-gen en_US.UTF-8
2525
ENV LANG en_US.UTF-8
2626
ENV LANGUAGE en_US:en
2727
ENV LC_ALL en_US.UTF-8

‎notebooks/WORKSPACE.notebook

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ git_repository(
3535
# CUDA should be installed on the system locally
3636
new_local_repository(
3737
name = "cuda",
38-
path = "/usr/local/cuda-10.2/",
38+
path = "/usr/local/cuda/",
3939
build_file = "@//third_party/cuda:BUILD",
4040
)
4141

@@ -53,16 +53,16 @@ http_archive(
5353
name = "libtorch",
5454
build_file = "@//third_party/libtorch:BUILD",
5555
strip_prefix = "libtorch",
56-
urls = ["https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-1.6.0.zip"],
57-
sha256 = "fded948bd2dbee625cee33ebbd4843a69496729389e0200a90fbb667cdaeeb69"
56+
sha256 = "117f6dd65b7267839197397edd0b10fd2900b0f291e3e54b0b800caefc31bcb6",
57+
urls = ["https://download.pytorch.org/libtorch/cu110/libtorch-cxx11-abi-shared-with-deps-1.7.1%2Bcu110.zip"],
5858
)
5959

6060
http_archive(
6161
name = "libtorch_pre_cxx11_abi",
6262
build_file = "@//third_party/libtorch:BUILD",
6363
strip_prefix = "libtorch",
64-
sha256 = "141bb229f4bbf905541096cf8705785e7b0c79e37ca1e5db9d372730b1b9abd7",
65-
urls = ["https://download.pytorch.org/libtorch/cu102/libtorch-shared-with-deps-1.6.0.zip"],
64+
sha256 = "c77f926afd55d7e860ec9c7abc992c25be77c89771c3ec6fcc13ea42f07d46df",
65+
urls = ["https://download.pytorch.org/libtorch/cu110/libtorch-shared-with-deps-1.7.1%2Bcu110.zip"],
6666
)
6767

6868
####################################################################################

0 commit comments

Comments
 (0)