Use the latest Docker image for LiteRT build.

LITERT_OSS_REV_ID: 700470825
google-ai-edge · Nov 26, 2024 · 3510082 · 3510082
1 parent a0c8a61
commit 3510082
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 9 deletions.
diff --git a/ci/build_pip_package_with_bazel.sh b/ci/build_pip_package_with_bazel.sh
@@ -32,7 +32,7 @@ if [ ! -z "${NIGHTLY_RELEASE_DATE}" ]; then
   export PROJECT_NAME="${PROJECT_NAME}_nightly"
 fi
 
-BUILD_DIR="${TENSORFLOW_LITE_DIR}/gen/litert_pip/${PYTHON}"
+BUILD_DIR="${TENSORFLOW_LITE_DIR}/gen/litert_pip/python3"
 TENSORFLOW_TARGET=${TENSORFLOW_TARGET:-$1}
 if [ "${TENSORFLOW_TARGET}" = "rpi" ]; then
   export TENSORFLOW_TARGET="armhf"

diff --git a/ci/build_pip_package_with_docker.sh b/ci/build_pip_package_with_docker.sh
@@ -22,7 +22,7 @@ ROOT_DIR="${SCRIPT_DIR}/.."
 if [ ! -d /root_dir ]; then
   # Running on host.
   cd ${SCRIPT_DIR}
-  docker build . -t tflite-builder -f tflite-py${DOCKER_PYTHON_VERSION}.Dockerfile
+  docker build . -t tflite-builder -f tflite-py3.Dockerfile
 
   docker run \
     -v ${SCRIPT_DIR}/../third_party/tensorflow:/third_party_tensorflow \
@@ -34,6 +34,9 @@ if [ ! -d /root_dir ]; then
     tflite-builder
   exit 0
 else
+  export CI_BUILD_PYTHON="python${DOCKER_PYTHON_VERSION}"
+  export HERMETIC_PYTHON_VERSION="${DOCKER_PYTHON_VERSION}"
+
   # Running inside docker container
   cd /third_party_tensorflow
 
@@ -53,8 +56,6 @@ else
 
   python3 -m pip install pip setuptools wheel
 
-  export HERMETIC_PYTHON_VERSION=${DOCKER_PYTHON_VERSION}
-
   cd /root_dir
   bash /script_dir/build_pip_package_with_bazel.sh
 fi
diff --git a/ci/tflite-android.Dockerfile b/ci/tflite-android.Dockerfile
@@ -1,4 +1,4 @@
-FROM tensorflow/build:2.18-python3.11
+FROM us-central1-docker.pkg.dev/tensorflow-sigs/tensorflow/ml-build:latest
 
 ENV ANDROID_DEV_HOME /android
 RUN mkdir -p ${ANDROID_DEV_HOME}

diff --git a/ci/tflite-py3.10.Dockerfile b/ci/tflite-py3.10.Dockerfile
diff --git a/ci/tflite-py3.11.Dockerfile b/ci/tflite-py3.11.Dockerfile
diff --git a/ci/tflite-py3.12.Dockerfile b/ci/tflite-py3.12.Dockerfile
diff --git a/ci/tflite-py3.9.Dockerfile b/ci/tflite-py3.9.Dockerfile
diff --git a/ci/tflite-py3.Dockerfile b/ci/tflite-py3.Dockerfile
@@ -0,0 +1 @@
+FROM us-central1-docker.pkg.dev/tensorflow-sigs/tensorflow/ml-build:latest
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		FROM us-central1-docker.pkg.dev/tensorflow-sigs/tensorflow/ml-build:latest