Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI notebook text and vision tests #2597

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix CI notebook text and vision tests #2597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/CI-e2e-notebooks-text-vision.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
matrix:
# TODO: add macos
operatingSystem: [ubuntu-latest, windows-latest]
pythonVersion: [3.8, 3.9, "3.10"]
pythonVersion: [3.9, "3.10"]
flights: [""]
notebookGroup: ["vis_nb_group_1", "text_nb_group_1"]

Expand Down Expand Up @@ -103,7 +103,6 @@ jobs:
shell: bash -l {0}
run: |
pip install tf-keras
pip install keras==2.15

- name: Install dependencies
shell: bash -l {0}
Expand All @@ -117,6 +116,8 @@ jobs:
name: Install vision dependencies
shell: bash -l {0}
run: |
pip install fastai
pip install --upgrade "spacy<4"
pip install -r requirements-dev.txt
pip install .
working-directory: responsibleai_vision
Expand All @@ -142,7 +143,8 @@ jobs:
cat installed-requirements-dev.txt
working-directory: raiwidgets

- name: Upload requirements
- if: ${{ (matrix.operatingSystem == 'windows-latest') && (matrix.pythonVersion == '3.9') && (matrix.flights == '') && (matrix.notebookGroup == 'vis_nb_group_1') }}
name: Upload requirements
uses: actions/upload-artifact@v4
with:
name: requirements-dev.txt
Expand All @@ -169,5 +171,5 @@ jobs:
if: always()
uses: actions/upload-artifact@v4
with:
name: raiwidgets-e2e-screen-shot
name: raiwidgets-ci-e2e-text-vision-screen-shot-${{ matrix.notebookGroup }}-${{ matrix.flights }}-${{ matrix.operatingSystem }}-${{ matrix.pythonVersion }}
path: ./dist/cypress
8 changes: 4 additions & 4 deletions .github/workflows/CI-notebook-text.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
matrix:
operatingSystem: [ubuntu-latest, windows-latest]
pythonVersion: [3.8, 3.9, "3.10"]
pythonVersion: [3.9, "3.10"]

runs-on: ${{ matrix.operatingSystem }}

Expand Down Expand Up @@ -71,7 +71,6 @@ jobs:
shell: bash -l {0}
run: |
pip install tf-keras
pip install keras==2.15

- name: Install dependencies
shell: bash -l {0}
Expand Down Expand Up @@ -99,7 +98,8 @@ jobs:
cat installed-requirements-dev.txt
working-directory: raiwidgets

- name: Upload requirements
- if: ${{ (matrix.operatingSystem == 'windows-latest') && (matrix.pythonVersion == '3.9') }}
name: Upload requirements
uses: actions/upload-artifact@v4
with:
name: requirements-dev.txt
Expand All @@ -120,5 +120,5 @@ jobs:
if: always()
uses: actions/upload-artifact@v4
with:
name: raiwidgets-e2e-screen-shot
name: raiwidgets-ci-notebook-vision-screen-shot-${{ matrix.operatingSystem }}-${{ matrix.pythonVersion }}
path: dist/cypress
15 changes: 11 additions & 4 deletions .github/workflows/CI-notebook-vision.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
matrix:
operatingSystem: [ubuntu-latest]
pythonVersion: [3.8, 3.9, "3.10"]
pythonVersion: [3.9, "3.10"]

runs-on: ${{ matrix.operatingSystem }}

Expand Down Expand Up @@ -75,6 +75,12 @@ jobs:
pip install .
working-directory: raiwidgets

- name: Install fastai and latest spacy individually to fix conflicts
shell: bash -l {0}
run: |
pip install fastai
pip install --upgrade "spacy<4"

- name: Install vision dependencies
shell: bash -l {0}
run: |
Expand All @@ -96,7 +102,8 @@ jobs:
cat installed-requirements-dev.txt
working-directory: raiwidgets

- name: Upload requirements
- if: ${{ (matrix.operatingSystem == 'windows-latest') && (matrix.pythonVersion == '3.9') }}
name: Upload requirements
uses: actions/upload-artifact@v4
with:
name: requirements-dev.txt
Expand All @@ -110,12 +117,12 @@ jobs:
if: always()
uses: actions/upload-artifact@v4
with:
name: notebook-test-${{ matrix.operatingSystem }}-${{ matrix.pythonVersion }}
name: ci-notebook-vision-test-${{ matrix.operatingSystem }}-${{ matrix.pythonVersion }}
path: notebooks

- name: Upload e2e test screen shot
if: always()
uses: actions/upload-artifact@v4
with:
name: raiwidgets-e2e-screen-shot
name: raiwidgets-ci-notebook-vision-screen-shot-${{ matrix.operatingSystem }}-${{ matrix.pythonVersion }}
path: dist/cypress
20 changes: 10 additions & 10 deletions .github/workflows/CI-responsibleai-text-vision-pytest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,15 @@ jobs:
matrix:
packageDirectory: ["responsibleai_text", "responsibleai_vision"]
operatingSystem: [ubuntu-latest, macos-latest, windows-latest]
pythonVersion: ["3.8", "3.9", "3.10"]
pythonVersion: ["3.9", "3.10"]
# TODO: re-add macos-latest once build timeout issues are resolved
exclude:
- packageDirectory: "responsibleai_text"
operatingSystem: macos-latest
pythonVersion: "3.8"
- packageDirectory: "responsibleai_text"
operatingSystem: macos-latest
pythonVersion: "3.9"
- packageDirectory: "responsibleai_text"
operatingSystem: macos-latest
pythonVersion: "3.10"
- packageDirectory: "responsibleai_vision"
operatingSystem: macos-latest
pythonVersion: "3.8"
- packageDirectory: "responsibleai_vision"
operatingSystem: macos-latest
pythonVersion: "3.9"
Expand All @@ -51,13 +45,13 @@ jobs:
name: Install pytorch on non-MacOS
shell: bash -l {0}
run: |
conda install --yes --quiet pytorch==1.13.1 "torchvision<0.15" cpuonly "numpy<1.24.0" -c pytorch
conda install --yes --quiet pytorch torchvision cpuonly "numpy<1.24.0" -c pytorch

- if: ${{ matrix.operatingSystem == 'macos-latest' }}
name: Install Anaconda packages on MacOS, which should not include cpuonly according to official docs
shell: bash -l {0}
run: |
conda install --yes --quiet pytorch==1.13.1 "torchvision<0.15" "numpy<1.24.0" -c pytorch
conda install --yes --quiet pytorch torchvision "numpy<1.24.0" -c pytorch

- name: Setup tools
shell: bash -l {0}
Expand All @@ -76,7 +70,13 @@ jobs:
shell: bash -l {0}
run: |
pip install tf-keras
pip install keras==2.15

- if: ${{ (matrix.packageDirectory == 'responsibleai_vision') }}
name: Install fastai and latest spacy individually to fix conflicts
shell: bash -l {0}
run: |
pip install fastai
pip install --upgrade "spacy<4"

- name: Install dependencies
shell: bash -l {0}
Expand Down
4 changes: 1 addition & 3 deletions responsibleai_vision/requirements-dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,10 @@ sphinx==3.1.1
sphinx-gallery==0.8.1
pydata-sphinx-theme==0.3.0

tensorflow<=2.15
tensorflow
transformers
datasets
opencv-python

fastai
mlflow
pydantic<2.0.0
piexif
Loading