Merge pull request #81 from kornia/ci

CI: Use `kornia/workflows`
kornia · Jan 30, 2024 · 6cf3b79 · 6cf3b79
2 parents 6b52173 + 9b2ae82
commit 6cf3b79
Show file tree

Hide file tree

Showing 44 changed files with 246 additions and 133 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,82 +14,48 @@ concurrency:
 
 jobs:
   test:
-    name: Run tutorials - ${{ matrix.os }}, ${{ matrix.python-version }}, ${{ matrix.pytorch-version }}
-    runs-on: ${{ matrix.os }}-latest
-
     strategy:
-      fail-fast: false
       matrix:
-        os: ['Ubuntu']
-        python-version: ['3.8', '3.10']
-        pytorch-version: ['2.0.1']
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Setup environment
-      uses: actions/setup-python@v4
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Install pytorch
-      shell: bash
-      run: pip install torch==${{ matrix.pytorch-version }} torchvision --index-url https://download.pytorch.org/whl/cpu
-
+        kornia-ref: ['main'] # TODO: coverage check through multiple versions: , 'v0.7.1', 'v0.7.0']
 
-    - name: Install dependencies
-      shell: bash -l {0}
-      run: |
-        pip install -r requirements.txt --upgrade
-        pip install -r requirements-dev.txt --upgrade
-
-    - name: Check deps
-      shell: bash -l {0}
-      run: make check-deps
-
-    - name: Generate tutorials
-      shell: bash -l {0}
-      run: make generate
-
-    - name: Run tutorials
-      shell: bash -l {0}
-      run: make execute
+    uses: kornia/workflows/.github/workflows/[email protected]
+    with:
+      ref: ${{ matrix.kornia-ref }}
 
   build:
     needs: test
-    name: Build tutorials - ${{ matrix.os }}, ${{ matrix.python-version }}, ${{ matrix.pytorch-version }}
+    name: Build tutorials
     runs-on: ${{ matrix.os }}-latest
 
     strategy:
       matrix:
-        os: ['Ubuntu']
-        python-version: ['3.10']
-        pytorch-version: ['2.0.1']
+        os: ['ubuntu']
+        kornia-ref: ['main']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: kornia/workflows/.github/actions/[email protected]
+      with:
+        ref: ${{ matrix.kornia-ref }}
 
-    - name: Setup conda dependencies
-      uses: conda-incubator/setup-miniconda@v2
+    - uses: actions/checkout@v4
       with:
-        auto-update-conda: true
-        python-version:  ${{ matrix.python-version }}
+        repository: 'kornia/tutorials'
+        path: 'tutorials-repo/'
 
     - name: Install dependencies
+      working-directory: ./tutorials-repo/
       shell: bash -l {0}
-      run: |
-        conda install pytorch=${{ matrix.pytorch-version }} torchvision cpuonly -c pytorch
-        pip install -r requirements.txt  --upgrade
-        pip install -r requirements-dev.txt  --upgrade
+      run: make setup
 
     - uses: quarto-dev/quarto-actions/setup@v2
 
     - name: Check deps
+      working-directory: ./tutorials-repo/
       shell: bash -l {0}
       run: make check-deps
 
     - name: Render Quarto Project
       uses: quarto-dev/quarto-actions/render@v2
       with:
         to: html
-        path: .
+        path: ./tutorials-repo/
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -10,40 +10,38 @@ jobs:
     runs-on: ${{ matrix.os }}-latest
 
     strategy:
-      fail-fast: true
       matrix:
-        os: ['Ubuntu']
-        python-version: ['3.10']
-        pytorch-version: ['2.0.1']
+        os: ['ubuntu']
+        kornia-ref: ['main']
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Setup conda dependencies
-        uses: conda-incubator/setup-miniconda@v2
-        with:
-          auto-update-conda: true
-          python-version:  ${{ matrix.python-version }}
-
-      - name: Install dependencies
-        shell: bash -l {0}
-        run: |
-          conda install pytorch=${{ matrix.pytorch-version }} torchvision cpuonly -c pytorch
-          pip install -r requirements.txt
-          pip install -r requirements-dev.txt;
-
-      - uses: quarto-dev/quarto-actions/setup@v2
-
-      - name: Render Quarto Project
-        uses: quarto-dev/quarto-actions/render@v2
-        with:
-          to: html
-          path: .
-
-      - name: Deploy to GitHub Pages
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          force_orphan: true
-          publish_dir: ./_site
-          user_name: github-actions[bot]
-          user_email: 41898282+github-actions[bot]@users.noreply.github.com
+    - uses: kornia/workflows/.github/actions/[email protected]
+      with:
+        ref: ${{ matrix.kornia-ref }}
+
+    - uses: actions/checkout@v4
+      with:
+        repository: 'kornia/tutorials'
+        path: 'tutorials-repo/'
+
+    - name: Install dependencies
+      working-directory: ./tutorials-repo/
+      shell: bash -l {0}
+      run: make setup
+
+    - uses: quarto-dev/quarto-actions/setup@v2
+
+    - name: Render Quarto Project
+      uses: quarto-dev/quarto-actions/render@v2
+      with:
+        to: html
+        path: ./tutorials-repo/
+
+    - name: Deploy to GitHub Pages
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        force_orphan: true
+        publish_dir: ./_site
+        user_name: github-actions[bot]
+        user_email: 41898282+github-actions[bot]@users.noreply.github.com
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -20,9 +20,3 @@ repos:
       args: ['--profile=black']
     - id: nbqa-black
       args: ['--nbqa-dont-skip-bad-cells', '--line-length=128']
