[Docker & Tool] sync docker and tool update on r2.15 to master (#2669)

intel · Apr 10, 2024 · 28c3536 · 28c3536
1 parent 43584f8
commit 28c3536
Show file tree

Hide file tree

Showing 7 changed files with 158 additions and 99 deletions.
diff --git a/docker/README.md b/docker/README.md
@@ -20,7 +20,7 @@ Download and copy Intel® Extension for TensorFlow* wheel into ./models/binaries
 To use Intel® Optimization for Horovod* with the Intel® oneAPI Collective Communications Library (oneCCL), copy Horovod wheel into ./models/binaries as well. You can get the intel-optimization-for-horovod wheel link from https://pypi.org/project/intel-optimization-for-horovod/#files.
 
 ```
-mkdir ./models/binaries
+mkdir -p ./models/binaries
 cd ./models/binaries
 wget <download link from https://pypi.org/project/intel-extension-for-tensorflow/#files>
 wget <download link from https://pypi.org/project/intel-extension-for-tensorflow-lib/#files>
@@ -31,13 +31,13 @@ wget <download link from https://pypi.org/project/intel-optimization-for-horovod
 ### I. Customize Build Script
 We provide [build.sh](./build.sh) as the Docker container build script. The OS version and some software versions (such as Python and TensorFlow) are hard coded inside the script. If you're using a different version, you can edit this script.
 
-For example, to build a Docker container with Python 3.10 and TensorFlow 2.14 on an Ubuntu 22.04 layer, update [build.sh](./build.sh) as shown below.
+For example, to build a Docker container with Python 3.10 and TensorFlow 2.15 on an Ubuntu 22.04 layer, update [build.sh](./build.sh) as shown below.
 
 ```bash
 IMAGE_NAME=intel-extension-for-tensorflow:cpu-ubuntu
         docker build --build-arg UBUNTU_VERSION=22.04 \
                                 --build-arg PYTHON=python3.10 \
-                                --build-arg TF_VER=2.14 \
+                                --build-arg TF_VER=2.15 \
                                 --build-arg WHEELS=*.whl \
                                 -t $IMAGE_NAME \
                                 -f itex-cpu.Dockerfile .

diff --git a/docker/build.sh b/docker/build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2021-2022 Intel Corporation
+# Copyright (c) 2021-2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,23 +21,23 @@ if [ $IMAGE_TYPE == "xpu" -o $IMAGE_TYPE == "gpu" ]
 then
         IMAGE_NAME=intel-extension-for-tensorflow:$IMAGE_TYPE
         docker build --no-cache --build-arg UBUNTU_VERSION=22.04 \
-                                --build-arg ICD_VER=23.30.26918.50-736~22.04 \
-                                --build-arg LEVEL_ZERO_GPU_VER=1.3.26918.50-736~22.04 \
-                                --build-arg LEVEL_ZERO_VER=1.13.1-719~22.04 \
-                                --build-arg LEVEL_ZERO_DEV_VER=1.13.1-719~22.04 \
-                                --build-arg DPCPP_VER=2024.0.0-49819 \
-                                --build-arg MKL_VER=2024.0.0-49656 \
-                                --build-arg CCL_VER=2021.11.0-49156 \
+                                --build-arg ICD_VER=23.43.27642.40-803~22.04 \
+                                --build-arg LEVEL_ZERO_GPU_VER=1.3.27642.40-803~22.04 \
+                                --build-arg LEVEL_ZERO_VER=1.14.0-744~22.04 \
+                                --build-arg LEVEL_ZERO_DEV_VER=1.14.0-744~22.04 \
+                                --build-arg DPCPP_VER=2024.1.0-963 \
+                                --build-arg MKL_VER=2024.1.0-691 \
+                                --build-arg CCL_VER=2021.12.0-309 \
                                 --build-arg PYTHON=python3.10 \
-                                --build-arg TF_VER=2.14 \
+                                --build-arg TF_VER=2.15 \
                                 --build-arg WHEELS=*.whl \
                                 -t $IMAGE_NAME \
 				-f itex-xpu.Dockerfile .
 else
         IMAGE_NAME=intel-extension-for-tensorflow:$IMAGE_TYPE
         docker build --no-cache --build-arg UBUNTU_VERSION=22.04 \
                                 --build-arg PYTHON=python3.10 \
-                                --build-arg TF_VER=2.14 \
+                                --build-arg TF_VER=2.15 \
                                 --build-arg WHEELS=*.whl \
                                 -t $IMAGE_NAME \
                                 -f itex-cpu.Dockerfile .

diff --git a/docker/horovod-vars.sh b/docker/horovod-vars.sh
@@ -1,7 +1,23 @@
 #!/usr/bin/env bash
+#
+# Copyright (c) 2024 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 export LD_LIBRARY_PATH=/opt/intel/oneapi/redist/opt/mpi/libfabric/lib:$LD_LIBRARY_PATH
 export PATH=/opt/intel/oneapi/redist/bin:$PATH
 export I_MPI_ROOT=/opt/intel/oneapi/redist/lib
 export CCL_ROOT=/opt/intel/oneapi/redist
+export CCL_TOPO_FABRIC_VERTEX_CONNECTION_CHECK=0
 export FI_PROVIDER_PATH=/opt/intel/oneapi/redist/opt/mpi/libfabric/lib/prov
diff --git a/docker/itex-cpu.Dockerfile b/docker/itex-cpu.Dockerfile
@@ -1,4 +1,4 @@
-#copyright (c) 2022-2023 Intel Corporation
+#copyright (c) 2022-2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ RUN pip --no-cache-dir install --upgrade \
     pip \
     setuptools
 
-ARG TF_VER="2.14"
+ARG TF_VER="2.15"
 
 RUN pip --no-cache-dir install tensorflow==${TF_VER}
 

diff --git a/docker/itex-xpu.Dockerfile b/docker/itex-xpu.Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023 Intel Corporation
+# Copyright (c) 2022-2024 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ RUN apt-get update && \
 
 RUN wget -qO - https://repositories.intel.com/gpu/intel-graphics.key | \
     gpg --dearmor --output /usr/share/keyrings/intel-graphics.gpg
-RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/gpu/ubuntu jammy unified" | \
+RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/gpu/ubuntu jammy/lts/2350 unified" | \
     tee /etc/apt/sources.list.d/intel-gpu-jammy.list
 
 ARG ICD_VER
@@ -87,16 +87,16 @@ RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
     apt-get clean && \
     rm -rf  /var/lib/apt/lists/*
 
-RUN pip --no-cache-dir install --upgrade \
-    pip \
-    setuptools
-
 RUN ln -sf $(which ${PYTHON}) /usr/local/bin/python && \
     ln -sf $(which ${PYTHON}) /usr/local/bin/python3 && \
     ln -sf $(which ${PYTHON}) /usr/bin/python && \
     ln -sf $(which ${PYTHON}) /usr/bin/python3
 
-ARG TF_VER="2.14"
+RUN pip --no-cache-dir install --upgrade \
+    pip \
+    setuptools
+
+ARG TF_VER="2.15"
 
 RUN pip --no-cache-dir install tensorflow==${TF_VER}
 

diff --git a/tools/python/config.json b/tools/python/config.json
@@ -1,6 +1,6 @@
 
 {
-  "latest_release": "2.14.0.1",
+  "latest_release": "2.15.0.0",
   "os_list" : [
     "ubuntu",
     "rhel",
@@ -14,6 +14,7 @@
       "1.2.0" : "20.04 22.04",
       "2.13.0.0" : "20.04 22.04",
       "2.14.0.1" : "22.04",
+      "2.15.0.0" : "22.04",
       "latest" : "22.04"
     },
 
@@ -23,7 +24,8 @@
       "1.2.0" : "8.6",
       "2.13.0.0" : "8.6",
       "2.14.0.1" : "8.6 8.8 9.0 9.2",
-      "latest" : "8.6 8.8 9.0 9.2"
+      "2.15.0.0" : "8.6 8.8 8.9 9.0 9.2 9.3",
+      "latest" : "8.6 8.8 8.9 9.0 9.2 9.3"
     },
 
     "sles" : {
@@ -32,6 +34,7 @@
       "1.2.0" : "15.3 15.4",
       "2.13.0.0" : "15.3 15.4",
       "2.14.0.1" : "15.4 15.5",
+      "2.15.0.0" : "15.4 15.5",
       "latest" : "15.4 15.5"
     }
   },
@@ -42,6 +45,7 @@
       "1.2.0" : 8,
       "2.13.0.0" : 8,
       "2.14.0.1" : 9,
+      "2.15.0.0" : 9,
       "latest" : 9
     },
     "max_python_version" : {
@@ -50,6 +54,7 @@
       "1.2.0" : 11,
       "2.13.0.0" : 11,
       "2.14.0.1" : 11,
+      "2.15.0.0" : 11,
       "latest" : 11
     }
   },
@@ -60,7 +65,8 @@
       "1.2.0" : "2.12.0",
       "2.13.0.0" : "2.13.0",
       "2.14.0.1" : "2.14.0",
-      "latest" : "2.14.0"
+      "2.15.0.0" : "2.15.0",
+      "latest" : "2.15.0"
     }
   },
   "intel_gpu_driver_list" : {
@@ -168,7 +174,7 @@
         "22.3.5-i601"
       ]
     },
-    "2.13.0" : {
+    "2.13.0.0" : {
       "ubuntu" : [
         "1.3.26241.33-647~22.04",
         "23.17.26241.33-647~22.04",
@@ -194,7 +200,7 @@
         "22.3.5-i647"
       ]
     },
-    "2.14.0" : {
+    "2.14.0.1" : {
       "ubuntu" : [
         "1.3.26918.50-736~22.04",
         "23.30.26918.50-736~22.04",
@@ -219,64 +225,98 @@
         "1.0.14828.26-736",
         "22.3.10-i712"
       ]
+    },
+    "2.15.0.0" : {
+      "ubuntu" : [
+        "1.3.27642.40-803~22.04",
+        "23.43.27642.40-803~22.04",
+        "1.14.0-744~22.04",
+        "1.0.15468.20-803~22.04",
+        "1.0.15468.20-803~22.04",
+        "22.3.15-803~22.04"
+      ],
+      "rhel" : [
+        "1.0.15468.20-803.el8",
+        "1.0.15468.20-803.el8",
+        "22.3.15-i803.el8",
+        "23.43.27642.38-803.el8",
+        "1.14.0-791.el8",
+        "1.14.0-791.el8"
+      ],
+      "sles" :[
+        "1.3.27642.40-803",
+        "23.43.27642.40-803",
+        "1.14.0-i744",
+        "1.0.15468.20-803",
+        "1.0.15468.20-803",
+        "22.3.15-i803"
+      ]
     }
   },
   "oneapi" : {
-    "libsycl.so" :"Intel(R) OneAPI DPC++/C++ Compiler",
-    "libmkl_sycl.so" : "Intel(R) OneAPI Math Kernel Library",
-    "libccl.so" : "Intel(R) OneAPI Collective Communications Library"
+    "dpcpp" : "Intel(R) OneAPI DPC++/C++ Compiler",
+    "onemkl" : "Intel(R) OneAPI Math Kernel Library"
   },
-  "oneapi_lib" : [
-    "libsycl.so",
-    "libmkl_sycl.so",
-    "libccl.so"
-  ],
-  "oneapi_version" : {
-    "1.0.0" : [
-      "2022.2.0-8734",
-      "2022.2.0-8748"
-    ],
-    "1.1.0" : [
-      "2023.0.0-25370",
-      "2023.0.0-25398",
-      "2021.8.0-25371"
-    ],
-    "1.2.0" : [
-      "2023.1.0-46305",
-      "2023.1.0-46342",
-      "2021.9.0-43543"
-    ],
-    "2.13.0" : [
-      "2023.2.0-49495",
-      "2023.2.0-49495",
-      "2021.10.0-49084"
+  "oneapi_lib" : {
+    "dpcpp" : [
+      "libsycl.so"
     ],
-    "2.14.0" : [
-      "2024.0.0-49819",
-      "2024.0.0-49819",
-      "2021.11.0-49156"
+    "onemkl" : [
+      "libmkl_sycl_blas.so",
+      "libmkl_sycl_lapack.so",
+      "libmkl_sycl_dft.so"
     ]
   },
+  "oneapi_version" : {
+    "1.0.0" : {
+      "dpcpp" : "2022.2.0-8734",
+      "onemkl" : "2022.2.0-8748"
+    },
+    "1.1.0" : {
+      "dpcpp" : "2023.0.0-25370",
+      "onemkl" : "2023.0.0-25398"
+    },
+    "1.2.0" : {
+      "dpcpp" : "2023.1.0-46305",
+      "onemkl" : "2023.1.0-46342"
+    },
+    "2.13.0.0" : {
+      "dpcpp" : "2023.2.0-49495",
+      "onemkl" : "2023.2.0-49495"
+    },
+    "2.14.0.1" : {
+      "dpcpp" : "2024.0.0-49819",
+      "onemkl" : "2024.0.0-49819"
+    },
+    "2.15.0.0" : {
+      "dpcpp" : "2024.1.0-963",
+      "onemkl" : "2024.1.0-691"
+    },
+    "latest" : {
+      "dpcpp" : "2024.1.0-963",
+      "onemkl" : "2024.1.0-691"
+    }
+  },
   "tf_requirements" : [
-    "absl-py",
+    "absl",
     "astunparse",
     "flatbuffers",
     "gast",
-    "google-pasta",
-    "grpcio",
+    "pasta",
+    "grpc",
     "h5py",
-    "Keras|keras-nightly",
-    "libclang",
+    "keras",
+    "clang",
     "numpy",
-    "opt-einsum",
+    "opt_einsum",
     "packaging",
-    "protobuf",
+    "google.protobuf",
     "six",
     "termcolor",
     "typing_extensions",
-    "tb-nightly|tensorboard",
-    "tensorflow-estimator|tf-estimator-nightly",
-    "tensorflow-io-gcs-filesystem",
+    "tensorboard",
+    "tensorflow_estimator",
+    "tensorflow_io_gcs_filesystem",
     "wrapt"
   ],
   "itex_requirements" : [