diff --git a/build.gradle b/build.gradle index d0acc814a..3889e60fd 100644 --- a/build.gradle +++ b/build.gradle @@ -45,8 +45,8 @@ configure(javaProjects()) { compileJava { options.encoding = "UTF-8" - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 options.compilerArgs << "--release" << "11" << "-proc:none" << "-Xlint:all,-options,-static" << "-Werror" } compileTestJava { @@ -79,11 +79,9 @@ configure(javaProjects()) { // tensorflow mobilenet and resnet require more cpu memory maxHeapSize = "4096m" doFirst { - if (JavaVersion.current() != JavaVersion.VERSION_1_8) { - jvmArgs = [ - '--add-opens', "java.base/jdk.internal.loader=ALL-UNNAMED" - ] - } + jvmArgs = [ + '--add-opens', "java.base/jdk.internal.loader=ALL-UNNAMED" + ] } useTestNG() { diff --git a/serving/docker/Dockerfile b/serving/docker/Dockerfile index 06317e270..25aadcfed 100644 --- a/serving/docker/Dockerfile +++ b/serving/docker/Dockerfile @@ -34,7 +34,7 @@ RUN chmod +x /usr/local/bin/dockerd-entrypoint.sh EXPOSE 8080 WORKDIR /opt/djl -ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 ENV TF_NUM_INTEROP_THREADS=1 ENV TF_NUM_INTRAOP_THREADS=1 ENV TF_CPP_MIN_LOG_LEVEL=1 diff --git a/serving/docker/aarch64.Dockerfile b/serving/docker/aarch64.Dockerfile index 19c7e1bef..242309fa5 100644 --- a/serving/docker/aarch64.Dockerfile +++ b/serving/docker/aarch64.Dockerfile @@ -18,7 +18,7 @@ EXPOSE 8080 COPY dockerd-entrypoint.sh /usr/local/bin/dockerd-entrypoint.sh RUN chmod +x /usr/local/bin/dockerd-entrypoint.sh WORKDIR /opt/djl -ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-arm64 +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-arm64 ENV JAVA_OPTS="-Xmx1g -Xms1g -XX:+ExitOnOutOfMemoryError -Dai.djl.default_engine=PyTorch" ENV MODEL_SERVER_HOME=/opt/djl ENV HUGGINGFACE_HUB_CACHE=/tmp/.cache/huggingface/hub diff --git a/serving/docker/deepspeed.Dockerfile b/serving/docker/deepspeed.Dockerfile index 3c75b7aef..06960c173 100644 --- a/serving/docker/deepspeed.Dockerfile +++ b/serving/docker/deepspeed.Dockerfile @@ -43,7 +43,7 @@ EXPOSE 8080 COPY dockerd-entrypoint.sh /usr/local/bin/dockerd-entrypoint.sh RUN chmod +x /usr/local/bin/dockerd-entrypoint.sh WORKDIR /opt/djl -ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 # ENV NO_OMP_NUM_THREADS=true ENV JAVA_OPTS="-Xmx1g -Xms1g -XX:+ExitOnOutOfMemoryError -Dai.djl.util.cuda.folk=true" ENV MODEL_SERVER_HOME=/opt/djl diff --git a/serving/docker/pytorch-gpu.Dockerfile b/serving/docker/pytorch-gpu.Dockerfile index 5799e0934..be4d3a950 100644 --- a/serving/docker/pytorch-gpu.Dockerfile +++ b/serving/docker/pytorch-gpu.Dockerfile @@ -25,7 +25,7 @@ COPY config.properties /opt/djl/conf/ COPY dockerd-entrypoint.sh /usr/local/bin/dockerd-entrypoint.sh WORKDIR /opt/djl -ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 # ENV NO_OMP_NUM_THREADS=true ENV MODEL_SERVER_HOME=/opt/djl ENV DJL_CACHE_DIR=/tmp/.djl.ai @@ -75,4 +75,4 @@ LABEL com.amazonaws.sagemaker.capabilities.multi-models="true" LABEL com.amazonaws.sagemaker.capabilities.accept-bind-to-port="true" LABEL djl-version=$djl_version LABEL cuda-version=$cuda_version -LABEL torch-version=$torch_version \ No newline at end of file +LABEL torch-version=$torch_version diff --git a/serving/docker/pytorch-inf2.Dockerfile b/serving/docker/pytorch-inf2.Dockerfile index 7ec811a8a..b58e0fd88 100644 --- a/serving/docker/pytorch-inf2.Dockerfile +++ b/serving/docker/pytorch-inf2.Dockerfile @@ -32,7 +32,7 @@ ENV PATH="/opt/aws/neuron/bin:${PATH}" COPY dockerd-entrypoint.sh /usr/local/bin/dockerd-entrypoint.sh RUN chmod +x /usr/local/bin/dockerd-entrypoint.sh WORKDIR /opt/djl -ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 # ENV NO_OMP_NUM_THREADS=true ENV MODEL_SERVER_HOME=/opt/djl ENV DJL_CACHE_DIR=/tmp/.djl.ai diff --git a/serving/docker/scripts/install_djl_serving.sh b/serving/docker/scripts/install_djl_serving.sh index 3d459ae0b..50d5b04b8 100755 --- a/serving/docker/scripts/install_djl_serving.sh +++ b/serving/docker/scripts/install_djl_serving.sh @@ -10,7 +10,7 @@ if [ -z "$PYTORCH_JNI" ]; then apt-get update DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ fakeroot \ - openjdk-11-jdk-headless \ + openjdk-17-jdk-headless \ curl \ jq \ unzip diff --git a/serving/docker/tensorrt-llm.Dockerfile b/serving/docker/tensorrt-llm.Dockerfile index a524a99db..50c646ac7 100644 --- a/serving/docker/tensorrt-llm.Dockerfile +++ b/serving/docker/tensorrt-llm.Dockerfile @@ -31,7 +31,7 @@ EXPOSE 8080 COPY dockerd-entrypoint-with-cuda-compat.sh /usr/local/bin/dockerd-entrypoint.sh RUN chmod +x /usr/local/bin/dockerd-entrypoint.sh WORKDIR /opt/djl -ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 # ENV NO_OMP_NUM_THREADS=true ENV JAVA_OPTS="-Xmx1g -Xms1g -XX:+ExitOnOutOfMemoryError -Dai.djl.util.cuda.folk=true" ENV MODEL_SERVER_HOME=/opt/djl