update docker

.circleci/config.yml

@@ -117,9 +117,12 @@ jobs:
     parameters:
       pytorch_version:
         type: string
+      torchvision_version:
+        type: string
 
     environment:
       PYTORCH_VERSION: << parameters.pytorch_version >>
+      TORCHVISION_VERSION: << parameters.torchvision_version >>
 
     working_directory: ~/detectron2
 
@@ -143,9 +146,6 @@ jobs:
           name: Launch docker
           working_directory: ~/detectron2/docker
           command: |
-            echo "PyTorch Version:, $PYTORCH_VERSION"
-            TORCHVISION_VERSION=$(python -c "print($PYTORCH_VERSION - 0.9)")
-            echo "Torchvision Version:, $TORCHVISION_VERSION"
             nvidia-docker build -t detectron2:v0 -f Dockerfile-circleci --build-arg PYTORCH_VERSION=$PYTORCH_VERSION --build-arg TORCHVISION_VERSION=$TORCHVISION_VERSION .
             nvidia-docker run -itd --name d2 detectron2:v0
             docker exec -it d2 nvidia-smi
@@ -173,6 +173,8 @@ workflows:
       - gpu_tests:
           name: gpu_tests_pytorch1.4
           pytorch_version: '1.4'
+          torchvision_version: '0.5'
       - gpu_tests:
           name: gpu_tests_pytorch1.5
           pytorch_version: '1.5'
+          torchvision_version: '0.6'

docker/Dockerfile-circleci

@@ -3,7 +3,7 @@ FROM nvidia/cuda:10.1-cudnn7-devel
 
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && apt-get install -y \
-	python3-opencv ca-certificates python3-dev git wget sudo ninja-build && \
+	ca-certificates python3-dev git wget sudo ninja-build libglib2.0-0 && \
   rm -rf /var/lib/apt/lists/*
 
 RUN wget -q https://bootstrap.pypa.io/get-pip.py && \
@@ -11,7 +11,7 @@ RUN wget -q https://bootstrap.pypa.io/get-pip.py && \
 	rm get-pip.py
 
 # install dependencies
-RUN pip install tensorboard
-ARG PYTORCH_VERSION=1.5
-ARG TORCHVISION_VERSION=0.6
+RUN pip install tensorboard opencv-python-headless
+ARG PYTORCH_VERSION
+ARG TORCHVISION_VERSION
 RUN pip install torch==${PYTORCH_VERSION} torchvision==${TORCHVISION_VERSION} -f https://download.pytorch.org/whl/cu101/torch_stable.html