From 6383bd164c39fa8134f422f3e3b70fcbdf8dfda5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2019 08:43:17 +0000 Subject: [PATCH 1/4] Bump tensorflow from 1.12.3 to 1.15.0 in /cvat/requirements Bumps [tensorflow](https://github.com/tensorflow/tensorflow) from 1.12.3 to 1.15.0. - [Release notes](https://github.com/tensorflow/tensorflow/releases) - [Changelog](https://github.com/tensorflow/tensorflow/blob/master/RELEASE.md) - [Commits](https://github.com/tensorflow/tensorflow/compare/v1.12.3...v1.15.0) Signed-off-by: dependabot[bot] --- cvat/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cvat/requirements/base.txt b/cvat/requirements/base.txt index aad7a1be127..5fe31b00964 100644 --- a/cvat/requirements/base.txt +++ b/cvat/requirements/base.txt @@ -40,7 +40,7 @@ django-rest-auth[with_social]==0.9.5 cython==0.29.13 matplotlib==3.0.3 scikit-image==0.15.0 -tensorflow==1.12.3 +tensorflow==1.15.0 keras==2.2.5 opencv-python==4.1.0.25 h5py==2.9.0 From 18ead2391458d2d00dae87aa5879877acf05504f Mon Sep 17 00:00:00 2001 From: Nikita Manovich Date: Tue, 17 Dec 2019 19:55:49 +0300 Subject: [PATCH 2/4] Update pip because tensorflow 1.15 cannot not be found. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cb5da2f4053..57d83774f68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,7 @@ RUN apt-get update && \ git-core \ libsm6 \ libxext6 && \ - pip3 install -U setuptools && \ + pip install -U pip && pip3 install -U setuptools && \ ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime && \ dpkg-reconfigure -f noninteractive tzdata && \ add-apt-repository --remove ppa:mc3man/gstffmpeg-keep -y && \ From 54bd6f0d7649b44b1dbead499da3184e79cd50b0 Mon Sep 17 00:00:00 2001 From: Nikita Manovich Date: Tue, 17 Dec 2019 19:57:24 +0300 Subject: [PATCH 3/4] Fix a typo (pip -> pip3) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 57d83774f68..247808ece20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,7 @@ RUN apt-get update && \ git-core \ libsm6 \ libxext6 && \ - pip install -U pip && pip3 install -U setuptools && \ + pip3 install -U pip && pip3 install -U setuptools && \ ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime && \ dpkg-reconfigure -f noninteractive tzdata && \ add-apt-repository --remove ppa:mc3man/gstffmpeg-keep -y && \ From cb3e35f8387235ca4b1d21f944d7aa4548852bc3 Mon Sep 17 00:00:00 2001 From: Nikita Manovich Date: Tue, 17 Dec 2019 21:49:17 +0300 Subject: [PATCH 4/4] Replaced pip3 by python3 -m pip. --- Dockerfile | 9 +++++---- components/cuda/install.sh | 4 ++-- cvat/apps/documentation/installation.md | 2 +- utils/open_model_zoo/yolov3/README.md | 10 +++++----- utils/tfrecords/converter.md | 14 +++++++------- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index 247808ece20..4b2a04484ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,8 @@ RUN apt-get update && \ git-core \ libsm6 \ libxext6 && \ - pip3 install -U pip && pip3 install -U setuptools && \ + python3 -m pip install -U pip && \ + python3 -m pip install -U setuptools && \ ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime && \ dpkg-reconfigure -f noninteractive tzdata && \ add-apt-repository --remove ppa:mc3man/gstffmpeg-keep -y && \ @@ -115,9 +116,9 @@ RUN if [ "$WITH_TESTS" = "yes" ]; then \ # Install and initialize CVAT, copy all necessary files COPY cvat/requirements/ /tmp/requirements/ COPY supervisord.conf mod_wsgi.conf wait-for-it.sh manage.py ${HOME}/ -RUN pip3 install --no-cache-dir -r /tmp/requirements/${DJANGO_CONFIGURATION}.txt +RUN python3 -m pip install --no-cache-dir -r /tmp/requirements/${DJANGO_CONFIGURATION}.txt # pycocotools package is impossible to install with its dependencies by one pip install command -RUN pip3 install --no-cache-dir pycocotools==2.0.0 +RUN python3 -m pip install --no-cache-dir pycocotools==2.0.0 # Install git application dependencies RUN apt-get update && \ @@ -156,7 +157,7 @@ COPY cvat-core/ ${HOME}/cvat-core COPY tests ${HOME}/tests COPY datumaro/ ${HOME}/datumaro -RUN sed -r "s/^(.*)#.*$/\1/g" ${HOME}/datumaro/requirements.txt | xargs -n 1 -L 1 pip3 install --no-cache-dir +RUN sed -r "s/^(.*)#.*$/\1/g" ${HOME}/datumaro/requirements.txt | xargs -n 1 -L 1 python3 -m pip install --no-cache-dir # Binary option is necessary to correctly apply the patch on Windows platform. # https://unix.stackexchange.com/questions/239364/how-to-fix-hunk-1-failed-at-1-different-line-endings-message diff --git a/components/cuda/install.sh b/components/cuda/install.sh index 2cda99fcb76..757120468a7 100755 --- a/components/cuda/install.sh +++ b/components/cuda/install.sh @@ -33,5 +33,5 @@ apt-get update && apt-get install -y --no-install-recommends --allow-unauthentic rm -rf /var/lib/apt/lists/* \ /etc/apt/sources.list.d/nvidia-ml.list /etc/apt/sources.list.d/cuda.list -pip3 uninstall -y tensorflow -pip3 install --no-cache-dir tensorflow-gpu==1.12.3 +python3 -m pip uninstall -y tensorflow +python3 -m pip install --no-cache-dir tensorflow-gpu==1.15.0 diff --git a/cvat/apps/documentation/installation.md b/cvat/apps/documentation/installation.md index 7fb94fc7eee..4c9fc0ee3f7 100644 --- a/cvat/apps/documentation/installation.md +++ b/cvat/apps/documentation/installation.md @@ -58,7 +58,7 @@ server. Proxy is an advanced topic and it is not covered by the guide. ```bash sudo apt-get install -y python3-pip - sudo pip3 install docker-compose + sudo python3 -m pip install docker-compose ``` - Clone _CVAT_ source code from the diff --git a/utils/open_model_zoo/yolov3/README.md b/utils/open_model_zoo/yolov3/README.md index 28cbac5ef37..2e47953cb3f 100644 --- a/utils/open_model_zoo/yolov3/README.md +++ b/utils/open_model_zoo/yolov3/README.md @@ -6,17 +6,17 @@ As of OpenVINO 2019 R3, only tensorflow 1.13 and NetworkX 2.3. These can be explicitly installed using the following command. ```bash -$ pip3 install tensorflow==1.13 networkx==2.3 +python3 -m pip install tensorflow==1.13 networkx==2.3 ``` Additionally, at the time of writing, the model optimizer required an input shape. ``` bash -$ python3 mo_tf.py \ - --input_model /path/to/yolo_v3.pb \ - --tensorflow_use_custom_operations_config $MO_ROOT/extensions/front/tf/yolo_v3.json \ - --input_shape [1,416,416,3] +python3 mo_tf.py \ + --input_model /path/to/yolo_v3.pb \ + --tensorflow_use_custom_operations_config $MO_ROOT/extensions/front/tf/yolo_v3.json \ + --input_shape [1,416,416,3] ``` [1]: https://docs.openvinotoolkit.org/latest/_docs_MO_DG_prepare_model_convert_model_tf_specific_Convert_YOLO_From_Tensorflow.html diff --git a/utils/tfrecords/converter.md b/utils/tfrecords/converter.md index 96d56ffcb58..875f165f37d 100644 --- a/utils/tfrecords/converter.md +++ b/utils/tfrecords/converter.md @@ -23,7 +23,7 @@ sudo apt-get install -y --no-install-recommends python3-pip python3-dev ``` ``` bash -pip3 install -r requirements.txt +python3 -m pip install -r requirements.txt ``` ### 2. Install the tensorflow object detection API @@ -38,12 +38,12 @@ git clone https://github.com/tensorflow/models.git ``` ```bash # install some dependencies -pip3 install --user Cython -pip3 install --user contextlib2 -pip3 install --user pillow -pip3 install --user lxml -pip3 install --user jupyter -pip3 install --user matplotlib +python3 -m pip install --user Cython +python3 -m pip install --user contextlib2 +python3 -m pip install --user pillow +python3 -m pip install --user lxml +python3 -m pip install --user jupyter +python3 -m pip install --user matplotlib ``` ```bash # clone and compile the cocoapi