From 4b984476294af74c39fdeafea2ef7eb0c575ec2d Mon Sep 17 00:00:00 2001
From: potipot <pawel.potrykus@hayden.ai>
Date: Mon, 2 Oct 2023 09:33:44 +0200
Subject: [PATCH] update and use installation script

---
 .github/workflows/ci-all-testing.yml |  2 +-
 icevision_install.sh                 | 25 ++++++++-----------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci-all-testing.yml b/.github/workflows/ci-all-testing.yml
index 4c5cbaffc..093143be2 100644
--- a/.github/workflows/ci-all-testing.yml
+++ b/.github/workflows/ci-all-testing.yml
@@ -24,9 +24,9 @@ jobs:
 
       - name: Install package
         run: |
+          sh ./icevision_install.sh cpu
           pip install -e .[dev]
           pip install fiftyone
-#          sh ./icevision_install.sh cpu
 
       - name: Lint with flake8
         run: |
diff --git a/icevision_install.sh b/icevision_install.sh
index cf9a5d948..666265d7b 100644
--- a/icevision_install.sh
+++ b/icevision_install.sh
@@ -9,32 +9,23 @@
 # !bash icevision_install.sh cpu 
 
 target="${1}" 
-case ${target} in 
-   cuda10)  
-      echo "Installing icevision + dependencices for ${1}"
-      echo "- Installing torch and its dependencies"
-      pip install torch==1.10.0+cu102 torchvision==0.11.1+cu102 torchtext==0.11.0 -f https://download.pytorch.org/whl/torch_stable.html --upgrade -q
-
-      echo "- Installing mmcv"
-      pip install mmcv-full==1.3.17 -f https://download.openmmlab.com/mmcv/dist/cu102/torch1.10.0/index.html --upgrade -q    
-      ;; 
-
+case ${target} in
    cuda11)  
       echo "Installing icevision + dependencices for ${1}"
       echo "- Installing torch and its dependencies"
-      pip install torch==1.10.0+cu111 torchvision==0.11.1+cu111 torchtext==0.11.0 -f https://download.pytorch.org/whl/torch_stable.html --upgrade 
+      pip install torch==1.13.1+cu117 torchvision==0.14.1+cu117 --extra-index-url https://download.pytorch.org/whl/cu117 --upgrade
 
       echo "- Installing mmcv"
-      pip install mmcv-full==1.3.17 -f https://download.openmmlab.com/mmcv/dist/cu111/torch1.10.0/index.html --upgrade -q  
-    ;;  
+      pip install mmcv-full==1.7.0 -f https://download.openmmlab.com/mmcv/dist/cu117/torch1.13/index.html
+    ;;
     
    cpu)  
       echo "Installing icevision + dependencices for ${1}"
       echo "- Installing torch and its dependencies"
-      pip install torch=="1.10.0+cpu" torchvision=="0.11.1+cpu" torchtext==0.11.0 -f https://download.pytorch.org/whl/torch_stable.html  
+      pip install torch==1.13.1+cpu torchvision==0.14.1+cpu --extra-index-url https://download.pytorch.org/whl/cpu --upgrade
 
       echo "- Installing mmcv"
-      pip install mmcv-full=="1.3.17" -f https://download.openmmlab.com/mmcv/dist/cpu/torch1.10.0/index.html --upgrade -q  
+      pip install mmcv-full==1.7.0 -f https://download.openmmlab.com/mmcv/dist/cpu/torch1.13/index.html --upgrade -q
     ;;
 
    *)  
@@ -45,10 +36,10 @@ esac
 
 
 echo "- Installing mmdet"
-pip install mmdet==2.17.0 --upgrade -q
+pip install mmdet==2.26.0 --upgrade -q
 
 echo "- Installing mmseg"
-pip install mmsegmentation==0.20.2 --upgrade -q
+pip install mmsegmentation==0.29.1 --upgrade -q
 
 icevision_version="${2}"