From b920e2b6541a98a3ba8cfbae8f75f911807248ff Mon Sep 17 00:00:00 2001
From: christinab12 <christina.bukas@helmholtz-muenchen.de>
Date: Thu, 25 Jul 2024 18:27:30 +0200
Subject: [PATCH] final

---
 .github/workflows/test_and_deploy.yml | 150 +++++++++++++-------------
 .github/workflows/test_mmcv.yml       |  41 -------
 2 files changed, 75 insertions(+), 116 deletions(-)
 delete mode 100644 .github/workflows/test_mmcv.yml

diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml
index 8c2936e..ba29221 100644
--- a/.github/workflows/test_and_deploy.yml
+++ b/.github/workflows/test_and_deploy.yml
@@ -1,85 +1,85 @@
-# # This workflows will upload a Python Package using Twine when a release is created
-# # For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
+# This workflows will upload a Python Package using Twine when a release is created
+# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
 
-# name: tests
+name: tests
 
-# on: 
-#   push:
-#     branches:
-#       - main
-#     tags:
-#       - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
-#   pull_request:
-#     branches:
-#       - main
-#   workflow_dispatch:
+on: 
+  push:
+    branches:
+      - main
+    tags:
+      - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
+  pull_request:
+    branches:
+      - main
+  workflow_dispatch:
 
-# jobs:
-#   test:
-#     name: ${{ matrix.platform }} py${{ matrix.python-version }}
-#     runs-on: ${{ matrix.platform }}
-#     strategy:
-#       matrix:
-#         platform: [ubuntu-latest] #, windows-latest, macos-latest]
-#         python-version: ["3.10"] # 3.9, 
-#     env:
-#       DISPLAY: ':99.0'
-#     steps:
-#       - name: Checkout Repository
-#         uses: actions/checkout@v3
+jobs:
+  test:
+    name: ${{ matrix.platform }} py${{ matrix.python-version }}
+    runs-on: ${{ matrix.platform }}
+    strategy:
+      matrix:
+        platform: [ubuntu-latest, windows-latest, macos-latest]
+        python-version: ["3.10", 3.9] 
+    env:
+      DISPLAY: ':99.0'
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
 
-#       - name: Set up Python ${{ matrix.python-version }}
-#         uses: actions/setup-python@v3
-#         with:
-#           python-version: ${{ matrix.python-version }}
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python-version }}
 
-#       # these libraries enable testing on Qt on linux
-#       - uses: tlambert03/setup-qt-libs@v1
+      # these libraries enable testing on Qt on linux
+      - uses: tlambert03/setup-qt-libs@v1
       
-#       # strategy borrowed from vispy for installing opengl libs on windows
-#       - name: Install Windows OpenGL
-#         if: runner.os == 'Windows'
-#         run: |
-#           git clone --depth 1 https://github.com/pyvista/gl-ci-helpers.git
-#           powershell gl-ci-helpers/appveyor/install_opengl.ps1
+      # strategy borrowed from vispy for installing opengl libs on windows
+      - name: Install Windows OpenGL
+        if: runner.os == 'Windows'
+        run: |
+          git clone --depth 1 https://github.com/pyvista/gl-ci-helpers.git
+          powershell gl-ci-helpers/appveyor/install_opengl.ps1
 
-#       - name: Install dependencies
-#         run: |
-#           python -m pip install --upgrade pip
-#           python -m pip install pytest pytest-qt pytest-cookies
-#           pip install -e ".[testing]" --no-cache-dir
-#           pip install "mmcv<2.2.0,>=2.0.0rc4" --find-links https://download.openmmlab.com/mmcv/dist/${{ matrix.python-version }}/torch2.4.0/cpu
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install pytest pytest-qt pytest-cookies
+          pip install -e ".[testing]"
+          pip install "mmcv<2.2.0,>=2.0.0rc4" --find-links https://download.openmmlab.com/mmcv/dist/${{ matrix.python-version }}/torch2.4.0/cpu
 
-#       - name: Test
-#         uses: aganders3/headless-gui@v1
-#         with:
-#           run: |
-#             python -m pytest -s -v --color=yes
+      - name: Test
+        uses: aganders3/headless-gui@v1
+        with:
+          run: |
+            python -m pytest -s -v --color=yes
 
-#   deploy:
-#     # this will run when you have tagged a commit, starting with "v*"
-#     # and requires that you have put your twine API key in your 
-#     # github secrets (see readme for details)
-#     needs: [test]
-#     runs-on: ubuntu-latest
-#     if: contains(github.ref, 'tags')
-#     steps:
-#       - uses: actions/checkout@v3
-#       - name: Set up Python
-#         uses: actions/setup-python@v3
-#         with:
-#           python-version: "3.x"
-#       - name: Install dependencies
-#         run: |
-#           python -m pip install --upgrade pip
-#           pip install twine 
-#           pip install build
-#       - name: Build and publish
-#         env:
-#           TWINE_USERNAME: __token__
-#           TWINE_PASSWORD: ${{ secrets.TWINE_API_KEY }}
-#         run: |
-#           git tag
-#           python -m build .
-#           twine upload dist/*
+  deploy:
+    # this will run when you have tagged a commit, starting with "v*"
+    # and requires that you have put your twine API key in your 
+    # github secrets (see readme for details)
+    # needs: [test]
+    runs-on: ubuntu-latest
+    if: contains(github.ref, 'tags')
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.x"
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install twine 
+          pip install build
+      - name: Build and publish
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.TWINE_API_KEY }}
+        run: |
+          git tag
+          python -m build .
+          twine upload dist/*
 
diff --git a/.github/workflows/test_mmcv.yml b/.github/workflows/test_mmcv.yml
deleted file mode 100644
index 7f23666..0000000
--- a/.github/workflows/test_mmcv.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: Install and Test MMCV
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-  workflow_dispatch:
-jobs:
-  install-and-test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.10"]
-    steps:
-    - name: Checkout Repository
-      uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install Dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install openmim
-        pip install "torch>=2.3.1"
-        # Install mmcv-full, adjust the link to match the appropriate version of Python and PyTorch as needed
-        mim install "mmcv<2.2.0,>=2.0.0rc4"  --find-links https://download.openmmlab.com/mmcv/dist/${{ matrix.python-version }}/torch2.4.0/cpu
-    - name: Verify Installation
-      run: |
-        python -m pip list
-        python -c "import mmcv; print('MMCV version:', mmcv.__version__)"
-        python -c "import mmcv; print('MMCV installation path:', mmcv.__file__)"
-        python -c "from mmcv.ops.roi_align import roi_align"
-
-
-
-
-
-