Skip to content

Commit 1d18f1d

Browse files
tolgacangoztolgacangoz
committed
Merge branch 'main' into Add-AnyText
2 parents c13c61d + 8cdcdd9 commit 1d18f1d

File tree

187 files changed

+13636
-1532
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+13636
-1532
lines changed

‎.github/workflows/nightly_tests.yml‎

Lines changed: 121 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
python utils/print_env.py
8080
- name: Pipeline CUDA Test
8181
env:
82-
HF_TOKEN: ${{ secrets.HF_TOKEN }}
82+
HF_TOKEN: ${{ secrets.DIFFUSERS_HF_HUB_READ_TOKEN }}
8383
# https://pytorch.org/docs/stable/notes/randomness.html#avoiding-nondeterministic-algorithms
8484
CUBLAS_WORKSPACE_CONFIG: :16:8
8585
run: |
@@ -116,6 +116,7 @@ jobs:
116116
run:
117117
shell: bash
118118
strategy:
119+
fail-fast: false
119120
max-parallel: 2
120121
matrix:
121122
module: [models, schedulers, lora, others, single_file, examples]
@@ -138,7 +139,7 @@ jobs:
138139
- name: Run nightly PyTorch CUDA tests for non-pipeline modules
139140
if: ${{ matrix.module != 'examples'}}
140141
env:
141-
HF_TOKEN: ${{ secrets.HF_TOKEN }}
142+
HF_TOKEN: ${{ secrets.DIFFUSERS_HF_HUB_READ_TOKEN }}
142143
# https://pytorch.org/docs/stable/notes/randomness.html#avoiding-nondeterministic-algorithms
143144
CUBLAS_WORKSPACE_CONFIG: :16:8
144145
run: |
@@ -151,7 +152,7 @@ jobs:
151152
- name: Run nightly example tests with Torch
152153
if: ${{ matrix.module == 'examples' }}
153154
env:
154-
HF_TOKEN: ${{ secrets.HF_TOKEN }}
155+
HF_TOKEN: ${{ secrets.DIFFUSERS_HF_HUB_READ_TOKEN }}
155156
# https://pytorch.org/docs/stable/notes/randomness.html#avoiding-nondeterministic-algorithms
156157
CUBLAS_WORKSPACE_CONFIG: :16:8
157158
run: |
@@ -208,7 +209,7 @@ jobs:
208209

209210
- name: Run nightly Flax TPU tests
210211
env:
211-
HF_TOKEN: ${{ secrets.HF_TOKEN }}
212+
HF_TOKEN: ${{ secrets.DIFFUSERS_HF_HUB_READ_TOKEN }}
212213
run: |
213214
python -m pytest -n 0 \
214215
-s -v -k "Flax" \
@@ -263,7 +264,7 @@ jobs:
263264

