Merge remote-tracking branch 'cvat_dev/develop' into develop

Dockerfile

@@ -54,7 +54,8 @@ RUN apt-get update && \
         tzdata \
         unrar \
         vim && \
-    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 && \
@@ -123,9 +124,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 && \
@@ -165,7 +166,7 @@ COPY cvat-data/ ${HOME}/cvat-data
 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

README.md

@@ -42,6 +42,7 @@ Format selection is possible after clicking on the Upload annotation / Dump anno
 | [YOLO](https://pjreddie.com/darknet/yolo/)                                         | X      | X      |
 | [MS COCO Object Detection](http://cocodataset.org/#format-data)                    | X      | X      |
 | PNG mask                                                                           | X      |        |
+| PNG instance mask                                                                  | X      |        |
 | [TFrecord](https://www.tensorflow.org/tutorials/load_data/tf_records)              | X      | X      |
 | [MOT](https://motchallenge.net/)                                                   | X      | X      |
 | [LabelMe](http://labelme.csail.mit.edu/Release3.0)                                 | X      | X      |

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

cvat-ui/.gitignore

@@ -2,4 +2,6 @@
 
 /node_modules
 /dist
+/build
+/yarn.lock