cleanup

Author: pmeier

.circleci/config.yml

@@ -144,13 +144,24 @@ commands:
       editable:
         type: boolean
         default: true
+      optional_dependencies:
+        type: boolean
+        default: true
     steps:
       - pip_install:
-          args: --pre torch -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
           descr: Install PyTorch from nightly releases
+          args: --pre torch -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
+
       - pip_install:
-          args: --no-build-isolation <<# parameters.editable >> --editable <</ parameters.editable >> .
-          descr: Install torchvision <<# parameters.editable >> in editable mode <</ parameters.editable >>
+          descr: >
+            Install torchvision
+            <<# parameters.editable >> in editable mode <</ parameters.editable >>
+            <<# parameters.optional_dependencies >> with optional dependencies <</ parameters.optional_dependencies >>
+          args: >
+            --no-build-isolation
+            <<# parameters.editable >> --editable <</ parameters.editable >>
+            .<<# parameters.optional_dependencies >>[all]<</ parameters.optional_dependencies >>
+
 
   install_prototype_dependencies:
     steps:
@@ -350,9 +361,6 @@ jobs:
                 | parallel -j0 'wget --no-verbose -O ~/.cache/torch/hub/checkpoints/`basename {}` {}\?source=ci'
       - install_torchvision
       - install_prototype_dependencies
-      - pip_install:
-          args: scipy pycocotools
-          descr: Install optional dependencies
       - run:
           name: Enable prototype tests
           command: echo 'export PYTORCH_TEST_WITH_PROTOTYPE=1' >> $BASH_ENV

.circleci/config.yml.in

@@ -42,5 +42,8 @@ if [ $PYTHON_VERSION == "3.6" ]; then
     pip install "pillow>=5.3.0,!=8.3.*"
 fi
 
-printf "* Installing torchvision and all optional dependencies\n"
-python setup.py develop easy_install torchvision[all]
+printf "* Installing optional dependencies\n"
+pip install -r optional-requirements.txt
+
+printf "* Installing torchvision\n"
+python setup.py develop

.circleci/unittest/linux/scripts/install.sh

@@ -48,5 +48,8 @@ fi
 
 source "$this_dir/set_cuda_envs.sh"
 
-printf "* Installing torchvision and all optional dependencies\n"
-"$this_dir/vc_env_helper.bat" python setup.py develop easy_install torchvision[all]
+printf "* Installing optional dependencies\n"
+pip install -r optional-requirements.txt
+
+printf "* Installing torchvision\n"
+"$this_dir/vc_env_helper.bat" python setup.py develop