[CIBUILD] Upgrade devel & cibuild docker images to ubuntu22.04 with cuda11.7.

liutongxuan · liutongxuan · commit 243a667a14df · 2022-09-25T20:14:51.000+08:00
diff --git a/.github/workflows/ubuntu18.04-py3.6-cibuild-build-serving.yaml b/.github/workflows/ubuntu18.04-py3.6-cibuild-build-serving.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py36-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py38-ubuntu22.04
   JOBNAME: deeprec-ci-cpu-${{ github.run_id }}
 
 jobs:
diff --git a/.github/workflows/ubuntu18.04-py3.6-cibuild-build-wheel.yaml b/.github/workflows/ubuntu18.04-py3.6-cibuild-build-wheel.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py36-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py38-ubuntu22.04
   JOBNAME: deeprec-ci-cpu-${{ github.run_id }}
 
 jobs:
@@ -52,4 +52,4 @@ jobs:
     - name:  Remove Container
       if: ${{ always() }}
       run: 
-        cibuild/remove_container.sh ${JOBNAME}
+        cibuild/remove_container.sh ${JOBNAME}
diff --git a/.github/workflows/ubuntu18.04-py3.6-cibuild-c-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cibuild-c-unit-test.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py36-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py38-ubuntu22.04
   JOBNAME: deeprec-ci-cpu-${{ github.run_id }}
 
 jobs:
@@ -52,4 +52,4 @@ jobs:
     - name:  Remove Container
       if: ${{ always() }}
       run: 
-        cibuild/remove_container.sh ${JOBNAME}
+        cibuild/remove_container.sh ${JOBNAME}
diff --git a/.github/workflows/ubuntu18.04-py3.6-cibuild-cc-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cibuild-cc-unit-test.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py36-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py38-ubuntu22.04
   JOBNAME: deeprec-ci-cpu-${{ github.run_id }}
 
 jobs:
@@ -52,4 +52,4 @@ jobs:
     - name:  Remove Container
       if: ${{ always() }}
       run: 
-        cibuild/remove_container.sh ${JOBNAME}
+        cibuild/remove_container.sh ${JOBNAME}
diff --git a/.github/workflows/ubuntu18.04-py3.6-cibuild-contrib-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cibuild-contrib-unit-test.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py36-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py38-ubuntu22.04
   JOBNAME: deeprec-ci-cpu-${{ github.run_id }}
 
 jobs:
@@ -52,4 +52,4 @@ jobs:
     - name:  Remove Container
       if: ${{ always() }}
       run: 
-        cibuild/remove_container.sh ${JOBNAME}
+        cibuild/remove_container.sh ${JOBNAME}
diff --git a/.github/workflows/ubuntu18.04-py3.6-cibuild-core-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cibuild-core-unit-test.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py36-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py38-ubuntu22.04
   JOBNAME: deeprec-ci-cpu-${{ github.run_id }}
 
 jobs:
@@ -52,4 +52,4 @@ jobs:
     - name:  Remove Container
       if: ${{ always() }}
       run: 
-        cibuild/remove_container.sh ${JOBNAME}
+        cibuild/remove_container.sh ${JOBNAME}
diff --git a/.github/workflows/ubuntu18.04-py3.6-cibuild-examples-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cibuild-examples-unit-test.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py36-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py38-ubuntu22.04
   JOBNAME: deeprec-ci-cpu-${{ github.run_id }}
 
 jobs:
@@ -52,4 +52,4 @@ jobs:
     - name:  Remove Container
       if: ${{ always() }}
       run: 
-        cibuild/remove_container.sh ${JOBNAME}
+        cibuild/remove_container.sh ${JOBNAME}
diff --git a/.github/workflows/ubuntu18.04-py3.6-cibuild-java-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cibuild-java-unit-test.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py36-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py38-ubuntu22.04
   JOBNAME: deeprec-ci-cpu-${{ github.run_id }}
 
 jobs:
@@ -52,4 +52,4 @@ jobs:
     - name:  Remove Container
       if: ${{ always() }}
       run: 
-        cibuild/remove_container.sh ${JOBNAME}
+        cibuild/remove_container.sh ${JOBNAME}
diff --git a/.github/workflows/ubuntu18.04-py3.6-cibuild-js-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cibuild-js-unit-test.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py36-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py38-ubuntu22.04
   JOBNAME: deeprec-ci-cpu-${{ github.run_id }}
 
 jobs:
@@ -52,4 +52,4 @@ jobs:
     - name:  Remove Container
       if: ${{ always() }}
       run: 
-        cibuild/remove_container.sh ${JOBNAME}
+        cibuild/remove_container.sh ${JOBNAME}
diff --git a/.github/workflows/ubuntu18.04-py3.6-cibuild-python-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cibuild-python-unit-test.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py36-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py38-ubuntu22.04
   JOBNAME: deeprec-ci-cpu-${{ github.run_id }}
 
 jobs:
