From 64502b381e86d02c549488dce8d5c98b08ef708b Mon Sep 17 00:00:00 2001 From: Frank Liu Date: Tue, 19 Dec 2023 17:12:21 -0800 Subject: [PATCH] [docs] Updates documents to use JDK 17 (#2898) --- apt.txt | 2 +- docker/README.md | 14 +++++++------- docker/tensorrt/Dockerfile | 2 +- docker/windows/Dockerfile | 2 +- docs/development/setup.md | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apt.txt b/apt.txt index 7083f85c374..c89953ff1f9 100644 --- a/apt.txt +++ b/apt.txt @@ -1 +1 @@ -openjdk-11-jdk +openjdk-17-jdk diff --git a/docker/README.md b/docker/README.md index 3177bec6c4d..0df33be9f83 100644 --- a/docker/README.md +++ b/docker/README.md @@ -19,17 +19,17 @@ docker build --build-arg version= You can use the [docker file](https://github.com/deepjavalibrary/djl/blob/master/docker/tensorrt/Dockerfile) provided by us. This docker file is a modification of the one provided by NVIDIA in -[TensorRT](https://github.com/NVIDIA/TensorRT/blob/8.4.1/docker/ubuntu-18.04.Dockerfile) to include JDK11. -By default this sets up a container using Ubuntu 18.04 and CUDA 11.6.2. You can build the container with other versions as follows, +[TensorRT](https://github.com/NVIDIA/TensorRT/blob/8.4.1/docker/ubuntu-18.04.Dockerfile) to include JDK17. +By default this sets up a container using Ubuntu 18.04 and CUDA 11.6.2. You can build the container with other versions as follows, but keep in mind the TensorRT software requirements outlined [here](https://github.com/NVIDIA/TensorRT#prerequisites): ```bash docker build --build-arg OS_VERSION= --build-arg CUDA_VERSION= ``` -To run the container, we recommend using `nvidia-docker run ...` to ensure cuda driver and runtime are compatible. +To run the container, we recommend using `nvidia-docker run ...` to ensure cuda driver and runtime are compatible. -We recommend that you follow the setup steps in the [TensorRT guide](https://github.com/NVIDIA/TensorRT) if you -need access to the full suite of tools TensorRT provides, such as `trtexec` which can convert onnx models to -uff tensorrt models. When following that guide, make sure to use the DJL provided -[docker file](https://github.com/deepjavalibrary/djl/blob/master/docker/tensorrt/Dockerfile) to enable JDK11 in the docker container. +We recommend that you follow the setup steps in the [TensorRT guide](https://github.com/NVIDIA/TensorRT) if you +need access to the full suite of tools TensorRT provides, such as `trtexec` which can convert onnx models to +uff tensorrt models. When following that guide, make sure to use the DJL provided +[docker file](https://github.com/deepjavalibrary/djl/blob/master/docker/tensorrt/Dockerfile) to enable JDK17 in the docker container. diff --git a/docker/tensorrt/Dockerfile b/docker/tensorrt/Dockerfile index 3a99bb9cb5d..94f81230e19 100644 --- a/docker/tensorrt/Dockerfile +++ b/docker/tensorrt/Dockerfile @@ -42,7 +42,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ fakeroot \ dh-make \ build-essential \ - openjdk-11-jdk && \ + openjdk-17-jdk && \ apt-get clean -y && rm -rf /var/lib/apt/lists/* # Install python3 diff --git a/docker/windows/Dockerfile b/docker/windows/Dockerfile index 31567b3168b..10989e8a4c8 100644 --- a/docker/windows/Dockerfile +++ b/docker/windows/Dockerfile @@ -11,4 +11,4 @@ RUN powershell -Command \ Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')); \ choco feature disable --name showDownloadProgress -RUN choco install -y openjdk11 +RUN choco install -y openjdk17 diff --git a/docs/development/setup.md b/docs/development/setup.md index e4eb73b2501..fb290eb0e3a 100644 --- a/docs/development/setup.md +++ b/docs/development/setup.md @@ -10,13 +10,13 @@ you can use the $JAVA_HOME environment variable to control which version of Java For ubuntu: ```bash -sudo apt-get install openjdk-11-jdk +sudo apt-get install openjdk-17-jdk ``` For centos ```bash -sudo yum install java-11-openjdk +sudo yum install java-17-openjdk ``` For Mac: @@ -24,7 +24,7 @@ For Mac: ```bash brew tap homebrew/cask-versions brew update -brew install --cask temurin11 +brew install --cask zulu17 ``` You can also download and install [Oracle JDK](https://www.oracle.com/technetwork/java/javase/overview/index.html)