Skip to content

Commit

Permalink
Bump tensorflow from 1.12.3 to 1.15.0 in /cvat/requirements (#968)
Browse files Browse the repository at this point in the history
* 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](tensorflow/tensorflow@v1.12.3...v1.15.0)

Signed-off-by: dependabot[bot] <support@github.com>

* Update pip because tensorflow 1.15 cannot not be found.

* Fix a typo (pip -> pip3)

* Replaced pip3 by python3 -m pip.
  • Loading branch information
dependabot[bot] authored and nmanovic committed Dec 17, 2019
1 parent c84daaf commit 4c72bc3
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 20 deletions.
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ RUN apt-get update && \
git-core \
libsm6 \
libxext6 && \
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 && \
Expand Down Expand Up @@ -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 && \
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions components/cuda/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion cvat/apps/documentation/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cvat/requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions utils/open_model_zoo/yolov3/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 7 additions & 7 deletions utils/tfrecords/converter.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 4c72bc3

Please sign in to comment.