264265
- name: Run Nightly ONNXRuntime CUDA tests
265266
env:
266-
HF_TOKEN: ${{ secrets.HF_TOKEN }}
267+
HF_TOKEN: ${{ secrets.DIFFUSERS_HF_HUB_READ_TOKEN }}
267268
run: |
268269
python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile \
269270
-s -v -k "Onnx" \
@@ -290,64 +291,118 @@ jobs:
290291
pip install slack_sdk tabulate
291292
python utils/log_reports.py >> $GITHUB_STEP_SUMMARY
292293
293-
run_nightly_tests_apple_m1:
294-
name: Nightly PyTorch MPS tests on MacOS
295-
runs-on: [ self-hosted, apple-m1 ]
296-
if: github.event_name == 'schedule'
297-
298-
steps:
299-
- name: Checkout diffusers
300-
uses: actions/checkout@v3
301-
with:
302-
fetch-depth: 2
303-
304-
- name: Clean checkout
305-
shell: arch -arch arm64 bash {0}
306-
run: |
307-
git clean -fxd
308-
309-
- name: Setup miniconda
310-
uses: ./.github/actions/setup-miniconda
311-
with:
312-
python-version: 3.9
313-
314-
- name: Install dependencies
315-
shell: arch -arch arm64 bash {0}
316-
run: |
317-
${CONDA_RUN} python -m pip install --upgrade pip uv
318-
${CONDA_RUN} python -m uv pip install -e [quality,test]
319-
${CONDA_RUN} python -m uv pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu
320-
${CONDA_RUN} python -m uv pip install accelerate@git+https://github.com/huggingface/accelerate
321-
${CONDA_RUN} python -m uv pip install pytest-reportlog
322-
323-
- name: Environment
324-
shell: arch -arch arm64 bash {0}
325-
run: |
326-
${CONDA_RUN} python utils/print_env.py
327-
328-
- name: Run nightly PyTorch tests on M1 (MPS)
329-
shell: arch -arch arm64 bash {0}
330-
env:
331-
HF_HOME: /System/Volumes/Data/mnt/cache
332-
HF_TOKEN: ${{ secrets.HF_TOKEN }}
333-
run: |
334-
${CONDA_RUN} python -m pytest -n 1 -s -v --make-reports=tests_torch_mps \
335-
--report-log=tests_torch_mps.log \
336-
tests/
337-
338-
- name: Failure short reports
339-
if: ${{ failure() }}
340-
run: cat reports/tests_torch_mps_failures_short.txt
341-
342-
- name: Test suite reports artifacts
343-
if: ${{ always() }}
344-
uses: actions/upload-artifact@v2
345-
with:
346-
name: torch_mps_test_reports
347-
path: reports
348-
349-
- name: Generate Report and Notify Channel
350-
if: always()
351-
run: |
352-
pip install slack_sdk tabulate
353-
python utils/log_reports.py >> $GITHUB_STEP_SUMMARY
294+
# M1 runner currently not well supported
295+
# TODO: (Dhruv) add these back when we setup better testing for Apple Silicon
296+
# run_nightly_tests_apple_m1:
297+
# name: Nightly PyTorch MPS tests on MacOS
298+
# runs-on: [ self-hosted, apple-m1 ]
299+
# if: github.event_name == 'schedule'
300+
#
301+
# steps:
302+
# - name: Checkout diffusers
303+
# uses: actions/checkout@v3
304+
# with:
305+
# fetch-depth: 2
306+
#
307+
# - name: Clean checkout
308+
# shell: arch -arch arm64 bash {0}
309+
# run: |
310+
# git clean -fxd
311+
# - name: Setup miniconda
312+
# uses: ./.github/actions/setup-miniconda
313+
# with:
314+
# python-version: 3.9
315+
#
316+
# - name: Install dependencies
317+
# shell: arch -arch arm64 bash {0}
318+
# run: |
319+
# ${CONDA_RUN} python -m pip install --upgrade pip uv
320+
# ${CONDA_RUN} python -m uv pip install -e [quality,test]
321+
# ${CONDA_RUN} python -m uv pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu
322+
# ${CONDA_RUN} python -m uv pip install accelerate@git+https://github.com/huggingface/accelerate
323+
# ${CONDA_RUN} python -m uv pip install pytest-reportlog
324+
# - name: Environment
325+
# shell: arch -arch arm64 bash {0}
326+
# run: |
327+
# ${CONDA_RUN} python utils/print_env.py
328+
# - name: Run nightly PyTorch tests on M1 (MPS)
329+
# shell: arch -arch arm64 bash {0}
330+
# env:
331+
# HF_HOME: /System/Volumes/Data/mnt/cache
332+
# HF_TOKEN: ${{ secrets.HF_TOKEN }}
333+
# run: |
334+
# ${CONDA_RUN} python -m pytest -n 1 -s -v --make-reports=tests_torch_mps \
335+
# --report-log=tests_torch_mps.log \
336+
# tests/
337+
# - name: Failure short reports
338+
# if: ${{ failure() }}
339+
# run: cat reports/tests_torch_mps_failures_short.txt
340+
#
341+
# - name: Test suite reports artifacts
342+
# if: ${{ always() }}
343+
# uses: actions/upload-artifact@v2
344+
# with:
345+
# name: torch_mps_test_reports
346+
# path: reports
347+
#
348+
# - name: Generate Report and Notify Channel
349+
# if: always()
350+
# run: |
351+
# pip install slack_sdk tabulate
352+
# python utils/log_reports.py >> $GITHUB_STEP_SUMMARY run_nightly_tests_apple_m1:
353+
# name: Nightly PyTorch MPS tests on MacOS
354+
# runs-on: [ self-hosted, apple-m1 ]
355+
# if: github.event_name == 'schedule'
356+
#
357+
# steps:
358+
# - name: Checkout diffusers
359+
# uses: actions/checkout@v3
360+
# with:
361+
# fetch-depth: 2
362+
#
363+
# - name: Clean checkout
364+
# shell: arch -arch arm64 bash {0}
365+
# run: |
366+
# git clean -fxd
367+
# - name: Setup miniconda
368+
# uses: ./.github/actions/setup-miniconda
369+
# with:
370+
# python-version: 3.9
371+
#
372+
# - name: Install dependencies
373+
# shell: arch -arch arm64 bash {0}
374+
# run: |
375+
# ${CONDA_RUN} python -m pip install --upgrade pip uv
376+
# ${CONDA_RUN} python -m uv pip install -e [quality,test]
377+
# ${CONDA_RUN} python -m uv pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu
378+
# ${CONDA_RUN} python -m uv pip install accelerate@git+https://github.com/huggingface/accelerate
379+
# ${CONDA_RUN} python -m uv pip install pytest-reportlog
380+
# - name: Environment
381+
# shell: arch -arch arm64 bash {0}
382+
# run: |
383+
# ${CONDA_RUN} python utils/print_env.py
384+
# - name: Run nightly PyTorch tests on M1 (MPS)
385+
# shell: arch -arch arm64 bash {0}
386+
# env:
387+
# HF_HOME: /System/Volumes/Data/mnt/cache
388+
# HF_TOKEN: ${{ secrets.HF_TOKEN }}
389+
# run: |
390+
# ${CONDA_RUN} python -m pytest -n 1 -s -v --make-reports=tests_torch_mps \
391+
# --report-log=tests_torch_mps.log \
392+
# tests/
393+
# - name: Failure short reports
394+
# if: ${{ failure() }}
395+
# run: cat reports/tests_torch_mps_failures_short.txt
396+
#
397+
# - name: Test suite reports artifacts
398+
# if: ${{ always() }}
399+
# uses: actions/upload-artifact@v2
400+
# with:
401+
# name: torch_mps_test_reports
402+
# path: reports
403+
#
404+
# - name: Generate Report and Notify Channel
405+
# if: always()
406+
# run: |
407+
# pip install slack_sdk tabulate
408+
# python utils/log_reports.py >> $GITHUB_STEP_SUMMARY

‎.github/workflows/push_tests.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
name: Slow Tests on main
1+
name: Fast GPU Tests on main
22

33
on:
4+
workflow_dispatch:
45
push:
56
branches:
67
- main
@@ -112,6 +113,8 @@ jobs:
112113
run:
113114
shell: bash
114115
strategy:
116+
fail-fast: false
117+
max-parallel: 2
115118
matrix:
116119
module: [models, schedulers, lora, others, single_file]
117120
steps:

0 commit comments

Comments
 (0)