diff --git a/.github/workflows/CI-e2e-notebooks-text-vision.yml b/.github/workflows/CI-e2e-notebooks-text-vision.yml index a4ce84c573..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-notebooks-vision.yml" + - ".github/workflows/CI-e2e-notebooks-text-vision.yml" - "libs/e2e/src/lib/describer/modelAssessment/**" - "libs/interpret-vision/**" - "libs/interpret-text/**" @@ -54,11 +54,13 @@ jobs: strategy: 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: ["vis_nb_group_1", "text_nb_group_1"] + exclude: + - operatingSystem: macos-latest + pythonVersion: "3.7" runs-on: ${{ matrix.operatingSystem }} @@ -87,11 +89,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: | diff --git a/.github/workflows/CI-notebook-vision.yml b/.github/workflows/CI-notebook-vision.yml index 4b7921426e..909d77da2c 100644 --- a/.github/workflows/CI-notebook-vision.yml +++ b/.github/workflows/CI-notebook-vision.yml @@ -19,8 +19,13 @@ 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"] + exclude: + - operatingSystem: macos-latest + pythonVersion: "3.7" + - operatingSystem: macos-latest + pythonVersion: "3.8" runs-on: ${{ matrix.operatingSystem }}