[Docker] dockerfile release for v1.1.0 (#1685)

zufangzhu · guizili0 · commit b07c7655fb9e · 2023-01-06T09:20:38.000+08:00
diff --git a/docker/README.md b/docker/README.md
@@ -15,22 +15,28 @@ Refer to [Install for GPU](../docs/install/install_for_gpu.md) and [Install for
 
 ## Binaries Preparation
 
-Download and copy Intel® Extension for TensorFlow* wheel into ./models/ binaries directory.
+Download and copy Intel® Extension for TensorFlow* wheel into ./models/binaries directory.
 
 ```
 mkdir ./models/binaries
 ```
 
+To use Intel® Optimization for Horovod* with the Intel® oneAPI Collective Communications Library (oneCCL), copy Horovod wheel into ./models/horovod as well.
+
+```bash
+mkdir ./models/horovod
+```
+
 ## Usage of Docker Container
 ### I. Customize build script
 [build.sh](./build.sh) is provided as docker container build script. While OS version and some software version (such as Python and TensorFlow) is hard coded inside the script. If you prefer to use newer or later version, you can edit this script.
 
-For example, to build docker container with Python 3.9 and TensorFlow 2.10 on Ubuntu 20.04 layer, update [build.sh](./build.sh) as below.
+For example, to build docker container with Python 3.9 and TensorFlow 2.11 on Ubuntu 20.04 layer, update [build.sh](./build.sh) as below.
 ```
 IMAGE_NAME=intel-extension-for-tensorflow:cpu-ubuntu
         docker build --build-arg UBUNTU_VERSION=20.04 \
                                 --build-arg PYTHON=python3.9 \
-                                --build-arg TF_VER=2.10 \
+                                --build-arg TF_VER=2.11 \
                                 --build-arg TF_PLUGIN_WHEEL=intel_extension_for_tensorflow*.whl \
                                 -t $IMAGE_NAME \
                                 -f itex-cpu-ubuntu.Dockerfile .
@@ -41,15 +47,16 @@ IMAGE_NAME=intel-extension-for-tensorflow:cpu-ubuntu
 To build the docker container, enter into [docker](./) folder and run below commands:
 
 ```
-./build.sh [gpu/cpu-centos/cpu-ubuntu]
+./build.sh [gpu-flex/gpu-max/cpu-centos/cpu-ubuntu]
 ```
 ### III. Running container
 
 Run following commands to start docker container. You can use `-v` option to mount your local directory into container. To make GPU available in the container, attach the GPU to the container using `--device /dev/dri` option and run the container:
 
 ```
-IMAGE_NAME=intel-extension-for-tensorflow:gpu
+IMAGE_NAME=intel-extension-for-tensorflow:gpu-max
 docker run -v <your-local-dir>:/workspace \
+           -v /dev/dri/by-path:/dev/dri/by-path \
            --device /dev/dri \
            --privileged \
            -e http_proxy=$http_proxy \
diff --git a/docker/build.sh b/docker/build.sh
@@ -17,35 +17,52 @@
 
 set -e
 IMAGE_TYPE=$1
-if [ $IMAGE_TYPE == "gpu" ]
+if [ $IMAGE_TYPE == "gpu-flex" ]
 then
-        IMAGE_NAME=intel-extension-for-tensorflow:gpu
-        docker build --build-arg UBUNTU_VERSION=20.04 \
-                                --build-arg PYTHON=python3.9 \
-                                --build-arg ICD_VER=22.28.23726.1+i419~u20.04 \
-                                --build-arg LEVEL_ZERO_GPU_VER=1.3.23726.1+i419~u20.04 \
-                                --build-arg LEVEL_ZERO_VER=1.8.1+i755~u20.04 \
-                                --build-arg TF_VER=2.10 \
-                                --build-arg DPCPP_VER=2022.2.0-8734 \
-                                --build-arg MKL_VER=2022.2.0-8748 \
+        IMAGE_NAME=intel-extension-for-tensorflow:gpu-flex
+        docker build --build-arg UBUNTU_VERSION=22.04 \
+                                --build-arg ICD_VER=22.43.24595.35+i538~22.04 \
+                                --build-arg LEVEL_ZERO_GPU_VER=1.3.24595.35+i538~22.04 \
+                                --build-arg LEVEL_ZERO_VER=1.8.8+i524~u22.04 \
+                                --build-arg TF_VER=2.11 \
+                                --build-arg DPCPP_VER=2023.0.0-25370 \
+                                --build-arg MKL_VER=2023.0.0-25398 \
+                                --build-arg PYTHON=python3.10 \
+                                --build-arg TF_PLUGIN_WHEEL=intel_extension_for_tensorflow*.whl \
+                                -t $IMAGE_NAME \
+				-f itex-gpu-flex.Dockerfile .
+elif [ $IMAGE_TYPE == "gpu-max" ]
+then
+        IMAGE_NAME=intel-extension-for-tensorflow:gpu-max
+        docker build --build-arg UBUNTU_VERSION=22.04 \
+                                --build-arg ICD_VER=22.43.24595.35+i538~22.04 \
+                                --build-arg LEVEL_ZERO_GPU_VER=1.3.24595.35+i538~22.04 \
+                                --build-arg LEVEL_ZERO_VER=1.8.8+i524~u22.04 \
+                                --build-arg LEVEL_ZERO_DEV_VER=1.8.8+i524~u22.04 \
+                                --build-arg TF_VER=2.11 \
+                                --build-arg DPCPP_VER=2023.0.0-25370 \
+                                --build-arg MKL_VER=2023.0.0-25398 \
+                                --build-arg CCL_VER=2021.8.0-25371 \
+                                --build-arg PYTHON=python3.10 \
+                                --build-arg HOROVOD_WHL=intel_optimization_for_horovod-*.whl \
                                 --build-arg TF_PLUGIN_WHEEL=intel_extension_for_tensorflow*.whl \
                                 -t $IMAGE_NAME \
-				-f itex-gpu.Dockerfile .
+                                -f itex-gpu-max.Dockerfile .
 elif  [ $IMAGE_TYPE == "cpu-centos" ]
 then
         IMAGE_NAME=intel-extension-for-tensorflow:cpu-centos
         docker build --build-arg CENTOS_VER=8 \
                                 --build-arg PY_VER=39 \
                                 --build-arg PYTHON=python3.9 \
-                                --build-arg TF_VER=2.10 \
+                                --build-arg TF_VER=2.11 \
                                 --build-arg TF_PLUGIN_WHEEL=intel_extension_for_tensorflow*.whl \
                                 -t $IMAGE_NAME \
                                 -f itex-cpu-centos.Dockerfile .
 else
         IMAGE_NAME=intel-extension-for-tensorflow:cpu-ubuntu
         docker build --build-arg UBUNTU_VERSION=20.04 \
                                 --build-arg PYTHON=python3.9 \
-                                --build-arg TF_VER=2.10 \
+                                --build-arg TF_VER=2.11 \
                                 --build-arg TF_PLUGIN_WHEEL=intel_extension_for_tensorflow*.whl \
                                 -t $IMAGE_NAME \
                                 -f itex-cpu-ubuntu.Dockerfile .
diff --git a/docker/itex-cpu-centos.Dockerfile b/docker/itex-cpu-centos.Dockerfile
@@ -59,7 +59,7 @@ RUN ln -sf $(which ${PYTHON}) /usr/local/bin/python && \
     ln -sf $(which ${PYTHON}) /usr/local/bin/python3 && \
     ln -sf $(which ${PYTHON}) /usr/bin/python
 
-ARG TF_VER="2.10"
+ARG TF_VER="2.11"
 
 RUN pip --no-cache-dir install tensorflow==${TF_VER}
 
diff --git a/docker/itex-cpu-ubuntu.Dockerfile b/docker/itex-cpu-ubuntu.Dockerfile
@@ -59,7 +59,10 @@ RUN ln -sf $(which ${PYTHON}) /usr/local/bin/python && \
     ln -sf $(which ${PYTHON}) /usr/bin/python && \
     ln -sf $(which ${PYTHON}) /usr/bin/python3
 
-ARG TF_VER="2.10"
+RUN  sed -i "/if util.abstract_sockets_supported:/d"  /usr/lib/python3.9/multiprocessing/connection.py && \
+     sed -i  "/{next(_mmap_counter)}/d"  /usr/lib/python3.9/multiprocessing/connection.py
+
+ARG TF_VER="2.11"
 
 RUN pip --no-cache-dir install tensorflow==${TF_VER}
 
diff --git a/docker/itex-gpu-flex.Dockerfile b/docker/itex-gpu-flex.Dockerfile
@@ -1,3 +1,4 @@
+# Copyright (c) 2022 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -40,8 +41,8 @@ RUN apt-get update && \
 
 RUN no_proxy=$no_proxy wget -qO - https://repositories.intel.com/graphics/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/graphics/ubuntu focal main' | \
-    tee  /etc/apt/sources.list.d/intel.gpu.focal.list
+RUN echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/graphics/ubuntu jammy flex' | \
+    tee  /etc/apt/sources.list.d/intel.gpu.jammy.list
 
 ARG ICD_VER
 ARG LEVEL_ZERO_GPU_VER
@@ -73,7 +74,7 @@ RUN apt-get update && \
 RUN echo "intelpython=exclude" > $HOME/cfg.txt
 
 ENV LANG=C.UTF-8
-ARG PYTHON=python3.9
+ARG PYTHON=python3.10
 
 RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
     ${PYTHON} lib${PYTHON} python3-pip && \
@@ -89,7 +90,7 @@ RUN ln -sf $(which ${PYTHON}) /usr/local/bin/python && \
     ln -sf $(which ${PYTHON}) /usr/bin/python && \
     ln -sf $(which ${PYTHON}) /usr/bin/python3
 
-ARG TF_VER="2.10"
+ARG TF_VER="2.11"
 
 RUN pip --no-cache-dir install tensorflow==${TF_VER}
 
@@ -101,12 +102,11 @@ RUN pip install /tmp/tf_whls/* && \
     rm -rf /tmp/tf_whls
 
 ENV LD_LIBRARY_PATH=/opt/intel/oneapi/lib:/opt/intel/oneapi/lib/intel64:$LD_LIBRARY_PATH
-ENV LD_PRELOAD=/opt/intel/oneapi/lib/intel64/libmkl_rt.so
 
 ADD https://raw.githubusercontent.com/intel/intel-extension-for-tensorflow/master/third-party-programs/dockerlayer/THIRD-PARTY-PROGRAMS.txt /licenses/
 ADD https://raw.githubusercontent.com/intel/intel-extension-for-tensorflow/master/third-party-programs/dockerlayer/dpcpp-third-party-programs.txt /licenses/
 ADD https://raw.githubusercontent.com/intel/intel-extension-for-tensorflow/master/third-party-programs/dockerlayer/oneccl-third-party-programs.txt /licenses/
 ADD https://raw.githubusercontent.com/intel/intel-extension-for-tensorflow/master/third-party-programs/dockerlayer/onemkl-third-party-program-sub-tpp.txt /licenses/
 ADD https://raw.githubusercontent.com/intel/intel-extension-for-tensorflow/master/third-party-programs/dockerlayer/onemkl-third-party-program.txt /licenses/
 ADD https://raw.githubusercontent.com/intel/intel-extension-for-tensorflow/master/third-party-programs/dockerlayer/third-party-program-of-intel-extension-for-tensorflow.txt /licenses/
-ADD https://raw.githubusercontent.com/intel/intel-extension-for-tensorflow/master/third-party-programs/dockerlayer/third-party-programs-of-intel-tensorflow.txt /licenses/
+ADD https://raw.githubusercontent.com/intel/intel-extension-for-tensorflow/master/third-party-programs/dockerlayer/third-party-programs-of-intel-tensorflow.txt /licenses/
diff --git a/docker/itex-gpu-max.Dockerfile b/docker/itex-gpu-max.Dockerfile
@@ -0,0 +1,126 @@
+# Copyright (c) 2022 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.
+# ============================================================================
+
+ARG UBUNTU_VERSION
+
+FROM ubuntu:${UBUNTU_VERSION}
+
+ENV LANG=C.UTF-8
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+HEALTHCHECK NONE
+RUN useradd -d /home/itex -m -s /bin/bash itex
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends --fix-missing \
+    apt-utils \
+    build-essential \
+    ca-certificates \
+    clinfo \
+    curl \
+    git \
+    gnupg2 \
+    gpg-agent \
+    rsync \
+    sudo \
+    unzip \
+    wget && \
+    apt-get clean && \
+    rm -rf  /var/lib/apt/lists/*
+
+RUN no_proxy=$no_proxy wget -qO - https://repositories.intel.com/graphics/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/graphics/ubuntu jammy flex' | \
+    tee  /etc/apt/sources.list.d/intel.gpu.jammy.list
+
+ARG ICD_VER
+ARG LEVEL_ZERO_GPU_VER
+ARG LEVEL_ZERO_VER
+ARG LEVEL_ZERO_DEV_VER
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends --fix-missing \
+    intel-opencl-icd=${ICD_VER} \
+    intel-level-zero-gpu=${LEVEL_ZERO_GPU_VER} \
+    level-zero=${LEVEL_ZERO_VER} \
+    level-zero-dev=${LEVEL_ZERO_DEV_VER} && \
+    apt-get clean && \
+    rm -rf  /var/lib/apt/lists/*
+
+RUN no_proxy=$no_proxy wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB \
+   | gpg --dearmor | tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null && \
+   echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" \
+   | tee /etc/apt/sources.list.d/oneAPI.list
+
+ARG DPCPP_VER
+ARG MKL_VER
+ARG CCL_VER
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends --fix-missing \
+    intel-oneapi-runtime-dpcpp-cpp=${DPCPP_VER} \
+    intel-oneapi-runtime-mkl=${MKL_VER} \
+    intel-oneapi-runtime-ccl=${CCL_VER} && \
+    apt-get clean && \
+    rm -rf  /var/lib/apt/lists/*
+
+RUN echo "intelpython=exclude" > $HOME/cfg.txt
+
+ENV LANG=C.UTF-8
+ARG PYTHON=python3.10
+
+RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
+    ${PYTHON} lib${PYTHON} python3-pip && \
+    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.11"
+
+RUN pip --no-cache-dir install tensorflow==${TF_VER}
+
+ARG HOROVOD_WHL
+
+COPY models/horovod/${HOROVOD_WHL} /tmp/horovod_whls/
+
+RUN pip install /tmp/horovod_whls/* && \
+    rm -rf /tmp/horovod_whls
+
+ARG TF_PLUGIN_WHEEL
+
+COPY models/binaries/$TF_PLUGIN_WHEEL /tmp/tf_whls/
+
+RUN pip install /tmp/tf_whls/* && \
+    rm -rf /tmp/tf_whls
+
+ENV LD_LIBRARY_PATH=/opt/intel/oneapi/lib:/opt/intel/oneapi/lib/intel64:$LD_LIBRARY_PATH
+
+ADD https://raw.githubusercontent.com/intel/intel-extension-for-tensorflow/master/third-party-programs/dockerlayer/THIRD-PARTY-PROGRAMS.txt /licenses/
+ADD https://raw.githubusercontent.com/intel/intel-extension-for-tensorflow/master/third-party-programs/dockerlayer/dpcpp-third-party-programs.txt /licenses/
+ADD https://raw.githubusercontent.com/intel/intel-extension-for-tensorflow/master/third-party-programs/dockerlayer/oneccl-third-party-programs.txt /licenses/
+ADD https://raw.githubusercontent.com/intel/intel-extension-for-tensorflow/master/third-party-programs/dockerlayer/onemkl-third-party-program-sub-tpp.txt /licenses/
+ADD https://raw.githubusercontent.com/intel/intel-extension-for-tensorflow/master/third-party-programs/dockerlayer/onemkl-third-party-program.txt /licenses/
+ADD https://raw.githubusercontent.com/intel/intel-extension-for-tensorflow/master/third-party-programs/dockerlayer/third-party-program-of-intel-extension-for-tensorflow.txt /licenses/
+ADD https://raw.githubusercontent.com/intel/intel-extension-for-tensorflow/master/third-party-programs/dockerlayer/third-party-programs-of-intel-tensorflow.txt /licenses/
+ADD https://raw.githubusercontent.com/oneapi-src/oneCCL/master/third-party-programs.txt /licenses/
