Skip to content

Commit df15090

Browse files
author
Nikita Manovich
committed
Port fixes from release-0.2
- Cuda installation has been fixed (#71) - Updated documentation for v0.2.0 (#63) - Player navigation has been fixed if window was scrolled (#66)
2 parents 2d0079f + f5d7316 commit df15090

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+322
-120
lines changed

cvat/apps/documentation/user_guide.md

+319-116

cvat/apps/engine/static/engine/js/player.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ class PlayerController {
549549

550550
let frames = this._model.frames;
551551
let progressWidth = e.target.clientWidth;
552-
let x = e.clientX - e.target.offsetLeft;
552+
let x = e.clientX + window.pageXOffset - e.target.offsetLeft;
553553
let percent = x / progressWidth;
554554
let targetFrame = Math.round((frames.stop - frames.start) * percent);
555555
this._model.pause();

cvat/apps/engine/static/engine/js/shapeFilter.js

-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ class FilterView {
119119
this._filterString.on('keypress keydown keyup', (e) => e.stopPropagation());
120120
this._filterString.on('change', (e) => {
121121
let value = $.trim(e.target.value);
122-
123122
if (this._controller.updateFilter(value, false)) {
124123
this._filterString.css('color', 'green');
125124
setURISearchParameter('filter', value || null);

cvat/apps/tf_annotation/docker_setup_tf_annotation.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CUDA_PKG_VERSION="9-0=${CUDA_VERSION}-1"
2121
echo "export PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:${PATH}" >> ${HOME}/.bashrc
2222
echo "export LD_LIBRARY_PATH=/usr/local/nvidia/lib:/usr/local/nvidia/lib64:${LD_LIBRARY_PATH}" >> ${HOME}/.bashrc
2323

24-
apt-get update && apt-get install -y --no-install-recommends \
24+
apt-get update && apt-get install -y --no-install-recommends --allow-unauthenticated \
2525
libprotobuf-dev \
2626
libprotoc-dev \
2727
protobuf-compiler \
@@ -31,7 +31,7 @@ apt-get update && apt-get install -y --no-install-recommends \
3131
libcudnn7=$CUDNN_VERSION-1+cuda9.0 && \
3232
ln -s cuda-9.0 /usr/local/cuda && \
3333
rm -rf /var/lib/apt/lists/* \
34-
/etc/apt/sources.list.d/nvidia-ml.list
34+
/etc/apt/sources.list.d/nvidia-ml.list /etc/apt/sources.list.d/cuda.list
3535

3636
pip3 install --no-cache-dir -r "$(cd `dirname $0` && pwd)/requirements.txt"
3737

0 commit comments

Comments
 (0)