Skip to content

Commit f30d86c

Browse files
dependabot[bot]Chris Lee-Messer
authored and
Chris Lee-Messer
committed
Bump tensorflow from 1.12.3 to 1.15.0 in /cvat/requirements (cvat-ai#968)
* 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] <[email protected]> * Update pip because tensorflow 1.15 cannot not be found. * Fix a typo (pip -> pip3) * Replaced pip3 by python3 -m pip.
1 parent 09d97a0 commit f30d86c

File tree

6 files changed

+21
-20
lines changed

6 files changed

+21
-20
lines changed

Dockerfile

+5-4
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ RUN apt-get update && \
4747
git-core \
4848
libsm6 \
4949
libxext6 && \
50-
pip3 install -U setuptools && \
50+
python3 -m pip install -U pip && \
51+
python3 -m pip install -U setuptools && \
5152
ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime && \
5253
dpkg-reconfigure -f noninteractive tzdata && \
5354
add-apt-repository --remove ppa:mc3man/gstffmpeg-keep -y && \
@@ -115,9 +116,9 @@ RUN if [ "$WITH_TESTS" = "yes" ]; then \
115116
# Install and initialize CVAT, copy all necessary files
116117
COPY cvat/requirements/ /tmp/requirements/
117118
COPY supervisord.conf mod_wsgi.conf wait-for-it.sh manage.py ${HOME}/
118-
RUN pip3 install --no-cache-dir -r /tmp/requirements/${DJANGO_CONFIGURATION}.txt
119+
RUN python3 -m pip install --no-cache-dir -r /tmp/requirements/${DJANGO_CONFIGURATION}.txt
119120
# pycocotools package is impossible to install with its dependencies by one pip install command
120-
RUN pip3 install --no-cache-dir pycocotools==2.0.0
121+
RUN python3 -m pip install --no-cache-dir pycocotools==2.0.0
121122

122123
# Install git application dependencies
123124
RUN apt-get update && \
@@ -156,7 +157,7 @@ COPY cvat-core/ ${HOME}/cvat-core
156157
COPY tests ${HOME}/tests
157158
COPY datumaro/ ${HOME}/datumaro
158159

159-
RUN sed -r "s/^(.*)#.*$/\1/g" ${HOME}/datumaro/requirements.txt | xargs -n 1 -L 1 pip3 install --no-cache-dir
160+
RUN sed -r "s/^(.*)#.*$/\1/g" ${HOME}/datumaro/requirements.txt | xargs -n 1 -L 1 python3 -m pip install --no-cache-dir
160161

161162
# Binary option is necessary to correctly apply the patch on Windows platform.
162163
# https://unix.stackexchange.com/questions/239364/how-to-fix-hunk-1-failed-at-1-different-line-endings-message

components/cuda/install.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ apt-get update && apt-get install -y --no-install-recommends --allow-unauthentic
3333
rm -rf /var/lib/apt/lists/* \
3434
/etc/apt/sources.list.d/nvidia-ml.list /etc/apt/sources.list.d/cuda.list
3535

36-
pip3 uninstall -y tensorflow
37-
pip3 install --no-cache-dir tensorflow-gpu==1.12.3
36+
python3 -m pip uninstall -y tensorflow
37+
python3 -m pip install --no-cache-dir tensorflow-gpu==1.15.0

cvat/apps/documentation/installation.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ server. Proxy is an advanced topic and it is not covered by the guide.
5858

5959
```bash
6060
sudo apt-get install -y python3-pip
61-
sudo pip3 install docker-compose
61+
sudo python3 -m pip install docker-compose
6262
```
6363

6464
- Clone _CVAT_ source code from the

cvat/requirements/base.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ django-rest-auth[with_social]==0.9.5
4040
cython==0.29.13
4141
matplotlib==3.0.3
4242
scikit-image==0.15.0
43-
tensorflow==1.12.3
43+
tensorflow==1.15.0
4444
keras==2.2.5
4545
opencv-python==4.1.0.25
4646
h5py==2.9.0

utils/open_model_zoo/yolov3/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ As of OpenVINO 2019 R3, only tensorflow 1.13 and NetworkX 2.3.
66
These can be explicitly installed using the following command.
77

88
```bash
9-
$ pip3 install tensorflow==1.13 networkx==2.3
9+
python3 -m pip install tensorflow==1.13 networkx==2.3
1010
```
1111

1212

1313
Additionally, at the time of writing, the model optimizer required an input shape.
1414

1515
``` bash
16-
$ python3 mo_tf.py \
17-
--input_model /path/to/yolo_v3.pb \
18-
--tensorflow_use_custom_operations_config $MO_ROOT/extensions/front/tf/yolo_v3.json \
19-
--input_shape [1,416,416,3]
16+
python3 mo_tf.py \
17+
--input_model /path/to/yolo_v3.pb \
18+
--tensorflow_use_custom_operations_config $MO_ROOT/extensions/front/tf/yolo_v3.json \
19+
--input_shape [1,416,416,3]
2020
```
2121

2222
[1]: https://docs.openvinotoolkit.org/latest/_docs_MO_DG_prepare_model_convert_model_tf_specific_Convert_YOLO_From_Tensorflow.html

utils/tfrecords/converter.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ sudo apt-get install -y --no-install-recommends python3-pip python3-dev
2323
```
2424

2525
``` bash
26-
pip3 install -r requirements.txt
26+
python3 -m pip install -r requirements.txt
2727
```
2828

2929
### 2. Install the tensorflow object detection API
@@ -38,12 +38,12 @@ git clone https://github.com/tensorflow/models.git
3838
```
3939
```bash
4040
# install some dependencies
41-
pip3 install --user Cython
42-
pip3 install --user contextlib2
43-
pip3 install --user pillow
44-
pip3 install --user lxml
45-
pip3 install --user jupyter
46-
pip3 install --user matplotlib
41+
python3 -m pip install --user Cython
42+
python3 -m pip install --user contextlib2
43+
python3 -m pip install --user pillow
44+
python3 -m pip install --user lxml
45+
python3 -m pip install --user jupyter
46+
python3 -m pip install --user matplotlib
4747
```
4848
```bash
4949
# clone and compile the cocoapi

0 commit comments

Comments
 (0)