From 1620cdee5539f5b4b83f1340c83a913ed3de340a Mon Sep 17 00:00:00 2001 From: Advitya Gemawat Date: Fri, 18 Aug 2023 16:16:26 -0400 Subject: [PATCH 1/5] Added macos gates --- .github/workflows/CI-e2e-notebooks-vision.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI-e2e-notebooks-vision.yml b/.github/workflows/CI-e2e-notebooks-vision.yml index aa6f634bc8..069423148c 100644 --- a/.github/workflows/CI-e2e-notebooks-vision.yml +++ b/.github/workflows/CI-e2e-notebooks-vision.yml @@ -53,7 +53,7 @@ jobs: fail-fast: false matrix: # TODO: add macos - operatingSystem: [ubuntu-latest, windows-latest] + operatingSystem: [ubuntu-latest, windows-latest, macos-latest] pythonVersion: [3.7, 3.8, 3.9, "3.10"] flights: [""] notebookGroup: ["nb_group_1"] @@ -85,11 +85,18 @@ jobs: auto-update-conda: true python-version: ${{ matrix.pythonVersion }} - - name: Install pytorch + - if: ${{ matrix.operatingSystem != 'macos-latest' }} + name: Install pytorch on non-MacOS shell: bash -l {0} run: | conda install --yes --quiet pytorch torchvision captum cpuonly -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 torchvision captum -c pytorch + - name: Setup tools shell: bash -l {0} run: | From 65fbabb9accee0215450ccee2d1e7c1dade3c459 Mon Sep 17 00:00:00 2001 From: Advitya Gemawat Date: Fri, 18 Aug 2023 16:17:00 -0400 Subject: [PATCH 2/5] Added macos gates --- .github/workflows/CI-notebook-vision.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI-notebook-vision.yml b/.github/workflows/CI-notebook-vision.yml index 4b7921426e..aa9392ea65 100644 --- a/.github/workflows/CI-notebook-vision.yml +++ b/.github/workflows/CI-notebook-vision.yml @@ -19,7 +19,7 @@ jobs: node-version: 16.x strategy: matrix: - operatingSystem: [ubuntu-latest, windows-latest] + operatingSystem: [ubuntu-latest, windows-latest, macos-latest] pythonVersion: [3.7, 3.8, 3.9, "3.10"] runs-on: ${{ matrix.operatingSystem }} From 9f04bd9ec397aeb636772380d8c722c75bee3cba Mon Sep 17 00:00:00 2001 From: Advitya Gemawat Date: Mon, 21 Aug 2023 10:50:05 -0400 Subject: [PATCH 3/5] gate fixes --- .github/workflows/CI-e2e-notebooks-vision.yml | 4 +++- .github/workflows/CI-notebook-vision.yml | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI-e2e-notebooks-vision.yml b/.github/workflows/CI-e2e-notebooks-vision.yml index 069423148c..c795078c6a 100644 --- a/.github/workflows/CI-e2e-notebooks-vision.yml +++ b/.github/workflows/CI-e2e-notebooks-vision.yml @@ -52,11 +52,13 @@ jobs: strategy: fail-fast: false matrix: - # TODO: add macos operatingSystem: [ubuntu-latest, windows-latest, macos-latest] pythonVersion: [3.7, 3.8, 3.9, "3.10"] flights: [""] notebookGroup: ["nb_group_1"] + exclude: + - operatingSystem: macos-latest + pythonVersion: "3.7" runs-on: ${{ matrix.operatingSystem }} diff --git a/.github/workflows/CI-notebook-vision.yml b/.github/workflows/CI-notebook-vision.yml index aa9392ea65..cbef1a5360 100644 --- a/.github/workflows/CI-notebook-vision.yml +++ b/.github/workflows/CI-notebook-vision.yml @@ -21,6 +21,9 @@ jobs: matrix: operatingSystem: [ubuntu-latest, windows-latest, macos-latest] pythonVersion: [3.7, 3.8, 3.9, "3.10"] + exclude: + - operatingSystem: macos-latest + pythonVersion: "3.7" runs-on: ${{ matrix.operatingSystem }} From cb0f061ad2549e07b1ef486eb66092c17ca2046c Mon Sep 17 00:00:00 2001 From: Advitya Gemawat Date: Fri, 25 Aug 2023 11:43:32 -0400 Subject: [PATCH 4/5] path fix --- .github/workflows/CI-e2e-notebooks-text-vision.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI-e2e-notebooks-text-vision.yml b/.github/workflows/CI-e2e-notebooks-text-vision.yml index d7934165fc..9d9cd8d8ba 100644 --- a/.github/workflows/CI-e2e-notebooks-text-vision.yml +++ b/.github/workflows/CI-e2e-notebooks-text-vision.yml @@ -9,7 +9,7 @@ on: - "raiwidgets/**" - "responsibleai_vision/**" - "responsibleai_text/**" - - ".github/workflows/CI-e2e-notebooks-vision.yml" + - ".github/workflows/ci-e2e-notebook-text-vision.yml" - "libs/e2e/src/lib/describer/modelAssessment/**" - "libs/interpret-vision/**" - "libs/interpret-text/**" From d61632d5199c56f958f58e70b566ee19be62b4c0 Mon Sep 17 00:00:00 2001 From: Advitya Gemawat Date: Fri, 25 Aug 2023 11:44:41 -0400 Subject: [PATCH 5/5] path fix --- .github/workflows/CI-e2e-notebooks-text-vision.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI-e2e-notebooks-text-vision.yml b/.github/workflows/CI-e2e-notebooks-text-vision.yml index 9d9cd8d8ba..a06ef9b9e7 100644 --- a/.github/workflows/CI-e2e-notebooks-text-vision.yml +++ b/.github/workflows/CI-e2e-notebooks-text-vision.yml @@ -9,7 +9,7 @@ on: - "raiwidgets/**" - "responsibleai_vision/**" - "responsibleai_text/**" - - ".github/workflows/ci-e2e-notebook-text-vision.yml" + - ".github/workflows/CI-e2e-notebooks-text-vision.yml" - "libs/e2e/src/lib/describer/modelAssessment/**" - "libs/interpret-vision/**" - "libs/interpret-text/**"