Rebrand to AI Containers (#80)

* remove figlets

* update incorrect ipex version

* remove unecessary global patch fix

* separate install commands

Author: Tyler Titsworth

README.md

@@ -1,4 +1,4 @@
-# Intel AI Machine Learning Operations
+# Intel® AI Containers
 
 This repository contains Dockerfiles, scripts, yaml files, Helm charts, etc. used to scale out AI containers with versions of TensorFlow and PyTorch that have been optimized for Intel platforms. Scaling is done with python, Docker, kubernetes, kubeflow, cnvrg.io, Helm, and other container orchestration frameworks for use in the cloud and on-premise.
 
@@ -13,28 +13,17 @@ This repository contains Dockerfiles, scripts, yaml files, Helm charts, etc. use
 ├── classical-ml
 │   ├── Dockerfile
 │   ├── README.md
-│   ├── base
-│   │   └── figlet.txt
 │   └── docker-compose.yaml
 ├── pytorch
 │   ├── Dockerfile
 │   ├── README.md
-│   ├── base
-│   │   └── figlet.txt
 │   ├── docker-compose.yaml
-│   └── inc
-│       └── figlet.txt
 └── tensorflow
     ├── Dockerfile
     ├── README.md
-    ├── base
-    │   └── figlet.txt
     ├── docker-compose-serving.yaml
     ├── docker-compose.yaml
-    ├── inc
-    │   └── figlet.txt
     ├── jupyter
-    │   ├── figlet.txt
     │   └── third_party_programs.txt
     └── serving
 ```

classical-ml/Dockerfile

@@ -37,10 +37,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
     curl \
     wget
 
-COPY base/figlet.txt /fig.txt
-
-RUN echo "cat /fig.txt" >> ~/.bashrc
-
 ARG SCIKIT_VERSION
 ARG XGBOOST_VERSION
 
@@ -103,8 +99,9 @@ RUN ln -sf /root/conda/envs/idp/bin/python /usr/local/bin/python && \
 
 RUN conda install -n idp -y -c intel \
     daal4py \
-    scikit-learn-intelex${SCIKIT_VERSION:+==${SCIKIT_VERSION}} && \
-    python -m pip install --no-cache-dir \
+    scikit-learn-intelex${SCIKIT_VERSION:+==${SCIKIT_VERSION}}
+
+RUN python -m pip install --no-cache-dir \
     # https://github.com/intel/scikit-learn-intelex/blob/master/requirements-test.txt
     numpy==1.23.0 \ 
     threadpoolctl \
@@ -113,4 +110,3 @@ RUN conda install -n idp -y -c intel \
 
 ENV PYTHONSTARTUP=${HOME}/.patch_sklearn.py
 COPY base/.patch_sklearn.py ${HOME}/.patch_sklearn.py
-RUN python -m sklearnex.glob patch_sklearn

classical-ml/base/figlet.txt

@@ -46,10 +46,6 @@ RUN apt-get update -y && \
     wget
     # libxml2-dev
 
-COPY base/figlet.txt /fig.txt
-
-RUN echo "cat /fig.txt" >> ~/.bashrc
-
 ARG IPEX_VERSION
 
 RUN mkdir -p /licensing && \
@@ -145,8 +141,6 @@ RUN curl https://raw.githubusercontent.com/oneapi-src/oneCCL/b7d66de16e17f88caff
     curl https://raw.githubusercontent.com/intel/neural-compressor/master/docker/third-party-programs-pytorch.txt -o /licensing/third-party-programs-pytorch.txt && \
     curl https://raw.githubusercontent.com/intel/neural-compressor/master/LICENSE -o /licensing/LICENSE
 
-COPY inc/figlet.txt /fig.txt
-
 FROM inc AS inc-pip
 
 RUN apt-get install -y --no-install-recommends --fix-missing virtualenv

pytorch/Dockerfile

@@ -1,7 +1,7 @@
 version: '3'
 services:
   ipex-base:
-    image: ${REGISTRY}/aiops/mlops-ci:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-ipex-${IPEX_VERSION:-1.12.1}-base
+    image: ${REGISTRY}/aiops/mlops-ci:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-ipex-${IPEX_VERSION:-2.0.0}-base
     pull_policy: always
     build:
       args:
@@ -23,7 +23,7 @@ services:
       sh -c "python -c 'import torch; import intel_extension_for_pytorch as ipex; print(\"torch:\", torch.__version__, \" ipex:\",ipex.__version__)'"
 
   inc:
-    image: ${REGISTRY}/aiops/mlops-ci:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-ipex-${IPEX_VERSION:-1.12.1}-oneccl-inc-${INC_VERSION:-2.1.1}
+    image: ${REGISTRY}/aiops/mlops-ci:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${PACKAGE_OPTION:-pip}-py${PYTHON_VERSION:-3.10}-ipex-${IPEX_VERSION:-2.0.0}-oneccl-inc-${INC_VERSION:-2.1.1}
     build:
       args:
         INC_VERSION: ${INC_VERSION:-2.1.1}

pytorch/base/figlet.txt

@@ -42,8 +42,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
     curl \
     wget
 
-COPY base/figlet.txt /fig.txt
-
 RUN echo "cat /fig.txt" >> ~/.bashrc
 
 ARG TF_PACKAGE
@@ -125,10 +123,6 @@ EXPOSE 8888
 
 RUN python -m ipykernel.kernelspec
 
-ADD jupyter/third_party_programs.txt /licensing/jupyter_third_party_programs.txt
-
-COPY jupyter/figlet.txt /fig.txt
-
 CMD ["bash", "-c", "source /etc/bash.bashrc && jupyter notebook --notebook-dir=${WORKDIR} --ip 0.0.0.0 --no-browser --allow-root"]
 
 FROM tf-base-${PACKAGE_OPTION} AS openmpi
@@ -218,5 +212,3 @@ RUN python -m pip install --no-cache-dir neural-compressor${INC_VER:+==${INC_VER
 
 RUN curl https://raw.githubusercontent.com/intel/neural-compressor/master/docker/third-party-programs-tensorflow.txt -o /licensing/third-party-programs-tensorflow.txt && \
     curl https://raw.githubusercontent.com/intel/neural-compressor/v${INC_VER}/LICENSE -o /licensing/INC_LICENSE
-
-COPY inc/figlet.txt /fig.txt

pytorch/docker-compose.yaml

@@ -17,6 +17,7 @@ services:
         TF_SERVING_BAZEL_OPTIONS: ${TF_SERVING_BAZEL_OPTIONS:-'--local_ram_resources=HOST_RAM*0.8 --local_cpu_resources=HOST_CPUS-4'}
         TF_SERVING_BUILD_OPTIONS: ${TF_SERVING_BUILD_OPTIONS:-'--config=mkl --config=release --define=build_with_openmp=false --copt=-march=native'}
         TF_SERVING_VERSION_GIT_BRANCH: ${TF_SERVING_VERSION}
+    pull-policy: always
 
   serving-mkl:
     image: ${REGISTRY}/aiops/mlops-ci:b-${GITHUB_RUN_NUMBER:-0}-${BASE_IMAGE_NAME:-ubuntu}-${BASE_IMAGE_TAG:-22.04}-${TF_PACKAGE:-intel-tensorflow}-${TF_PACKAGE_VERSION:-2.12.0}-serving-mkl
@@ -29,3 +30,4 @@ services:
         TF_SERVING_BUILD: ${BASE_IMAGE_NAME:-ubuntu}:${BASE_IMAGE_TAG:-22.04}
         TF_SERVING_VERSION_GIT_COMMIT: ${TF_SERVING_VERSION}
     extends: tf-serving
+    pull-policy: always