Merge branch 'develop' of https://github.com/openvinotoolkit/cvat int…

…o dkru/cypress-test-review-pipline-feature

.travis.yml

@@ -1,7 +1,5 @@
-language: python
-
-python:
-  - '3.5'
+language: generic
+dist: focal
 
 cache:
   npm: true

CHANGELOG.md

@@ -5,21 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.2.0-beta] - Unreleased
+## [1.2.0] - Unreleased
 
 ### Added
 
-- Manual review pipeline: issues/comments/workspace (<https://github.com/openvinotoolkit/cvat/pull/2357>)
-- Added basic projects implementation (<https://github.com/openvinotoolkit/cvat/pull/2255>)
-- Added documentation on how to mount cloud starage(AWS S3 bucket, Azure container, Google Drive) as FUSE (<https://github.com/openvinotoolkit/cvat/pull/2377>)
-- Added ability to work with share files without copying inside (<https://github.com/openvinotoolkit/cvat/pull/2377>)
-- Tooltips in label selectors (<https://github.com/openvinotoolkit/cvat/pull/2509>)
-- Page redirect after login using `next` query parameter (<https://github.com/openvinotoolkit/cvat/pull/2527>)
+-
 
 ### Changed
 
-- PATCH requests from cvat-core submit only changed fields (<https://github.com/openvinotoolkit/cvat/pull/2445>)
-- Migrated to Antd 4.9 (<https://github.com/openvinotoolkit/cvat/pull/2536>)
+-
 
 ### Deprecated
 
@@ -31,6 +25,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+-
+
+### Security
+
+-
+
+## [1.2.0-beta] - 2020-12-15
+
+### Added
+
+- Manual review pipeline: issues/comments/workspace (<https://github.com/openvinotoolkit/cvat/pull/2357>)
+- Basic projects implementation (<https://github.com/openvinotoolkit/cvat/pull/2255>)
+- Documentation on how to mount cloud starage(AWS S3 bucket, Azure container, Google Drive) as FUSE (<https://github.com/openvinotoolkit/cvat/pull/2377>)
+- Ability to work with share files without copying inside (<https://github.com/openvinotoolkit/cvat/pull/2377>)
+- Tooltips in label selectors (<https://github.com/openvinotoolkit/cvat/pull/2509>)
+- Page redirect after login using `next` query parameter (<https://github.com/openvinotoolkit/cvat/pull/2527>)
+- [ImageNet](http://www.image-net.org) format support (<https://github.com/openvinotoolkit/cvat/pull/2376>)
+- [CamVid](http://mi.eng.cam.ac.uk/research/projects/VideoRec/CamVid/) format support (<https://github.com/openvinotoolkit/cvat/pull/2559>)
+
+### Changed
+
+- PATCH requests from cvat-core submit only changed fields (<https://github.com/openvinotoolkit/cvat/pull/2445>)
+- Migrated to Antd 4.9 (<https://github.com/openvinotoolkit/cvat/pull/2536>)
+
+### Fixed
+
 - Django templates for email and user guide (<https://github.com/openvinotoolkit/cvat/pull/2412>)
 - Saving relative paths in dummy chunks instead of absolute (<https://github.com/openvinotoolkit/cvat/pull/2424>)
 - Objects with a specific label cannot be displayed if at least one tag with the label exist (<https://github.com/openvinotoolkit/cvat/pull/2435>)
@@ -47,10 +67,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Reset state (reviews, issues) after logout or changing a job (<https://github.com/openvinotoolkit/cvat/pull/2525>)
 - TypeError: Cannot read property 'id' of undefined when updating a task (<https://github.com/openvinotoolkit/cvat/pull/2544>)
 
-### Security
-
--
-
 ## [1.2.0-alpha] - 2020-11-09
 
 ### Added

Dockerfile

@@ -1,3 +1,52 @@
+FROM ubuntu:20.04 as build-image
+
+ARG http_proxy
+ARG https_proxy
+ARG no_proxy
+ARG socks_proxy
+ARG DJANGO_CONFIGURATION
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends install -yq \
+        apache2-dev \
+        build-essential \
+        curl \
+        libldap2-dev \
+        libsasl2-dev \
+        nasm \
+        git \
+        pkg-config \
+        python3-dev \
+        python3-pip \
+        python3-venv && \
+    rm -rf /var/lib/apt/lists/*
+
+# Compile Openh264 and FFmpeg
+ARG PREFIX=/opt/ffmpeg
+ARG PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig
+
+ENV FFMPEG_VERSION=4.3.1 \
+    OPENH264_VERSION=2.1.1
+
+WORKDIR /tmp/openh264
+RUN curl -sL https://github.com/cisco/openh264/archive/v${OPENH264_VERSION}.tar.gz --output openh264-${OPENH264_VERSION}.tar.gz && \
+    tar -zx --strip-components=1 -f openh264-${OPENH264_VERSION}.tar.gz && \
+    make -j5 && make install PREFIX=${PREFIX} && make clean
+
+WORKDIR /tmp/ffmpeg
+RUN curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
+    tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
+    ./configure --disable-nonfree --disable-gpl --enable-libopenh264 --enable-shared --disable-static --prefix="${PREFIX}" && \
+    make -j5 && make install && make distclean
+
+# Install requirements
+RUN python3 -m venv /opt/venv
+ENV PATH="/opt/venv/bin:${PATH}"
+RUN python3 -m pip install --no-cache-dir -U pip==20.0.1 setuptools==49.6.0 wheel==0.35.1
+COPY cvat/requirements/ /tmp/requirements/
+RUN DATUMARO_HEADLESS=1 python3 -m pip install --no-cache-dir -r /tmp/requirements/${DJANGO_CONFIGURATION}.txt
+
+
 FROM ubuntu:20.04
 
 ARG http_proxy
@@ -21,59 +70,26 @@ ENV DJANGO_CONFIGURATION=${DJANGO_CONFIGURATION}
 
 # Install necessary apt packages
 RUN apt-get update && \
-    apt-get --no-install-recommends install -yq \
-        software-properties-common && \
-    apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends install -yq \
         apache2 \
-        apache2-dev \
-        apt-utils \
-        build-essential \
         libapache2-mod-xsendfile \
         supervisor \
-        libavcodec-dev=7:4.2.4-1ubuntu0.1 \
-        libavdevice-dev=7:4.2.4-1ubuntu0.1 \
-        libavfilter-dev=7:4.2.4-1ubuntu0.1 \
-        libavformat-dev=7:4.2.4-1ubuntu0.1 \
-        libavutil-dev=7:4.2.4-1ubuntu0.1 \
-        libswresample-dev=7:4.2.4-1ubuntu0.1 \
-        libswscale-dev=7:4.2.4-1ubuntu0.1 \
-        libldap2-dev \
-        libsasl2-dev \
-        pkg-config \
-        python3-dev \
-        python3-pip \
+        libldap-2.4-2 \
+        libsasl2-2 \
+        libpython3-dev \
         tzdata \
+        python3-distutils \
         p7zip-full \
         git \
         git-lfs \
-        ssh \
         poppler-utils \
+        ssh \
         curl && \
-    python3 -m pip install --no-cache-dir -U pip==20.0.1 setuptools==49.6.0 wheel==0.35.1 && \
     ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime && \
     dpkg-reconfigure -f noninteractive tzdata && \
     rm -rf /var/lib/apt/lists/* && \
     echo 'application/wasm wasm' >> /etc/mime.types
 
-# Add a non-root user
-ENV USER=${USER}
-ENV HOME /home/${USER}
-WORKDIR ${HOME}
-RUN adduser --shell /bin/bash --disabled-password --gecos "" ${USER} && \
-    if [ -z ${socks_proxy} ]; then \
-        echo export "GIT_SSH_COMMAND=\"ssh -o StrictHostKeyChecking=no -o ConnectTimeout=30\"" >> ${HOME}/.bashrc; \
-    else \
-        echo export "GIT_SSH_COMMAND=\"ssh -o StrictHostKeyChecking=no -o ConnectTimeout=30 -o ProxyCommand='nc -X 5 -x ${socks_proxy} %h %p'\"" >> ${HOME}/.bashrc; \
-    fi
-
-COPY components /tmp/components
-
-# 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 python3 -m pip install --no-cache-dir -r /tmp/requirements/${DJANGO_CONFIGURATION}.txt
-
 ARG CLAM_AV
 ENV CLAM_AV=${CLAM_AV}
 RUN if [ "$CLAM_AV" = "yes" ]; then \
@@ -87,20 +103,51 @@ RUN if [ "$CLAM_AV" = "yes" ]; then \
         rm -rf /var/lib/apt/lists/*; \
     fi
 
-COPY ssh ${HOME}/.ssh
-COPY utils ${HOME}/utils
-COPY cvat/ ${HOME}/cvat
-COPY cvat-core/ ${HOME}/cvat-core
-COPY cvat-data/ ${HOME}/cvat-data
-COPY tests ${HOME}/tests
+# Add a non-root user
+ENV USER=${USER}
+ENV HOME /home/${USER}
+RUN adduser --shell /bin/bash --disabled-password --gecos "" ${USER} && \
+    if [ -z ${socks_proxy} ]; then \
+        echo export "GIT_SSH_COMMAND=\"ssh -o StrictHostKeyChecking=no -o ConnectTimeout=30\"" >> ${HOME}/.bashrc; \
+    else \
+        echo export "GIT_SSH_COMMAND=\"ssh -o StrictHostKeyChecking=no -o ConnectTimeout=30 -o ProxyCommand='nc -X 5 -x ${socks_proxy} %h %p'\"" >> ${HOME}/.bashrc; \
+    fi
+
+ARG INSTALL_SOURCES='no'
+WORKDIR ${HOME}/sources
+RUN if [ "$INSTALL_SOURCES" = "yes" ]; then \
+        sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list && \
+        apt-get update && \
+        dpkg --get-selections | while read -r line; do        \
+            package=$(echo "$line" | awk '{print $1}');       \
+            mkdir "$package";                                 \
+            (                                                 \
+                cd "$package";                                \
+                apt-get -q --download-only source "$package"; \
+            )                                                 \
+            done &&                                           \
+        rm -rf /var/lib/apt/lists/*;                          \
+    fi
+COPY --from=build-image /tmp/openh264/openh264*.tar.gz /tmp/ffmpeg/ffmpeg*.tar.bz2 ${HOME}/sources/
+
+# Copy python virtual enviroment and FFmpeg binaries from build-image
+COPY --from=build-image /opt/venv /opt/venv
+ENV PATH="/opt/venv/bin:${PATH}"
+COPY --from=build-image /opt/ffmpeg /usr
 
-RUN chown -R ${USER}:${USER} .
+# Install and initialize CVAT, copy all necessary files
+COPY --chown=${USER} components /tmp/components
+COPY --chown=${USER} ssh ${HOME}/.ssh
+COPY --chown=${USER} supervisord.conf mod_wsgi.conf wait-for-it.sh manage.py ${HOME}/
+COPY --chown=${USER} cvat/ ${HOME}/cvat
+COPY --chown=${USER} utils/ ${HOME}/utils
 
 # RUN all commands below as 'django' user
 USER ${USER}
+WORKDIR ${HOME}
 
 RUN mkdir data share media keys logs /tmp/supervisord
 RUN python3 manage.py collectstatic
 
-EXPOSE 8080 8443
+EXPOSE 8080
 ENTRYPOINT ["/usr/bin/supervisord"]

Dockerfile.ci

@@ -6,6 +6,7 @@ USER root
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends install -yq \
         gpg-agent \
+        gnupg2 \
         apt-utils \
         build-essential \
         python3-dev \
@@ -20,10 +21,17 @@ RUN apt-get update && \
         && \
     rm -rf /var/lib/apt/lists/*;
 
-RUN python3 -m pip install --no-cache-dir -r /tmp/requirements/${DJANGO_CONFIGURATION}.txt && \
+COPY cvat/requirements/ /tmp/requirements/
+
+RUN DATUMARO_HEADLESS=1 python3 -m pip install --no-cache-dir -r /tmp/requirements/${DJANGO_CONFIGURATION}.txt && \
     python3 -m pip install --no-cache-dir coveralls
 RUN gem install coveralls-lcov
 
+COPY utils ${HOME}/utils
+COPY cvat-core ${HOME}/cvat-core
+COPY cvat-data ${HOME}/cvat-data
+COPY tests ${HOME}/tests
+
 COPY .coveragerc .
 
 ENTRYPOINT []

README.md

@@ -40,11 +40,13 @@ annotation team. Try it online [cvat.org](https://cvat.org).
 
 ## Supported annotation formats
 
-Format selection is possible after clicking on the Upload annotation
-and Dump annotation buttons.
-[Datumaro](https://github.com/openvinotoolkit/datumaro) dataset
-framework allows additional dataset transformations
-via its command line tool and Python library.
+Format selection is possible after clicking on the Upload annotation and Dump
+annotation buttons. [Datumaro](https://github.com/openvinotoolkit/datumaro)
+dataset framework allows additional dataset transformations via its command
+line tool and Python library.
+
+For more information about supported formats look at the
+[documentation](cvat/apps/dataset_manager/formats/README.md#formats).
 
 | Annotation format                                                             | Import | Export |
 | ----------------------------------------------------------------------------- | ------ | ------ |
@@ -58,19 +60,21 @@ via its command line tool and Python library.
 | [TFrecord](https://www.tensorflow.org/tutorials/load_data/tf_records)         | X      | X      |
 | [MOT](https://motchallenge.net/)                                              | X      | X      |
 | [LabelMe 3.0](http://labelme.csail.mit.edu/Release3.0)                        | X      | X      |
+| [ImageNet](http://www.image-net.org)                                          | X      | X      |
+| [CamVid](http://mi.eng.cam.ac.uk/research/projects/VideoRec/CamVid/)          | X      | X      |
 
 ## Deep learning models for automatic labeling
 
-| Name                                                                                                    | Type       | Framework  |
-| ------------------------------------------------------------------------------------------------------- | ---------- | ---------- |
-| [Deep Extreme Cut](/serverless/openvino/dextr/nuclio)                                                   | interactor | OpenVINO   |
-| [Faster RCNN](/serverless/tensorflow/faster_rcnn_inception_v2_coco/nuclio)                              | detector   | TensorFlow |
-| [Mask RCNN](/serverless/openvino/omz/public/mask_rcnn_inception_resnet_v2_atrous_coco/nuclio)           | detector   | OpenVINO   |
-| [YOLO v3](/serverless/openvino/omz/public/yolo-v3-tf/nuclio)                                            | detector   | OpenVINO   |
-| [Text detection v4](/serverless/openvino/omz/intel/text-detection-0004/nuclio)                          | detector   | OpenVINO   |
-| [Semantic segmentation for ADAS](/serverless/openvino/omz/intel/semantic-segmentation-adas-0001/nuclio) | detector   | OpenVINO   |
-| [Mask RCNN](/serverless/tensorflow/matterport/mask_rcnn/nuclio)                                         | detector   | TensorFlow |
-| [Object reidentification](/serverless/openvino/omz/intel/person-reidentification-retail-300/nuclio)     | reid       | OpenVINO   |
+| Name                                                                                                    | Type       | Framework  | CPU | GPU |
+| ------------------------------------------------------------------------------------------------------- | ---------- | ---------- | --- | --- |
+| [Deep Extreme Cut](/serverless/openvino/dextr/nuclio)                                                   | interactor | OpenVINO   | X   |
+| [Faster RCNN](/serverless/tensorflow/faster_rcnn_inception_v2_coco/nuclio)                              | detector   | TensorFlow | X   | X   |
+| [Mask RCNN](/serverless/openvino/omz/public/mask_rcnn_inception_resnet_v2_atrous_coco/nuclio)           | detector   | OpenVINO   | X   |
+| [YOLO v3](/serverless/openvino/omz/public/yolo-v3-tf/nuclio)                                            | detector   | OpenVINO   | X   |
+| [Text detection v4](/serverless/openvino/omz/intel/text-detection-0004/nuclio)                          | detector   | OpenVINO   | X   |
+| [Semantic segmentation for ADAS](/serverless/openvino/omz/intel/semantic-segmentation-adas-0001/nuclio) | detector   | OpenVINO   | X   |
+| [Mask RCNN](/serverless/tensorflow/matterport/mask_rcnn/nuclio)                                         | detector   | TensorFlow | X   |
+| [Object reidentification](/serverless/openvino/omz/intel/person-reidentification-retail-300/nuclio)     | reid       | OpenVINO   | X   |
 
 ## Online demo: [cvat.org](https://cvat.org)
 

components/serverless/docker-compose.serverless.yml

@@ -2,7 +2,7 @@ version: '3.3'
 services:
   serverless:
     container_name: nuclio
-    image: quay.io/nuclio/dashboard:1.4.8-amd64
+    image: quay.io/nuclio/dashboard:1.5.8-amd64
     restart: always
     networks:
       default: