From 653a970088b65db29c8766c39c19bf64ead89a25 Mon Sep 17 00:00:00 2001 From: doctorpangloss <@hiddenswitch.com> Date: Fri, 16 Aug 2024 12:37:35 -0700 Subject: [PATCH] Fix tests, remove unsupported tests --- .github/workflows/pullrequest-ci-run.yml | 53 ------------- .github/workflows/test-ci.yml | 95 ------------------------ .github/workflows/test.yml | 8 +- 3 files changed, 1 insertion(+), 155 deletions(-) delete mode 100644 .github/workflows/pullrequest-ci-run.yml delete mode 100644 .github/workflows/test-ci.yml diff --git a/.github/workflows/pullrequest-ci-run.yml b/.github/workflows/pullrequest-ci-run.yml deleted file mode 100644 index 691480bcf..000000000 --- a/.github/workflows/pullrequest-ci-run.yml +++ /dev/null @@ -1,53 +0,0 @@ -# This is the GitHub Workflow that drives full-GPU-enabled tests of pull requests to ComfyUI, when the 'Run-CI-Test' label is added -# Results are reported as checkmarks on the commits, as well as onto https://ci.comfy.org/ -name: Pull Request CI Workflow Runs -on: - pull_request_target: - types: [labeled] - -jobs: - pr-test-stable: - if: ${{ github.event.label.name == 'Run-CI-Test' }} - strategy: - fail-fast: false - matrix: - os: [macos, linux, windows] - python_version: ["3.9", "3.10", "3.11", "3.12"] - cuda_version: ["12.1"] - torch_version: ["stable"] - include: - - os: macos - runner_label: [self-hosted, macOS] - flags: "--use-pytorch-cross-attention" - - os: linux - runner_label: [self-hosted, Linux] - flags: "" - - os: windows - runner_label: [self-hosted, win] - flags: "" - runs-on: ${{ matrix.runner_label }} - steps: - - name: Test Workflows - uses: comfy-org/comfy-action@main - with: - os: ${{ matrix.os }} - python_version: ${{ matrix.python_version }} - torch_version: ${{ matrix.torch_version }} - google_credentials: ${{ secrets.GCS_SERVICE_ACCOUNT_JSON }} - comfyui_flags: ${{ matrix.flags }} - use_prior_commit: 'true' - comment: - if: ${{ github.event.label.name == 'Run-CI-Test' }} - runs-on: ubuntu-latest - permissions: - pull-requests: write - steps: - - uses: actions/github-script@v6 - with: - script: | - github.rest.issues.createComment({ - issue_number: context.issue.number, - owner: context.repo.owner, - repo: context.repo.repo, - body: '(Automated Bot Message) CI Tests are running, you can view the results at https://ci.comfy.org/?branch=${{ github.event.pull_request.number }}%2Fmerge' - }) diff --git a/.github/workflows/test-ci.yml b/.github/workflows/test-ci.yml deleted file mode 100644 index be7622907..000000000 --- a/.github/workflows/test-ci.yml +++ /dev/null @@ -1,95 +0,0 @@ -# This is the GitHub Workflow that drives automatic full-GPU-enabled tests of all new commits to the master branch of ComfyUI -# Results are reported as checkmarks on the commits, as well as onto https://ci.comfy.org/ -name: Full Comfy CI Workflow Runs -on: - push: - branches: - - master - paths-ignore: - - 'app/**' - - 'input/**' - - 'output/**' - - 'notebooks/**' - - 'script_examples/**' - - '.github/**' - - 'web/**' - workflow_dispatch: - -jobs: - test-stable: - strategy: - fail-fast: false - matrix: - os: [macos, linux, windows] - python_version: ["3.9", "3.10", "3.11", "3.12"] - cuda_version: ["12.1"] - torch_version: ["stable"] - include: - - os: macos - runner_label: [self-hosted, macOS] - flags: "--use-pytorch-cross-attention" - - os: linux - runner_label: [self-hosted, Linux] - flags: "" - - os: windows - runner_label: [self-hosted, win] - flags: "" - runs-on: ${{ matrix.runner_label }} - steps: - - name: Test Workflows - uses: comfy-org/comfy-action@main - with: - os: ${{ matrix.os }} - python_version: ${{ matrix.python_version }} - torch_version: ${{ matrix.torch_version }} - google_credentials: ${{ secrets.GCS_SERVICE_ACCOUNT_JSON }} - comfyui_flags: ${{ matrix.flags }} - - test-win-nightly: - strategy: - fail-fast: true - matrix: - os: [windows] - python_version: ["3.9", "3.10", "3.11", "3.12"] - cuda_version: ["12.1"] - torch_version: ["nightly"] - include: - - os: windows - runner_label: [self-hosted, win] - flags: "" - runs-on: ${{ matrix.runner_label }} - steps: - - name: Test Workflows - uses: comfy-org/comfy-action@main - with: - os: ${{ matrix.os }} - python_version: ${{ matrix.python_version }} - torch_version: ${{ matrix.torch_version }} - google_credentials: ${{ secrets.GCS_SERVICE_ACCOUNT_JSON }} - comfyui_flags: ${{ matrix.flags }} - - test-unix-nightly: - strategy: - fail-fast: false - matrix: - os: [macos, linux] - python_version: ["3.11"] - cuda_version: ["12.1"] - torch_version: ["nightly"] - include: - - os: macos - runner_label: [self-hosted, macOS] - flags: "--use-pytorch-cross-attention" - - os: linux - runner_label: [self-hosted, Linux] - flags: "" - runs-on: ${{ matrix.runner_label }} - steps: - - name: Test Workflows - uses: comfy-org/comfy-action@main - with: - os: ${{ matrix.os }} - python_version: ${{ matrix.python_version }} - torch_version: ${{ matrix.torch_version }} - google_credentials: ${{ secrets.GCS_SERVICE_ACCOUNT_JSON }} - comfyui_flags: ${{ matrix.flags }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9fd775111..fb590b344 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -71,16 +71,10 @@ jobs: run: | python -m pip install setuptools pip --upgrade --break-system-packages || python -m pip install pip --upgrade || true pip install --break-system-packages --no-build-isolation .[dev] || pip install --no-build-isolation .[dev] - - name: Run unit tests + - name: Run tests run: | export HSA_OVERRIDE_GFX_VERSION=11.0.0 pytest -v tests/unit - - name: Run all other supported tests - run: | - export HSA_OVERRIDE_GFX_VERSION=11.0.0 - pytest -v tests/inference - env: - HF_TOKEN: ${{ secrets.HF_TOKEN }} - name: Lint for errors run: | pylint --rcfile=.pylintrc comfy/