Prechádzať zdrojové kódy

Invoke virtualenv via module

Lutz Roeder 7 rokov pred
rodič
commit
00d7dd2a4c
7 zmenil súbory, kde vykonal 12 pridanie a 9 odobranie
  1. 2 2
      tools/coreml
  2. 1 1
      tools/keras
  3. 1 1
      tools/onnx
  4. 5 2
      tools/pytorch
  5. 1 1
      tools/sklearn
  6. 1 1
      tools/tf
  7. 1 1
      tools/tflite

+ 2 - 2
tools/coreml

@@ -43,8 +43,8 @@ sync() {
 
 install() {
     bold "coreml install"
-    [ -n "$(which virtualenv)" ] || ${python} -m pip install --force-reinstall --user --quiet virtualenv
-    [ -d "${virtualenv}" ] || virtualenv --quiet -p ${python} ${virtualenv}
+    [ -n "$(python3 -m pip list --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}
     source ${virtualenv}/bin/activate
     ${python} -m pip install --quiet ${third_party}/${identifier}
     deactivate

+ 1 - 1
tools/keras

@@ -45,7 +45,7 @@ sync() {
 
 install() {
     bold "keras install"
-    [ -n "$(which virtualenv)" ] || ${python} -m pip install --force-reinstall --user --quiet virtualenv
+    [ -n "$(python3 -m pip list --disable-pip-version-check | grep -w virtualenv)" ] || ${python} -m pip install --force-reinstall --user --quiet virtualenv
     [ -d "${virtualenv}" ] || virtualenv --quiet -p ${python} ${virtualenv}
     source ${virtualenv}/bin/activate
     ${python} -m pip install --quiet tensorflow

+ 1 - 1
tools/onnx

@@ -58,7 +58,7 @@ install() {
             brew list protobuf > /dev/null 2>&1 || brew install protobuf > /dev/null
             ;;
     esac
-    [ -n "$(which virtualenv)" ] || ${python} -m pip install --force-reinstall --user --quiet virtualenv
+    [ -n "$(python3 -m pip list --disable-pip-version-check | grep -w virtualenv)" ] || ${python} -m pip install --force-reinstall --user --quiet virtualenv
     [ -d "${virtualenv}" ] || virtualenv --quiet -p ${python} ${virtualenv}
     source ${virtualenv}/bin/activate
     ${python} -m pip install --quiet protobuf

+ 5 - 2
tools/pytorch

@@ -48,6 +48,9 @@ sync() {
 install() {
     bold "pytorch install"
     case "$(uname)" in
+        "Linux")
+            [ -n "$(which cmake)" ] || sudo apt install -y cmake
+            ;;
         "Darwin")
             brew list automake > /dev/null 2>&1 || brew install automake > /dev/null
             brew list cmake > /dev/null 2>&1 || brew install cmake > /dev/null
@@ -55,8 +58,8 @@ install() {
             brew list glog > /dev/null 2>&1 || brew install glog > /dev/null
             ;;
     esac
-    [ -n "$(which virtualenv)" ] || ${python} -m pip install --force-reinstall --user --quiet virtualenv
-    [ -d "${virtualenv}" ] || virtualenv --quiet -p ${python} ${virtualenv}
+    [ -n "$(python3 -m pip list --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}
     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

+ 1 - 1
tools/sklearn

@@ -50,7 +50,7 @@ install() {
             export DYLD_LIBRARY_PATH=/usr/local/opt/libomp/lib
             ;;
     esac
-    [ -n "$(which virtualenv)" ] || ${python} -m pip install --force-reinstall --user --quiet virtualenv
+    [ -n "$(python3 -m pip list --disable-pip-version-check | grep -w virtualenv)" ] || ${python} -m pip install --force-reinstall --user --quiet virtualenv
     [ -d "${virtualenv}" ] || virtualenv --quiet -p ${python} ${virtualenv}
     source ${virtualenv}/bin/activate
     ${python} -m pip install --quiet Cython

+ 1 - 1
tools/tf

@@ -53,7 +53,7 @@ install() {
             brew list protobuf > /dev/null 2>&1 || brew install protobuf > /dev/null
             ;;
     esac
-    [ -n "$(which virtualenv)" ] || ${python} -m pip install --force-reinstall --user --quiet virtualenv
+    [ -n "$(python3 -m pip list --disable-pip-version-check | grep -w virtualenv)" ] || ${python} -m pip install --force-reinstall --user --quiet virtualenv
     [ -d "${virtualenv}" ] || virtualenv --quiet -p ${python} ${virtualenv}
     source ${virtualenv}/bin/activate
     ${python} -m pip install --quiet protobuf

+ 1 - 1
tools/tflite

@@ -57,7 +57,7 @@ install() {
     cmake -G "Unix Makefiles" .
     make
     popd > /dev/null
-    [ -n "$(which virtualenv)" ] || ${python} -m pip install --force-reinstall --user --quiet virtualenv
+    [ -n "$(python3 -m pip list --disable-pip-version-check | grep -w virtualenv)" ] || ${python} -m pip install --force-reinstall --user --quiet virtualenv
     [ -d "${virtualenv}" ] || virtualenv --quiet -p ${python} ${virtualenv}
 }