@@ -52,4 +52,4 @@ jobs:
     - name:  Remove Container
       if: ${{ always() }}
       run: 
-        cibuild/remove_container.sh ${JOBNAME}
+        cibuild/remove_container.sh ${JOBNAME}
diff --git a/.github/workflows/ubuntu18.04-py3.6-cibuild-serving-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cibuild-serving-unit-test.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py36-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py38-ubuntu22.04
   JOBNAME: deeprec-ci-cpu-${{ github.run_id }}
 
 jobs:
diff --git a/.github/workflows/ubuntu18.04-py3.6-cibuild-stream_executor-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cibuild-stream_executor-unit-test.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py36-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py38-ubuntu22.04
   JOBNAME: deeprec-ci-cpu-${{ github.run_id }}
 
 jobs:
@@ -52,4 +52,4 @@ jobs:
     - name:  Remove Container
       if: ${{ always() }}
       run: 
-        cibuild/remove_container.sh ${JOBNAME}
+        cibuild/remove_container.sh ${JOBNAME}
diff --git a/.github/workflows/ubuntu18.04-py3.6-cibuild-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cibuild-unit-test.yaml
@@ -3,7 +3,7 @@ name: CPU Unit Tests
 on: workflow_dispatch
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py36-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py38-ubuntu22.04
   JOBNAME: deeprec-ci-cpu-${{ github.run_id }}
   PODNAME: deeprec-ci-cpu-${{ github.run_id }}-chief-0
   BAZEL_CACHE: ${{ secrets.BAZEL_CACHE }}
diff --git a/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-build-wheel.yaml b/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-build-wheel.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py36-cu116-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py38-cu117-ubuntu22.04
   JOBNAME: deeprec-ci-gpu-${{ github.run_id }}
 
 jobs:
diff --git a/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-c-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-c-unit-test.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py36-cu116-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py38-cu117-ubuntu22.04
   JOBNAME: deeprec-ci-gpu-${{ github.run_id }}
 
 jobs:
diff --git a/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-cc-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-cc-unit-test.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py36-cu116-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py38-cu117-ubuntu22.04
   JOBNAME: deeprec-ci-gpu-${{ github.run_id }}
 
 jobs:
diff --git a/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-contrib-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-contrib-unit-test.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py36-cu116-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py38-cu117-ubuntu22.04
   JOBNAME: deeprec-ci-gpu-${{ github.run_id }}
 
 jobs:
diff --git a/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-core-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-core-unit-test.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py36-cu116-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py38-cu117-ubuntu22.04
   JOBNAME: deeprec-ci-gpu-${{ github.run_id }}
 
 jobs:
diff --git a/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-examples-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-examples-unit-test.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py36-cu116-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py38-cu117-ubuntu22.04
   JOBNAME: deeprec-ci-gpu-${{ github.run_id }}
 
 jobs:
diff --git a/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-java-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-java-unit-test.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py36-cu116-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py38-cu117-ubuntu22.04
   JOBNAME: deeprec-ci-gpu-${{ github.run_id }}
 
 jobs:
diff --git a/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-js-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-js-unit-test.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py36-cu116-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py38-cu117-ubuntu22.04
   JOBNAME: deeprec-ci-gpu-${{ github.run_id }}
 
 jobs:
diff --git a/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-python-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-python-unit-test.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py36-cu116-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py38-cu117-ubuntu22.04
   JOBNAME: deeprec-ci-gpu-${{ github.run_id }}
 
 jobs:
diff --git a/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-stream_executor-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-stream_executor-unit-test.yaml
@@ -23,7 +23,7 @@ on:
       - '*.md'
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py36-cu116-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py38-cu117-ubuntu22.04
   JOBNAME: deeprec-ci-gpu-${{ github.run_id }}
 
 jobs:
diff --git a/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-unit-test.yaml b/.github/workflows/ubuntu18.04-py3.6-cuda11.2-cibuild-unit-test.yaml
@@ -3,7 +3,7 @@ name: GPU Unit Tests
 on: workflow_dispatch
 
 env:
-  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py36-cu116-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py38-cu117-ubuntu22.04
   JOBNAME: deeprec-ci-gpu-${{ github.run_id }}
   PODNAME: deeprec-ci-gpu-${{ github.run_id }}-chief-0
   BAZEL_CACHE: ${{ secrets.BAZEL_CACHE }}
diff --git a/.github/workflows/ubuntu18.04-py3.6-modeltest.yaml b/.github/workflows/ubuntu18.04-py3.6-modeltest.yaml
@@ -26,7 +26,7 @@ on:
         required: false
 
 env:
-  IMAGE: registry.cn-shanghai.aliyuncs.com/pai-dlc/tensorflow-developer:1.15deeprec-dev-cpu-cibuild-py36-ubuntu18.04
+  IMAGE: alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py38-ubuntu22.04 
   JOBNAME: deeprec-ci-cpu-${{ github.run_id }}
   PODNAME: deeprec-ci-cpu-${{ github.run_id }}-chief-0
   BAZEL_CACHE: ${{ secrets.BAZEL_CACHE }}
