fix dockerfile using tf2.3.0

Author: zh794390558

Diff for: .travis.yml

@@ -6,7 +6,7 @@ services:
 before_install:
   - export DELTA_PATH=`pwd`; echo $DELTA_PATH
   - export DOCKER_DELTA="/home/gitlab-runner/delta"; echo $DOCKER_DELTA
-  - export CI_IMAGE=zh794390558/delta:ci-cpu-py3
+  - export CI_IMAGE=zh794390558/delta:2.3.0-ci-cpu-py3
   - docker pull ${CI_IMAGE}
   - docker run -it -d --name travis_con --user root -v ${DELTA_PATH}:${DOCKER_DELTA} ${CI_IMAGE} bash
   - docker exec travis_con bash -c "gcc -v && g++ -v"

Diff for: docker/build.sh

@@ -1,4 +1,5 @@
 #!/bin/bash 
+set -x
 
 if [ $# != 3 ];then
   echo "usage: $0 [ci|delta|deltann] [cpu|gpu] [build|push|dockerfile]"
@@ -34,7 +35,7 @@ fi
 
 TAG=${TF_VER}-${TARGET}-${DEVICE}-py3
 DOCKER='sudo docker'
-PIP_INSTALL="pip --no-cache-dir install -i https://pypi.tuna.tsinghua.edu.cn/simple/"
+PIP_INSTALL="pip --no-cache-dir install -i https://mirrors.aliyun.com/pypi/simple"
 
 set -e
 set -u
@@ -48,14 +49,19 @@ on_exit() {
 trap on_exit HUP INT PIPE QUIT TERM EXIT
 
 
+# https://hub.docker.com/r/tensorflow/tensorflow
+# Versioned images <= 1.15.0 (1.x) and <= 2.1.0 (2.x) have Python 3 
+# (3.5 for Ubuntu 16-based images; 3.6 for Ubuntu 18-based images) in images tagged "-py3"
+# and Python 2.7 in images without "py" in the tag. 
+# All newer images are Python 3 only. Tags containing -py3 are deprecated.
 if [ ${DEVICE} == 'cpu' ] && [ ${TARGET} == 'deltann' ];then
-  IMAGE=tensorflow/tensorflow:devel-py3
+  IMAGE=tensorflow/tensorflow:devel
 elif [ ${DEVICE} == 'gpu' ] && [ ${TARGET} == 'deltann' ];then
-  IMAGE=tensorflow/tensorflow:devel-gpu-py3
+  IMAGE=tensorflow/tensorflow:devel-gpu
 elif [ ${DEVICE} == 'cpu' ] && [ ${TARGET} == 'delta' ] || [ ${TARGET} == 'ci' ];then
-  IMAGE=tensorflow/tensorflow:${TF_VER}-py3
+  IMAGE=tensorflow/tensorflow:${TF_VER}
 elif [ ${DEVICE} == 'gpu' ] && [ ${TARGET} == 'delta' ] || [ ${TARGET} == 'ci' ];then
-  IMAGE=tensorflow/tensorflow:${TF_VER}-gpu-py3
+  IMAGE=tensorflow/tensorflow:${TF_VER}-gpu
 else
   echo "no support target or device"
   exit -1
@@ -134,11 +140,11 @@ if [ $MODE == 'push' ] || [ $MODE == 'build' ];then
   $DOCKER pull $IMAGE
 
   # build image
-  $DOCKER build --no-cache=false -t delta:$TAG -f $DOCKERFILE . || { echo "build ${TARGET} ${DEVICE} error"; exit 1; }
+  $DOCKER build --no-cache=false -t zh794390558/delta:$TAG -f $DOCKERFILE . || { echo "build ${TARGET} ${DEVICE} error"; exit 1; }
 
   #push image
   if [ $MODE == 'push' ];then
-    $DOCKER tag delta:${TAG} zh794390558/delta:${TAG}
+    #$DOCKER tag delta:${TAG} zh794390558/delta:${TAG}
     $DOCKER push zh794390558/delta:$TAG
 
     if [ $? == 0  ]; then

Diff for: docker/dockerfile.ci.cpu

@@ -1,4 +1,4 @@
-FROM tensorflow/tensorflow:2.3.0-py3
+FROM tensorflow/tensorflow:2.3.0
 COPY sources.list.ubuntu18.04 /etc/apt/sources.list
 
 # install tools 
@@ -7,6 +7,6 @@ RUN /bin/bash /install.sh
 
 COPY requirements.txt /ci/requirements.txt
 WORKDIR /ci
-RUN sudo pip --no-cache-dir install -i https://pypi.tuna.tsinghua.edu.cn/simple/ --upgrade pip && pip --no-cache-dir install -i https://pypi.tuna.tsinghua.edu.cn/simple/ --user -r requirements.txt
+RUN sudo pip --no-cache-dir install -i https://mirrors.aliyun.com/pypi/simple --upgrade pip && pip --no-cache-dir install -i https://mirrors.aliyun.com/pypi/simple --user -r requirements.txt
 
 CMD ["/bin/bash", "-c"]

Diff for: docker/dockerfile.delta.cpu

@@ -1,4 +1,4 @@
-FROM tensorflow/tensorflow:2.3.0-py3
+FROM tensorflow/tensorflow:2.3.0
 COPY sources.list.ubuntu18.04 /etc/apt/sources.list
 
 # install tools 

Diff for: docker/dockerfile.delta.gpu

@@ -1,4 +1,4 @@
-FROM tensorflow/tensorflow:2.3.0-gpu-py3
+FROM tensorflow/tensorflow:2.3.0-gpu
 COPY sources.list.ubuntu18.04 /etc/apt/sources.list
 
 # install tools 

Diff for: docker/dockerfile.deltann.cpu

@@ -1,4 +1,4 @@
-FROM tensorflow/tensorflow:devel-py3
+FROM tensorflow/tensorflow:devel
 COPY sources.list.ubuntu18.04 /etc/apt/sources.list
 
 # install tools 

Diff for: docker/dockerfile.deltann.gpu

@@ -1,4 +1,4 @@
-FROM tensorflow/tensorflow:devel-gpu-py3
+FROM tensorflow/tensorflow:devel-gpu
 COPY sources.list.ubuntu18.04 /etc/apt/sources.list
 
 # install tools 

Diff for: docker/requirements.txt

@@ -5,9 +5,11 @@
 matplotlib
 sklearn
 pandas
-librosa
+librosa>=0.7.2
+numba==0.48.0  #must be this by librosa>=0.7.2
 absl-py
 jieba
+wget
 kaldiio
 soundfile
 textgrid
@@ -28,4 +30,5 @@ pyAudioAnalysis
 flake8
 sentencepiece
 deepdiff
-tensorflow_addons
+tensorflow-addons==0.11.1
+tensorflow-model-optimization

Diff for: env.sh

@@ -14,7 +14,7 @@ else
 fi
 
 # need version
-export TF_VER=2.0.0
+export TF_VER=2.3.0
 export PY_VER=3.6
 
 # root dir

Diff for: tools/requirements.txt

@@ -30,5 +30,5 @@ pyAudioAnalysis
 flake8
 sentencepiece
 deepdiff
-tensorflow-addons==0.6.0
+tensorflow-addons==0.11.1
 tensorflow-model-optimization