Move scripts to python3

tools/caffe

@@ -22,7 +22,7 @@ git_sync() {
     else
         git -C "${third_party}" clone --quiet --recursive ${2}
     fi
-    git -C "${third_party}" submodule update --quiet --init
+    git -C "${third_party}/${1}" submodule update --quiet --init
 }
 
 clean() {

tools/cntk

@@ -22,7 +22,7 @@ git_sync() {
     else
         git -C "${third_party}" clone --quiet --recursive ${2} ${1}
     fi
-    git -C "${third_party}" submodule update --quiet --init
+    git -C "${third_party}/${1}" submodule update --quiet --init
 }
 
 clean() {

tools/coreml

@@ -11,12 +11,6 @@ tools=${root}/tools
 identifier=coremltools
 virtualenv=${third_party}/virtualenv/${identifier}
 
-if [ $(which python3) ]; then
-    python="python3"
-else
-    python="python"
-fi
-
 bold() {
     echo "$(tty -s && tput bold)$1$(tty -s && tput sgr0)" 
 }
@@ -43,10 +37,10 @@ sync() {
 
 install() {
     bold "coreml install"
-    [ -n "$(python3 -m pip list --format columns --disable-pip-version-check | grep -w virtualenv)" ] || ${python} -m pip install --force-reinstall --user --quiet virtualenv
-    [ -d "${virtualenv}" ] || ${python} -m virtualenv --quiet -p ${python} ${virtualenv}
+    [ -n "$(python3 -m pip list --format columns --disable-pip-version-check | grep -w virtualenv)" ] || python3 -m pip install --force-reinstall --user --quiet virtualenv
+    [ -d "${virtualenv}" ] || python3 -m virtualenv --quiet -p python3 ${virtualenv}
     source ${virtualenv}/bin/activate
-    ${python} -m pip install --quiet ${third_party}/${identifier}
+    python3 -m pip install --quiet ${third_party}/${identifier}
     deactivate
 }
 
@@ -59,9 +53,9 @@ schema() {
 convert() {
     bold "coreml convert"
     source ${virtualenv}/bin/activate
-    ${python} -m pip install --quiet onnx
-    ${python} -m pip install --quiet sklearn
-    ${python} ${tools}/coreml-script.py convert ${1}
+    python3 -m pip install --quiet onnx
+    python3 -m pip install --quiet sklearn
+    python3 ${tools}/coreml-script.py convert ${1}
     deactivate
 }
 

tools/darknet

@@ -22,7 +22,7 @@ git_sync() {
     else
         git -C "${third_party}" clone --quiet --recursive ${2} ${1}
     fi
-    git -C "${third_party}" submodule update --quiet --init
+    git -C "${third_party}/${1}" submodule update --quiet --init
 }
 
 clean() {

tools/dl4j

@@ -22,7 +22,7 @@ git_sync() {
     else
         git -C "${third_party}" clone --quiet --recursive ${2} ${1}
     fi
-    git -C "${third_party}" submodule update --quiet --init
+    git -C "${third_party}/${1}" submodule update --quiet --init
 }
 
 clean() {
@@ -32,7 +32,7 @@ clean() {
 
 sync() {
     bold "deeplearning4j sync"
-    git_sync dl4j [email protected]:eclipse/deeplearning4j.git
+    git_sync dl4j https://github.com/eclipse/deeplearning4j.git
 }
 
 while [ "$#" != 0 ]; do

tools/keras

@@ -8,12 +8,6 @@ test=${root}/test
 third_party=${root}/third_party
 tools=${root}/tools
 
-if [ $(which python3) ]; then
-    python="python3"
-else
-    python="python"
-fi
-
 identifier=keras
 virtualenv=${third_party}/virtualenv/${identifier}
 
@@ -29,7 +23,7 @@ git_sync() {
     else
         git -C "${third_party}" clone --quiet --recursive ${2}
     fi
-    git -C "${third_party}" submodule update --quiet --init
+    git -C "${third_party}/${1}" submodule update --quiet --init
 }
 
 clean() {
@@ -45,11 +39,11 @@ sync() {
 
 install() {
     bold "keras install"
-    [ -n "$(python3 -m pip list --format columns --disable-pip-version-check | grep -w virtualenv)" ] || ${python} -m pip install --force-reinstall --user --quiet virtualenv
-    [ -d "${virtualenv}" ] || virtualenv --quiet -p ${python} ${virtualenv}
+    [ -n "$(python3 -m pip list --format columns --disable-pip-version-check | grep -w virtualenv)" ] || python3 -m pip install --force-reinstall --user --quiet virtualenv
+    [ -d "${virtualenv}" ] || virtualenv --quiet -p python3 ${virtualenv}
     source ${virtualenv}/bin/activate
-    ${python} -m pip install --quiet tensorflow
-    ${python} -m pip install --quiet ${third_party}/${identifier}
+    python3 -m pip install --quiet tensorflow
+    python3 -m pip install --quiet ${third_party}/${identifier}
     deactivate
 }
 
@@ -57,7 +51,7 @@ metadata() {
     bold "keras metadata"
     source ${virtualenv}/bin/activate
     pushd ${tools} > /dev/null
-    ${python} keras-script.py metadata
+    python3 keras-script.py metadata
     popd > /dev/null
     deactivate
 }
@@ -66,7 +60,7 @@ zoo() {
     bold "keras zoo"
     source ${virtualenv}/bin/activate
     pushd ${tools} > /dev/null
-    ${python} keras-script.py zoo
+    python3 keras-script.py zoo
     popd > /dev/null
     deactivate
 }

tools/mxnet

@@ -7,14 +7,6 @@ src=${root}/src
 third_party=${root}/third_party
 tools=${root}/tools
 
-if [ $(which python3) ] && [ $(which pip3) ]; then
-    python="python3"
-    pip="pip3"
-else
-    python="python"
-    pip="pip"
-fi
-
 identifier=mxnet
 
 bold() {
@@ -29,7 +21,7 @@ git_sync() {
     else
         git -C "${third_party}" clone --quiet --recursive ${2} ${1}
     fi
-    git -C "${third_party}" submodule update --quiet --init
+    git -C "${third_party}/${1}" submodule update --quiet --init
 }
 
 clean() {
@@ -45,7 +37,7 @@ sync() {
 
 metadata() {
     bold "mxnet metadata"
-    # ${python} mxnet-script.py
+    # python3 mxnet-script.py
 }
 
 while [ "$#" != 0 ]; do

tools/ncnn

@@ -7,14 +7,6 @@ src=${root}/src
 third_party=${root}/third_party
 tools=${root}/tools
 
-if [ $(which python3) ] && [ $(which pip3) ]; then
-    python="python3"
-    pip="pip3"
-else
-    python="python"
-    pip="pip"
-fi
-
 identifier=ncnn
 
 bold() {
@@ -29,7 +21,7 @@ git_sync() {
     else
         git -C "${third_party}" clone --quiet --recursive ${2} ${1}
     fi
-    git -C "${third_party}" submodule update --quiet --init
+    git -C "${third_party}/${1}" submodule update --quiet --init
 }
 
 clean() {

tools/onnx

@@ -12,12 +12,6 @@ tools=${root}/tools
 identifier=onnx
 virtualenv=${third_party}/virtualenv/${identifier}
 
-if [ $(which python3) ]; then
-    python="python3"
-else
-    python="python"
-fi
-
 bold() {
     echo "$(tty -s && tput bold)$1$(tty -s && tput sgr0)" 
 }
@@ -30,7 +24,7 @@ git_sync() {
     else
         git -C "${third_party}" clone --quiet --recursive ${2}
     fi
-    git -C "${third_party}" submodule update --quiet --init
+    git -C "${third_party}/${1}" submodule update --quiet --init
 }
 
 clean() {
@@ -58,13 +52,13 @@ install() {
             brew list protobuf > /dev/null 2>&1 || brew install protobuf > /dev/null
             ;;
     esac
-    [ -n "$(python3 -m pip list --format columns --disable-pip-version-check | grep -w virtualenv)" ] || ${python} -m pip install --force-reinstall --user --quiet virtualenv
-    [ -d "${virtualenv}" ] || virtualenv --quiet -p ${python} ${virtualenv}
+    [ -n "$(python3 -m pip list --format columns --disable-pip-version-check | grep -w virtualenv)" ] || python3 -m pip install --force-reinstall --user --quiet virtualenv
+    [ -d "${virtualenv}" ] || virtualenv --quiet -p python3 ${virtualenv}
     source ${virtualenv}/bin/activate
-    ${python} -m pip install --quiet protobuf
+    python3 -m pip install --quiet protobuf
     export ONNX_ML=1
     export ONNX_NAMESPACE=onnx
-    ${python} -m pip install --quiet ${third_party}/onnx
+    python3 -m pip install --quiet ${third_party}/onnx
     deactivate
 }
 
@@ -81,7 +75,7 @@ metadata() {
     bold "onnx metadata"
     source ${virtualenv}/bin/activate
     pushd ${tools} > /dev/null
-    ${python} onnx-script.py metadata
+    python3 onnx-script.py metadata
     popd > /dev/null
     deactivate
 }
@@ -89,22 +83,22 @@ metadata() {
 convert() {
     bold "onnx convert"
     source ${virtualenv}/bin/activate
-    ${python} -m pip install --quiet ${third_party}/onnxmltools
-    ${python} ${tools}/onnx-script.py convert ${1}
+    python3 -m pip install --quiet ${third_party}/onnxmltools
+    python3 ${tools}/onnx-script.py convert ${1}
     deactivate
 }
 
 infer() {
     bold "onnx infer"
     source ${virtualenv}/bin/activate
-    ${python} ${tools}/onnx-script.py infer ${1}
+    python3 ${tools}/onnx-script.py infer ${1}
     deactivate
 }
 
 optimize() {
     bold "onnx optimize"
     source ${virtualenv}/bin/activate
-    ${python} ${tools}/onnx-script.py optimize ${1}
+    python3 ${tools}/onnx-script.py optimize ${1}
     deactivate
 }
 

tools/pytorch

@@ -13,12 +13,6 @@ tools=${root}/tools
 identifier=pytorch
 virtualenv=${third_party}/virtualenv/${identifier}
 
-if [ $(which python3) ]; then
-    python="python3"
-else
-    python="python"
-fi
-
 bold() {
     echo "$(tty -s && tput bold)$1$(tty -s && tput sgr0)" 
 }
@@ -31,7 +25,7 @@ git_sync() {
     else
         git -C "${third_party}" clone --quiet --recursive ${2} ${1}
     fi
-    git -C "${third_party}" submodule update --quiet --init --recursive
+    git -C "${third_party}/${1}" submodule update --quiet --init --recursive
 }
 
 clean() {
@@ -57,14 +51,15 @@ install() {
             brew list cmake > /dev/null 2>&1 || brew install cmake > /dev/null
             brew list gflags > /dev/null 2>&1 || brew install gflags > /dev/null
             brew list glog > /dev/null 2>&1 || brew install glog > /dev/null
+            brew uninstall protobuf
             ;;
     esac
-    [ -n "$(python3 -m pip list --format columns --disable-pip-version-check | grep -w virtualenv)" ] || ${python} -m pip install --force-reinstall --user --quiet virtualenv
-    [ -d "${virtualenv}" ] || ${python} -m virtualenv --quiet -p ${python} ${virtualenv}
+    [ -n "$(python3 -m pip list --format columns --disable-pip-version-check | grep -w virtualenv)" ] || python3 -m pip install --force-reinstall --user --quiet virtualenv
+    [ -d "${virtualenv}" ] || python3 -m virtualenv --quiet -p python3 ${virtualenv}
     source ${virtualenv}/bin/activate
-    ${python} -m pip install --quiet future leveldb numpy protobuf pydot python-gflags pyyaml scikit-image setuptools six hypothesis typing tqdm
-    ${python} -m pip install --quiet ${third_party}/pytorch
-    ${python} -m pip install --quiet ${third_party}/torchvision
+    python3 -m pip install --quiet future leveldb numpy protobuf pydot python-gflags pyyaml scikit-image setuptools six hypothesis typing tqdm mkl
+    python3 -m pip install --quiet ${third_party}/pytorch
+    python3 -m pip install --quiet ${third_party}/torchvision
     deactivate
 }
 
@@ -83,9 +78,9 @@ metadata() {
             ;;
     esac
     bold "pytorch metadata"
-    ${python} pytorch-script.py metadata
+    python3 pytorch-script.py metadata
     bold "caffe2 metadata"
-    ${python} caffe2-script.py metadata
+    python3 caffe2-script.py metadata
     popd > /dev/null
     deactivate
 }
@@ -99,7 +94,7 @@ zoo() {
             export LD_LIBRARY_PATH=$(dirname $(locate libiomp5.so)):${LD_LIBRARY_PATH}
             ;;
     esac
-    ${python} pytorch-script.py zoo
+    python3 pytorch-script.py zoo
     popd > /dev/null
     deactivate
 }

tools/sklearn

@@ -9,12 +9,6 @@ tools=${root}/tools
 identifier=scikit-learn
 virtualenv=${third_party}/virtualenv/${identifier}
 
-if [ $(which python3) ]; then
-    python="python3"
-else
-    python="python"
-fi
-
 bold() {
     echo "$(tty -s && tput bold)$1$(tty -s && tput sgr0)" 
 }
@@ -27,7 +21,7 @@ git_sync() {
     else
         git -C "${third_party}" clone --quiet --recursive ${2} ${1}
     fi
-    git -C "${third_party}" submodule update --quiet --init
+    git -C "${third_party}/${1}" submodule update --quiet --init
 }
 
 sync() {
@@ -52,13 +46,13 @@ install() {
             export DYLD_LIBRARY_PATH=/usr/local/opt/libomp/lib
             ;;
     esac
-    [ -n "$(python3 -m pip list --format columns --disable-pip-version-check | grep -w virtualenv)" ] || ${python} -m pip install --force-reinstall --user --quiet virtualenv
-    [ -d "${virtualenv}" ] || virtualenv --quiet -p ${python} ${virtualenv}
+    [ -n "$(python3 -m pip list --format columns --disable-pip-version-check | grep -w virtualenv)" ] || python3 -m pip install --force-reinstall --user --quiet virtualenv
+    [ -d "${virtualenv}" ] || virtualenv --quiet -p python3 ${virtualenv}
     source ${virtualenv}/bin/activate
-    ${python} -m pip install --quiet Cython
-    ${python} -m pip install --quiet numpy
-    ${python} -m pip install --quiet scipy
-    ${python} -m pip install --quiet ${third_party}/scikit-learn
+    python3 -m pip install --quiet Cython
+    python3 -m pip install --quiet numpy
+    python3 -m pip install --quiet scipy
+    python3 -m pip install --quiet ${third_party}/scikit-learn
     deactivate
 }
 
@@ -66,7 +60,7 @@ metadata() {
     bold "sklearn metadata"
     source ${virtualenv}/bin/activate
     pushd ${tools} > /dev/null
-    ${python} sklearn-script.py
+    python3 sklearn-script.py
     popd > /dev/null
     deactivate
 }

tools/tf

@@ -12,12 +12,6 @@ tools=${root}/tools
 identifier=tensorflow
 virtualenv=${third_party}/virtualenv/${identifier}
 
-if [ $(which python3) ]; then
-    python="python3"
-else
-    python="python"
-fi
-
 bold() {
     echo "$(tty -s && tput bold)$1$(tty -s && tput sgr0)" 
 }
@@ -53,10 +47,10 @@ install() {
             brew list protobuf > /dev/null 2>&1 || brew install protobuf > /dev/null
             ;;
     esac
-    [ -n "$(python3 -m pip list --format columns --disable-pip-version-check | grep -w virtualenv)" ] || ${python} -m pip install --force-reinstall --user --quiet virtualenv
-    [ -d "${virtualenv}" ] || virtualenv --quiet -p ${python} ${virtualenv}
+    [ -n "$(python3 -m pip list --format columns --disable-pip-version-check | grep -w virtualenv)" ] || python3 -m pip install --force-reinstall --user --quiet virtualenv
+    [ -d "${virtualenv}" ] || virtualenv --quiet -p python3 ${virtualenv}
     source ${virtualenv}/bin/activate
-    ${python} -m pip install --quiet protobuf
+    python3 -m pip install --quiet protobuf
     deactivate
 }
 
@@ -96,7 +90,7 @@ metadata() {
     touch ${tools}/tensorflow/__init__.py
     touch ${tools}/tensorflow/core/__init__.py
     touch ${tools}/tensorflow/core/framework/__init__.py
-    ${python} tf-script.py
+    python3 tf-script.py
     rm -rf ${tools}/tensorflow
     popd > /dev/null
     deactivate

tools/tflite

@@ -11,12 +11,6 @@ tools=${root}/tools
 identifier=tflite
 virtualenv=${third_party}/virtualenv/${identifier}
 
-if [ $(which python3) ]; then
-    python="python3"
-else
-    python="python"
-fi
-
 bold() {
     echo "$(tty -s && tput bold)$1$(tty -s && tput sgr0)" 
 }
@@ -57,8 +51,8 @@ install() {
     cmake -G "Unix Makefiles" .
     make
     popd > /dev/null
-    [ -n "$(python3 -m pip list --format columns --disable-pip-version-check | grep -w virtualenv)" ] || ${python} -m pip install --force-reinstall --user --quiet virtualenv
-    [ -d "${virtualenv}" ] || virtualenv --quiet -p ${python} ${virtualenv}
+    [ -n "$(python3 -m pip list --format columns --disable-pip-version-check | grep -w virtualenv)" ] || python3 -m pip install --force-reinstall --user --quiet virtualenv
+    [ -d "${virtualenv}" ] || virtualenv --quiet -p python3 ${virtualenv}
 }
 
 schema() {
@@ -82,8 +76,8 @@ EOT
 visualize() {
     bold "tflite visualize"
     source ${virtualenv}/bin/activate
-    ${python} -m pip install --quiet tensorflow
-    ${python} ${third_party}/tensorflow/tensorflow/lite/tools/visualize.py $@
+    python3 -m pip install --quiet tensorflow
+    python3 ${third_party}/tensorflow/tensorflow/lite/tools/visualize.py $@
     deactivate
 }
 

tools/torch

@@ -22,7 +22,7 @@ git_sync() {
     else
         git -C "${third_party}" clone --quiet --recursive ${2} ${1}
     fi
-    git -C "${third_party}" submodule update --quiet --init
+    git -C "${third_party}/${1}" submodule update --quiet --init
 }
 
 clean() {