Replace openjdk-11 with openjdk-17

mlcommons · May 19, 2024 · 9bde034 · 9bde034
1 parent 5838692
commit 9bde034
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/datasets/docker/Dockerfile b/datasets/docker/Dockerfile
@@ -26,7 +26,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get autoremove -y && \
     apt-get install -y --no-install-recommends \
        python3 python3-pip libpython3.6-dev python3.6-venv libgl1-mesa-glx libglib2.0 cython3 gcc make curl unzip libc++1-8 \
        git locales openssh-client ca-certificates tar gzip parallel \
-       zip bzip2 gnupg wget python3-six python3-pip libncurses5 openjdk-11-jdk-headless clang-format-10 golang-1.13-go build-essential
+       zip bzip2 gnupg wget python3-six python3-pip libncurses5 openjdk-17-jdk-headless clang-format-10 golang-1.13-go build-essential
 
 RUN pip3 install pip==21.3.1 setuptools==31.0.1
 RUN pip3 install tensorflow-cpu==1.15

diff --git a/docs/environment-setup/env-setup-android.md b/docs/environment-setup/env-setup-android.md
@@ -26,7 +26,7 @@ These steps are required to build native libs only.
     gnupg \
     make \
     python3 python3-pip \
-    openjdk-11-jdk-headless \
+    openjdk-17-jdk-headless \
     protobuf-compiler
   ```
 

diff --git a/flutter/android/docker/Dockerfile b/flutter/android/docker/Dockerfile
@@ -6,7 +6,7 @@ FROM ubuntu:20.04
 # JDK package downloads ~500 MB from slow mirrors, which can take a lot of time,
 #   so a separate layer for it makes image rebuild faster in case we change any other dependencies.
 RUN apt-get update >/dev/null && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    openjdk-11-jdk-headless && \
+    openjdk-17-jdk-headless && \
     rm -rf /var/lib/apt/lists/*
 RUN apt-get update >/dev/null && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     build-essential \
@@ -19,6 +19,7 @@ RUN apt-get update >/dev/null && DEBIAN_FRONTEND=noninteractive apt-get install
     make \
     protobuf-compiler \
     python3 \
+    python3-dev \
     python3-pip && \
     rm -rf /var/lib/apt/lists/*
 
@@ -40,9 +41,11 @@ RUN yes | sdkmanager --licenses >/dev/null
 RUN yes | sdkmanager \
     "platform-tools" \
     "build-tools;30.0.3" \
+    "build-tools;34.0.0" \
     "platforms;android-29" \
     "platforms;android-31" \
-    "platforms;android-33"
+    "platforms;android-33" \
+    "platforms;android-34"
 # Install NDK in a separate layer to decrease max layer size.
 RUN yes | sdkmanager "ndk;25.2.9519653"
 ENV ANDROID_NDK_ROOT=$ANDROID_SDK_ROOT/ndk/25.2.9519653
@@ -65,7 +68,7 @@ ENV GRADLE_USER_HOME=$HOME/.cache/.gradle
 ENV ANDROID_SDK_HOME=$HOME/.cache/.android
 
 RUN mkdir $ANDROID_SDK_HOME && \
-    PASSWD=$(pwgen -s -y 20 1) && keytool -genkey -v -keystore $ANDROID_SDK_HOME/debug.keystore \
+    PASSWD=$(pwgen -s -y 20 1) && keytool -genkey -v -keyalg RSA -keystore $ANDROID_SDK_HOME/debug.keystore \
     -storepass $PASSWD -alias androiddebugkey -keypass $PASSWD -dname "CN=Android Debug,O=Android,C=US"
 
 # Git repo will be mounted at '/image-workdir/project'

diff --git a/mobile_back_qti/README.md b/mobile_back_qti/README.md
@@ -28,6 +28,7 @@ Use your browser to download the SNPE SDK using the links above.
 Create your Github personal access token.
 
 ```shell
+export SNPE_SDK=</path/to/snpe-sdk>
 cd DLC/ && make
 ```
 

diff --git a/mobile_back_qti/docker/mlperf_dlc_prepare/Dockerfile b/mobile_back_qti/docker/mlperf_dlc_prepare/Dockerfile
@@ -28,7 +28,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get autoremove -y && \
     apt-get install -y --no-install-recommends \
        python3 python3-pip libpython3.8-dev python3.8-venv libgl1-mesa-glx libglib2.0-0 cython3 gcc make curl unzip libc++1-8 \
        git locales openssh-client ca-certificates tar gzip parallel \
-       zip bzip2 gnupg wget python3-six python3-pip libncurses5 openjdk-11-jdk-headless clang-format-10 golang-1.13-go build-essential
+       zip bzip2 gnupg wget python3-six python3-pip libncurses5 openjdk-17-jdk-headless clang-format-10 golang-1.13-go build-essential
 
 RUN pip3 install pip==21.3.1 setuptools==31.0.1
 RUN pip3 install tensorflow-cpu==2.13.1

diff --git a/tools/formatter/Dockerfile b/tools/formatter/Dockerfile
@@ -29,7 +29,7 @@ RUN mkdir -p ${FORMATTER_HOME}
 
 # Install Java
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    openjdk-11-jdk-headless
+    openjdk-17-jdk-headless
 
 # Add buildifier
 RUN apt-get update && apt-get install -y --no-install-recommends \