diff --git a/cibuild/dockerfiles/Dockerfile.devel-py3.8-cu117-ubuntu22.04 b/cibuild/dockerfiles/Dockerfile.devel-py3.8-cu117-ubuntu22.04
@@ -0,0 +1,16 @@
+FROM alideeprec/deeprec-base:deeprec-base-gpu-py38-cu117-ubuntu22.04
+
+RUN apt-get install -y libhdf5-dev
+RUN apt-get install -y libz-dev
+RUN apt-get install -y openjdk-8-jdk
+
+RUN pip install \
+    h5py==2.10.0 && \
+    spicy==0.16.0 && \
+    portpicker==1.4.0 && \
+    sklearn==0.0 && \
+    tensorflow-estimator==1.15.0 && \
+    grpcio==1.47.0 && \
+    grpcio-tools==1.47.0 && \
+    pyarrow==2.0.0 && \
+    fastparquet==0.6.1
diff --git a/cibuild/dockerfiles/Dockerfile.devel-py3.8-ubuntu22.04 b/cibuild/dockerfiles/Dockerfile.devel-py3.8-ubuntu22.04
@@ -0,0 +1,16 @@
+FROM alideeprec/deeprec-base:deeprec-base-cpu-py38-ubuntu22.04
+
+RUN apt-get install -y libhdf5-dev
+RUN apt-get install -y libz-dev
+RUN apt-get install -y openjdk-8-jdk
+
+RUN pip install \
+    h5py==2.10.0 && \
+    spicy==0.16.0 && \
+    portpicker==1.4.0 && \
+    sklearn==0.0 && \
+    tensorflow-estimator==1.15.0 && \
+    grpcio==1.47.0 && \
+    grpcio-tools==1.47.0 && \
+    pyarrow==2.0.0 && \
+    fastparquet==0.6.1
diff --git a/docs/DeepRec-Compile-And-Install.md b/docs/DeepRec-Compile-And-Install.md
@@ -21,17 +21,36 @@
 |    7.5.0    |    3.6.9       | CUDA 11.7.1  | alideeprec/deeprec-base:deeprec-base-gpu-py36-cu117-ubuntu18.04 |
 |    11.2.0   |    3.8.6       | CUDA 11.7.1  | alideeprec/deeprec-base:deeprec-base-gpu-py38-cu117-ubuntu22.04 |
 
+**CPU Dev Docker**
+
+| GCC Version | Python Version |                        IMAGE                        |
+| ----------- | -------------- | --------------------------------------------------- |
+|   7.5.0     |    3.6.9       | alideeprec/deeprec-dev:deeprec-cpu-py36-ubuntu18.04 |
+|   11.2.0    |    3.8.6       | alideeprec/deeprec-dev:deeprec-cpu-py38-ubuntu22.04 |
+
+**GPU Dev Docker**
+
+| GCC Version | Python Version | CUDA VERSION |                         IMAGE                             |
+| ----------- | -------------- | ------------ | --------------------------------------------------------- |
+|    7.5.0    |    3.6.9       | CUDA 11.6.1  | alideeprec/deeprec-dev:deeprec-gpu-py36-cu116-ubuntu18.04 |
+|    11.2.0   |    3.8.6       | CUDA 11.7.1  | alideeprec/deeprec-dev:deeprec-gpu-py38-cu117-ubuntu22.04 |
+
+
 **CPU Dev Docker (with bazel cache)**
 
-```
-alideeprec/deeprec-build:deeprec-dev-cpu-py36-ubuntu18.04
-```
+| GCC Version | Python Version |                               IMAGE                              |
+| ----------- | -------------- | ---------------------------------------------------------------- |
+|   7.5.0     |    3.6.9       | alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py36-ubuntu18.04 |
+|   11.2.0    |    3.8.6       | alideeprec/deeprec-cicd:deeprec-dev-cpu-cibuild-py38-ubuntu22.04 |
 
-**GPU(cuda11.6) Dev Docker (with bazel cache)**
 
-```
-alideeprec/deeprec-build:deeprec-dev-gpu-py36-cu116-ubuntu18.04
-```
+**GPU Dev Docker (with bazel cache)**
+
+| GCC Version | Python Version | CUDA VERSION |                                IMAGE                                   |
+| ----------- | -------------- | ------------ | ---------------------------------------------------------------------- |
+|    7.5.0    |    3.6.9       | CUDA 11.6.1  | alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py36-cu116-ubuntu18.04 |
+|    11.2.0   |    3.8.6       | CUDA 11.7.1  | alideeprec/deeprec-cicd:deeprec-dev-gpu-cibuild-py38-cu117-ubuntu22.04 |
+
 
 ## 代码编译
 
diff --git a/docs/Estimator-Compile-And-Install.md b/docs/Estimator-Compile-And-Install.md
diff --git a/docs/TFServing-Compile-And-Install.md b/docs/TFServing-Compile-And-Install.md
