Git Bash Python support

tools/coreml

@@ -3,7 +3,10 @@
 set -e
 pushd $(cd $(dirname ${0})/..; pwd) > /dev/null
 
-[[ "$(python3 --version 2> /dev/null)" =~ "Python 3" ]] && python=python3 || python=python
+case "${OSTYPE}" in
+    msys*) python="winpty python";;
+    *) python=python3;;
+esac
 
 venv() {
     venv_dir=./third_party/venv/coremltools

tools/keras

@@ -3,7 +3,10 @@
 set -e
 pushd $(cd $(dirname ${0})/..; pwd) > /dev/null
 
-[[ "$(python3 --version 2> /dev/null)" =~ "Python 3" ]] && python=python3 || python=python
+case "${OSTYPE}" in
+    msys*) python="winpty python";;
+    *) python=python3;;
+esac
 
 bold() {
     echo "$(tty -s && tput bold)$1$(tty -s && tput sgr0)" 
@@ -48,6 +51,7 @@ install() {
 metadata() {
     bold "keras metadata"
     venv
+    export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
     ${python} ./tools/keras-script.py metadata
     deactivate
 }
@@ -55,6 +59,7 @@ metadata() {
 zoo() {
     bold "keras zoo"
     venv
+    export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
     ${python} ./tools/keras-script.py zoo
     deactivate
 }

tools/mlnet

@@ -3,7 +3,10 @@
 set -e
 pushd $(cd $(dirname ${0})/..; pwd) > /dev/null
 
-[[ "$(python3 --version 2> /dev/null)" =~ "Python 3" ]] && python=python3 || python=python
+case "${OSTYPE}" in
+    msys*) python="winpty python";;
+    *) python=python3;;
+esac
 
 bold() {
     echo "$(tty -s && tput bold)$1$(tty -s && tput sgr0)" 
@@ -28,6 +31,7 @@ sync() {
 
 metadata() {
     bold "mlnet metadata"
+    export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
     ${python} ./tools/mlnet-script.py metadata
 }
 

tools/onnx

@@ -5,7 +5,10 @@ pushd $(cd $(dirname ${0})/..; pwd) > /dev/null
 
 identifier=onnx
 
-[[ "$(python3 --version 2> /dev/null)" =~ "Python 3" ]] && python=python3 || python=python
+case "${OSTYPE}" in
+    msys*) python="winpty python";;
+    *) python=python3;;
+esac
 
 bold() {
     echo "$(tty -s && tput bold)$1$(tty -s && tput sgr0)" 
@@ -80,6 +83,7 @@ metadata() {
     bold "onnx metadata"
     [[ $(grep -U $'\x0D' ./src/onnx-metadata.json) ]] && crlf=1
     venv
+    export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
     ${python} ./tools/onnx-script.py metadata
     deactivate
     if [[ -n ${crlf} ]]; then
@@ -91,6 +95,7 @@ convert() {
     bold "onnx convert"
     venv
     ${python} -m pip install --quiet ./third_party/onnxmltools
+    export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
     ${python} ./tools/onnx-script.py convert ${1}
     deactivate
 }
@@ -98,6 +103,7 @@ convert() {
 infer() {
     bold "onnx infer"
     venv
+    export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
     ${python} ./tools/onnx-script.py infer ${1}
     deactivate
 }
@@ -105,6 +111,7 @@ infer() {
 optimize() {
     bold "onnx optimize"
     venv
+    export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
     ${python} ./tools/onnx-script.py optimize ${1}
     deactivate
 }

tools/pytorch

@@ -3,7 +3,10 @@
 set -e
 pushd $(cd $(dirname ${0})/..; pwd) > /dev/null
 
-[[ "$(python3 --version 2> /dev/null)" =~ "Python 3" ]] && python=python3 || python=python
+case "${OSTYPE}" in
+    msys*) python="winpty python";;
+    *) python=python3;;
+esac
 
 bold() {
     echo "$(tty -s && tput bold)$1$(tty -s && tput sgr0)" 
@@ -65,6 +68,7 @@ schema() {
 metadata() {
     [[ $(grep -U $'\x0D' ./src/pytorch-metadata.json) ]] && crlf=1
     venv
+    export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
     bold "pytorch metadata"
     ${python} ./tools/pytorch-script.py metadata
     bold "caffe2 metadata"
@@ -79,6 +83,7 @@ metadata() {
 zoo() {
     bold "pytorch zoo"
     venv
+    export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
     ${python} ./tools/pytorch-script.py zoo
     deactivate
 }

tools/sklearn

@@ -3,7 +3,10 @@
 set -e
 pushd $(cd $(dirname ${0})/..; pwd) > /dev/null
 
-[[ "$(python3 --version 2> /dev/null)" =~ "Python 3" ]] && python=python3 || python=python
+case "${OSTYPE}" in
+    msys*) python="winpty python";;
+    *) python=python3;;
+esac
 
 bold() {
     echo "$(tty -s && tput bold)$1$(tty -s && tput sgr0)" 
@@ -60,6 +63,7 @@ metadata() {
     bold "sklearn metadata"
     [[ $(grep -U $'\x0D' ./src/sklearn-metadata.json) ]] && crlf=1
     venv
+    export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
     ${python} ./tools/sklearn-script.py
     deactivate
     if [[ -n ${crlf} ]]; then

tools/tf

@@ -3,7 +3,10 @@
 set -e
 pushd $(cd $(dirname ${0})/..; pwd) > /dev/null
 
-[[ "$(python3 --version 2> /dev/null)" =~ "Python 3" ]] && python=python3 || python=python
+case "${OSTYPE}" in
+    msys*) python="winpty python";;
+    *) python=python3;;
+esac
 
 bold() {
     echo "$(tty -s && tput bold)$1$(tty -s && tput sgr0)" 
@@ -108,6 +111,7 @@ metadata() {
     touch ./tools/tensorflow/__init__.py
     touch ./tools/tensorflow/core/__init__.py
     touch ./tools/tensorflow/core/framework/__init__.py
+    export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
     ${python} ./tools/tf-script.py metadata
     rm -rf ./tools/tensorflow
     deactivate

tools/tf-script.py

@@ -303,4 +303,4 @@ def metadata():
 if __name__ == '__main__':
     command_table = { 'metadata': metadata }
     command = sys.argv[1];
-    command_table[command]()
+    command_table[command]()

tools/tflite

@@ -3,7 +3,10 @@
 set -e
 pushd $(cd $(dirname ${0})/..; pwd) > /dev/null
 
-[[ "$(python3 --version 2> /dev/null)" =~ "Python 3" ]] && python=python3 || python=python
+case "${OSTYPE}" in
+    msys*) python="winpty python";;
+    *) python=python3;;
+esac
 
 bold() {
     echo "$(tty -s && tput bold)$1$(tty -s && tput sgr0)" 
@@ -88,6 +91,7 @@ EOT
 visualize() {
     bold "tflite visualize"
     venv
+    export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
     ${python} -m pip install --quiet tensorflow
     ${python} ./third_party/tensorflow/tensorflow/lite/tools/visualize.py $@
     deactivate