Update ITEX XPU docker images (#581)

Signed-off-by: Srikanth Ramakrishna <[email protected]>
intel · Jan 3, 2025 · add67c7 · add67c7
1 parent 06ab81c
commit add67c7
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 23 deletions.
diff --git a/tensorflow/Dockerfile b/tensorflow/Dockerfile
@@ -57,7 +57,7 @@ ENV TF_ENABLE_ONEDNN_OPTS=1
 WORKDIR /
 COPY requirements.txt .
 
-RUN conda run -n idp python -m pip install --no-cache-dir -r requirements.txt && \
+RUN python -m pip install --no-cache-dir -r requirements.txt && \
     rm -rf requirements.txt && \
     conda clean -y --all
 

diff --git a/tensorflow/README.md b/tensorflow/README.md
@@ -16,7 +16,8 @@ The images below include support for both CPU and GPU optimizations:
 
 | Tag(s)                 | TensorFlow  | ITEX           | Driver  | Dockerfile      |
 | ---------------------- | ----------- | -------------- | ------- | --------------- |
-| `2.15.0.1-xpu-pip-base`, `xpu`  | [v2.15.1]   | [v2.15.0.1]    | [803.63]| [v0.4.0-Beta]   |
+| `2.15.0.2-xpu-pip-base`, `xpu` | [v2.15.1]   | [v2.15.0.2]    | [1057]| [v0.4.0-Beta]   |
+| `2.15.0.1-xpu-pip-base`  | [v2.15.1]   | [v2.15.0.1]    | [803.63]| [v0.4.0-Beta]   |
 | `2.15.0.0-xpu`         | [v2.15.0]   | [v2.15.0.0]    | [803]   | [v0.4.0-Beta]   |
 | `2.14.0.1-xpu`         | [v2.14.1]   | [v2.14.0.1]    | [736]   | [v0.3.4]        |
 | `2.13.0.0-xpu`         | [v2.13.0]   | [v2.13.0.0]    | [647]   | [v0.2.3]        |
@@ -37,6 +38,7 @@ The images below additionally include [Jupyter Notebook](https://jupyter.org/) s
 
 | Tag(s)        | TensorFlow  | IPEX          | Driver | Dockerfile      |
 | ------------- | ----------- | ------------- | ------ | --------------- |
+| `2.15.0.2-xpu-pip-jupyter` | [v2.15.1]   | [v2.15.0.2]    | [1057]| [v0.4.0-Beta]   |
 | `2.15.0.1-xpu-pip-jupyter` | [v2.15.1] | [v2.15.0.1]    | [803.63]| [v0.4.0-Beta]   |
 | `xpu-jupyter` | [v2.14.1]   | [v2.14.0.1]   | [736]  | [v0.3.4]   |
 
@@ -49,7 +51,7 @@ docker run -it --rm \
     --device /dev/dri \
     -v /dev/dri/by-path:/dev/dri/by-path \
     --ipc=host \
-    intel/intel-extension-for-tensorflow:2.15.0.1-xpu-pip-jupyter
+    intel/intel-extension-for-tensorflow:2.15.0.2-xpu-pip-jupyter
 ```
 
 After running the command above, copy the URL (something like `http://127.0.0.1:$PORT/?token=***`) into your browser to access the notebook server.
@@ -277,13 +279,15 @@ The images below are built only with CPU and GPU optimizations and include [Inte
 
 | Tag(s)           | Pytorch  | ITEX         | Driver | Dockerfile      |
 | ---------------- | -------- | ------------ | -------- | ------ |
+| `2.15.0.2-xpu-idp-base` | [v2.15.1]   | [v2.15.0.2]  | [1057]  | [v0.4.0-Beta] |
 | `2.15.0.1-xpu-idp-base` | [v2.15.1]   | [v2.15.0.1]  | [803]  | [v0.4.0-Beta] |
 | `2.15.0-xpu-idp-base` | [v2.15.0]   | [v2.15.0.0]  | [803]  | [v0.4.0-Beta] |
 
 The images below additionally include [Jupyter Notebook](https://jupyter.org/) server:
 
 | Tag(s)                | Pytorch  | IPEX          | Driver | Jupyter Port | Dockerfile      |
 | --------------------- | -------- | ------------- | ------ | ------------ | --------------- |
+| `2.15.0.2-xpu-idp-jupyter` | [v2.15.1] | [v2.15.0.2]  | [1057]  | `8888`   | [v0.4.0-Beta]   |
 | `2.15.0.1-xpu-idp-jupyter` | [v2.15.1] | [v2.15.0.1]  | [803]  | `8888`   | [v0.4.0-Beta]   |
 | `2.15.0-xpu-idp-jupyter` | [v2.1.0] | [v2.15.0.0]  | [803]  | `8888`   | [v0.4.0-Beta]   |
 
@@ -342,6 +346,7 @@ It is the image user's responsibility to ensure that any use of The images below
 [v2.14.1]: https://github.com/tensorflow/tensorflow/releases/tag/v2.14.1
 [v2.13.0]: https://github.com/tensorflow/tensorflow/releases/tag/v2.13.0
 
+[v2.15.0.2]: https://github.com/intel/intel-extension-for-tensorflow/releases/tag/v2.15.0.2
 [v2.15.0.1]: https://github.com/intel/intel-extension-for-tensorflow/releases/tag/v2.15.0.1
 [v2.15.0.0]: https://github.com/intel/intel-extension-for-tensorflow/releases/tag/v2.15.0.0
 [v2.14.0.1]: https://github.com/intel/intel-extension-for-tensorflow/releases/tag/v2.14.0.1
@@ -350,6 +355,7 @@ It is the image user's responsibility to ensure that any use of The images below
 [v0.28.1]: https://github.com/horovod/horovod/releases/tag/v0.28.1
 [v0.28.0]: https://github.com/horovod/horovod/releases/tag/v0.28.0
 
+[1057]: https://dgpu-docs.intel.com/releases/packages.html?release=Rolling+2448.13&os=Ubuntu+22.04
 [803.63]: https://dgpu-docs.intel.com/releases/LTS_803.63_20240617.html
 [803]: https://dgpu-docs.intel.com/releases/LTS_803.29_20240131.html
 [736]: https://dgpu-docs.intel.com/releases/stable_736_25_20231031.html

diff --git a/tensorflow/docker-compose.yaml b/tensorflow/docker-compose.yaml
@@ -27,25 +27,25 @@ services:
         GITHUB_RUN_NUMBER: ${GITHUB_RUN_NUMBER:-0}
         MINIFORGE_VERSION: ${MINIFORGE_VERSION:-Linux-x86_64}
         PACKAGE_OPTION: ${PACKAGE_OPTION:-pip}
-        PYTHON_VERSION: ${PYTHON_VERSION:-3.10}
+        PYTHON_VERSION: ${PYTHON_VERSION:-3.11}
         REGISTRY: ${REGISTRY}
         REPO: ${REPO}
         TF_VERSION: ${TF_VERSION:-2.15.1}
       target: tf-base-${PACKAGE_OPTION:-pip}
       context: .
       labels:
-        dependency.python: ${PYTHON_VERSION:-3.10}
+        dependency.python: ${PYTHON_VERSION:-3.11}
         dependency.python.pip: requirements.txt
         docs: tensorflow
-        org.opencontainers.base.name: "intel/python:3.10-core"
+        org.opencontainers.base.name: "intel/python:3.11-full"
         org.opencontainers.image.name: "intel/intel-optimized-tensorflow"
         org.opencontainers.image.title: "Intel® Extension for TensorFlow Base Image"
         org.opencontainers.image.version: ${TF_VERSION:-2.15.1}-${PACKAGE_OPTION:-pip}-base
     depends_on:
       - ${PACKAGE_OPTION:-pip}
     command: >
       python -c 'import tensorflow as tf; print("Tensorflow Version:", tf.__version__)'
-    image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-${TF_VERSION:-2.15.1}-base
+    image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-${TF_VERSION:-2.15.1}-base
     pull_policy: always
   jupyter:
     build:
@@ -61,20 +61,19 @@ services:
       http_proxy: ${http_proxy}
       https_proxy: ${https_proxy}
     extends: tf-base
-    image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-${TF_VERSION:-2.15.1}-jupyter
+    image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-${TF_VERSION:-2.15.1}-jupyter
     network_mode: host
     volumes:
       - /$PWD:/jupyter
   itex-xpu-base:
     build:
       args:
-        TF_VER: ${TF_VER:-2.15.1}
         no_proxy: ''
         NO_PROXY: ''
-        PYTHON_BASE: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-xpu-base
+        PYTHON_BASE: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-xpu-base
       labels:
         dependency.idp.pip: false
-        org.opencontainers.base.name: "intel/python:3.10-core"
+        org.opencontainers.base.name: "intel/python:3.11-full"
         org.opencontainers.image.title: "Intel® Extension for TensorFlow XPU Base Image"
         org.opencontainers.image.version: ${TF_VER:-2.15.0}-xpu-${PACKAGE_OPTION:-pip}-base
       target: itex-xpu-base
@@ -83,16 +82,16 @@ services:
     extends: tf-base
     depends_on:
       - xpu
-    image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-itex-${TF_VERSION:-2.15.1}-itex-xpu-base
+    image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-itex-${TF_VERSION:-2.15.1}-itex-xpu-base
   xpu-jupyter:
     build:
       labels:
         dependency.python.pip: jupyter-requirements.txt
-        org.opencontainers.base.name: "intel/intel-optimized-tensorflow:${TF_VERSION:-2.15.1}-xpu-${PACKAGE_OPTION:-pip}-base"
+        org.opencontainers.base.name: "intel/intel-optimized-tensorflow:${TF_VERSION:-2.15.0}-xpu-${PACKAGE_OPTION:-pip}-base"
         org.opencontainers.image.title: "Intel® Extension for TensorFlow XPU Jupyter Image"
         org.opencontainers.image.version: ${TF_VER:-2.15.0}-xpu-${PACKAGE_OPTION:-pip}-jupyter
       target: itex-xpu-jupyter
     extends: itex-xpu-base
     command: >
       bash -c "python -m jupyter --version"
-    image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-itex-${TF_VERSION:-2.15.1}-itex-xpu-jupyter
+    image: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-itex-${TF_VERSION:-2.15.1}-itex-xpu-jupyter
diff --git a/tensorflow/tests/tests.yaml b/tensorflow/tests/tests.yaml
@@ -14,37 +14,37 @@
 
 ---
 import-itex-cpu-${PACKAGE_OPTION:-pip}:
-  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-${TF_VERSION:-2.15.1}-base
+  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-${TF_VERSION:-2.15.1}-base
   cmd: python -c "from tensorflow.python.client import device_lib; print(device_lib.list_local_devices())"
 import-itex-xpu-${PACKAGE_OPTION:-pip}:
-  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-itex-${TF_VERSION:-2.15.1}-itex-xpu-base
+  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-itex-${TF_VERSION:-2.15.1}-itex-xpu-base
   cmd: python /tests/xpu_import_test.py
   device: ["/dev/dri"]
   volumes:
     - src: ${PWD}/tensorflow/tests
       dst: /tests
 import-cpu-jupyter-${PACKAGE_OPTION:-pip}:
-  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-${TF_VERSION:-2.15.1}-jupyter
+  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-${TF_VERSION:-2.15.1}-jupyter
   cmd: python -m jupyter --version
 import-xpu-jupyter-${PACKAGE_OPTION:-pip}:
-  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-itex-${TF_VERSION:-2.15.1}-itex-xpu-jupyter
+  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-itex-${TF_VERSION:-2.15.1}-itex-xpu-jupyter
   cmd: python -m jupyter --version
   device: ["/dev/dri"]
 itex-cpu-${PACKAGE_OPTION:-pip}:
-  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-${TF_VERSION:-2.15.1}-base
+  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-${TF_VERSION:-2.15.1}-base
   cmd: python /tests/tf_base_test.py
   volumes:
     - src: ${PWD}/tensorflow/tests
       dst: /tests
 itex-xpu-${PACKAGE_OPTION:-pip}:
-  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-itex-${TF_VERSION:-2.15.1}-itex-xpu-base
+  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-itex-${TF_VERSION:-2.15.1}-itex-xpu-base
   cmd: python /tests/tf_base_test.py
   device: ["/dev/dri"]
   volumes:
     - dst: /tests
       src: $PWD/tensorflow/tests
 itex-xpu-jupyter-${PACKAGE_OPTION:-pip}:
-  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-itex-${TF_VERSION:-2.15.1}-itex-xpu-jupyter
+  img: ${REGISTRY}/${REPO}:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.11}-itex-${TF_VERSION:-2.15.1}-itex-xpu-jupyter
   cmd: papermill --log-output  /jupyter/xpu.ipynb -k python3 -
   notebook: True
   device: ["/dev/dri"]
diff --git a/tensorflow/xpu-requirements.txt b/tensorflow/xpu-requirements.txt
@@ -1,5 +1,5 @@
-tensorflow==2.15.0
-intel-extension-for-tensorflow[xpu]==2.15.0.1
+tensorflow==2.15.1
+intel-extension-for-tensorflow[xpu]==2.15.0.2
 idna>=3.7
 requests>=2.32.0
 tqdm>=4.66.3