-
-- repo: https://github.com/fastai/nbdev/
-  rev: 2.3.13
-  hooks:
-    - id: nbdev_clean
-      args: ['--fname', './']
diff --git a/Makefile b/Makefile
@@ -23,7 +23,6 @@ setup-quarto:
 
 setup:
 	pip install -r requirements.txt && pip install -r requirements-dev.txt;
-	make setup-quarto
 
 preview:
 	quarto preview .

diff --git a/README.md b/README.md
@@ -32,8 +32,8 @@ $ make preview
 $ quarto preview .
 ```
 
-For Linux users, you can use the `make setup` which will download and install the quarto binary for linux. And pip install
-the requirements.
+For Linux users, you can use the `make setup-quarto` which will download and install the quarto binary for linux.
+And the `make setup` which will pip install the requirements.
 
 ### How to add a new tutorial
 

diff --git a/nbs/aliased_and_not_aliased_patch_extraction.ipynb b/nbs/aliased_and_not_aliased_patch_extraction.ipynb
@@ -26,7 +26,11 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "tags": [
+     "skip-execution"
+    ]
+   },
    "outputs": [],
    "source": [
     "%%capture\n",

diff --git a/nbs/canny.ipynb b/nbs/canny.ipynb
@@ -39,7 +39,11 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "tags": [
+     "skip-execution"
+    ]
+   },
    "outputs": [],
    "source": [
     "%%capture\n",

diff --git a/nbs/color_conversions.ipynb b/nbs/color_conversions.ipynb
@@ -24,7 +24,11 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "tags": [
+     "skip-execution"
+    ]
+   },
    "outputs": [],
    "source": [
     "%%capture\n",

diff --git a/nbs/color_raw_to_rgb.ipynb b/nbs/color_raw_to_rgb.ipynb
@@ -31,7 +31,11 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "tags": [
+     "skip-execution"
+    ]
+   },
    "outputs": [],
    "source": [
     "%%capture\n",

diff --git a/nbs/color_yuv420_to_rgb.ipynb b/nbs/color_yuv420_to_rgb.ipynb
@@ -31,7 +31,11 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "tags": [
+     "skip-execution"
+    ]
+   },
    "outputs": [],
    "source": [
     "%%capture\n",

diff --git a/nbs/connected_components.ipynb b/nbs/connected_components.ipynb
@@ -26,7 +26,11 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "tags": [
+     "skip-execution"
+    ]
+   },
    "outputs": [],
    "source": [
     "%%capture\n",

diff --git a/nbs/data_augmentation_2d.ipynb b/nbs/data_augmentation_2d.ipynb
@@ -35,7 +35,11 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "tags": [
+     "skip-execution"
+    ]
+   },
    "outputs": [],
    "source": [
     "%%capture\n",

diff --git a/nbs/data_augmentation_kornia_lightning.ipynb b/nbs/data_augmentation_kornia_lightning.ipynb
@@ -33,7 +33,11 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "tags": [
+     "skip-execution"
+    ]
+   },
    "outputs": [],
    "source": [
     "%%capture\n",

diff --git a/nbs/data_augmentation_mosiac.ipynb b/nbs/data_augmentation_mosiac.ipynb
@@ -26,7 +26,11 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "tags": [
+     "skip-execution"
+    ]
+   },
    "outputs": [],
    "source": [
     "%%capture\n",

diff --git a/nbs/data_augmentation_segmentation.ipynb b/nbs/data_augmentation_segmentation.ipynb
@@ -35,7 +35,11 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "tags": [
+     "skip-execution"
+    ]
+   },
    "outputs": [],
    "source": [
     "%%capture\n",

diff --git a/nbs/data_augmentation_sequential.ipynb b/nbs/data_augmentation_sequential.ipynb
@@ -34,7 +34,11 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "tags": [
+     "skip-execution"
+    ]
+   },
    "outputs": [],
    "source": [
     "!pip install kornia\n",

diff --git a/nbs/data_patch_sequential.ipynb b/nbs/data_patch_sequential.ipynb
@@ -35,7 +35,11 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "tags": [
+     "skip-execution"
+    ]
+   },
    "outputs": [],
    "source": [
     "!pip install kornia\n",

diff --git a/nbs/descriptors_matching.ipynb b/nbs/descriptors_matching.ipynb
@@ -37,7 +37,11 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "tags": [
+     "skip-execution"
+    ]
+   },
    "outputs": [],
    "source": [
     "%%capture\n",

diff --git a/nbs/extract_combine_patches.ipynb b/nbs/extract_combine_patches.ipynb
@@ -33,7 +33,11 @@
    "cell_type": "code",
    "execution_count": null,
    "id": "611b350e",
-   "metadata": {},
+   "metadata": {
+    "tags": [
+     "skip-execution"
+    ]
+   },
    "outputs": [],
    "source": [
     "%%capture\n",

diff --git a/nbs/face_detection.ipynb b/nbs/face_detection.ipynb
@@ -25,7 +25,11 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {},
+   "metadata": {
+    "tags": [
+     "skip-execution"
+    ]
+   },
    "outputs": [],
    "source": [
     "%%capture\n",