Skip to content

Commit 376297a

Browse files
authored
Merge branch 'main' into sd3-xformers
2 parents 907ace5 + cef4f65 commit 376297a

File tree

397 files changed

+43641
-3547
lines changed

Some content is hidden

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

397 files changed

+43641
-3547
lines changed

.github/workflows/benchmark.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77

88
env:
99
DIFFUSERS_IS_CI: yes
10+
HF_HUB_ENABLE_HF_TRANSFER: 1
1011
HF_HOME: /mnt/cache
1112
OMP_NUM_THREADS: 8
1213
MKL_NUM_THREADS: 8
@@ -50,7 +51,7 @@ jobs:
5051
5152
- name: Test suite reports artifacts
5253
if: ${{ always() }}
53-
uses: actions/upload-artifact@v2
54+
uses: actions/upload-artifact@v4
5455
with:
5556
name: benchmark_test_reports
5657
path: benchmarks/benchmark_outputs

.github/workflows/mirror_community_pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
env:
2626
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL_COMMUNITY_MIRROR }}
2727

28-
runs-on: ubuntu-latest
28+
runs-on: ubuntu-22.04
2929
steps:
3030
# Checkout to correct ref
3131
# If workflow dispatch

.github/workflows/nightly_tests.yml

Lines changed: 130 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
4444
- name: Pipeline Tests Artifacts
4545
if: ${{ always() }}
46-
uses: actions/upload-artifact@v2
46+
uses: actions/upload-artifact@v4
4747
with:
4848
name: test-pipelines.json
4949
path: reports
@@ -72,14 +72,14 @@ jobs:
7272
run: |
7373
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
7474
python -m uv pip install -e [quality,test]
75-
python -m uv pip install accelerate@git+https://github.com/huggingface/accelerate.git
75+
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
7676
python -m uv pip install pytest-reportlog
7777
- name: Environment
7878
run: |
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: |
@@ -95,7 +95,7 @@ jobs:
9595
cat reports/tests_pipeline_${{ matrix.module }}_cuda_failures_short.txt
9696
- name: Test suite reports artifacts
9797
if: ${{ always() }}
98-
uses: actions/upload-artifact@v2
98+
uses: actions/upload-artifact@v4
9999
with:
100100
name: pipeline_${{ matrix.module }}_test_reports
101101
path: reports
@@ -130,16 +130,16 @@ jobs:
130130
run: |
131131
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
132132
python -m uv pip install -e [quality,test]
133-
python -m uv pip install accelerate@git+https://github.com/huggingface/accelerate.git
134133
python -m uv pip install peft@git+https://github.com/huggingface/peft.git
134+
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
135135
python -m uv pip install pytest-reportlog
136136
- name: Environment
137137
run: python utils/print_env.py
138138

139139
- name: Run nightly PyTorch CUDA tests for non-pipeline modules
140140
if: ${{ matrix.module != 'examples'}}
141141
env:
142-
HF_TOKEN: ${{ secrets.HF_TOKEN }}
142+
HF_TOKEN: ${{ secrets.DIFFUSERS_HF_HUB_READ_TOKEN }}
143143
# https://pytorch.org/docs/stable/notes/randomness.html#avoiding-nondeterministic-algorithms
144144
CUBLAS_WORKSPACE_CONFIG: :16:8
145145
run: |
@@ -152,7 +152,7 @@ jobs:
152152
- name: Run nightly example tests with Torch
153153
if: ${{ matrix.module == 'examples' }}
154154
env:
155-
HF_TOKEN: ${{ secrets.HF_TOKEN }}
155+
HF_TOKEN: ${{ secrets.DIFFUSERS_HF_HUB_READ_TOKEN }}
156156
# https://pytorch.org/docs/stable/notes/randomness.html#avoiding-nondeterministic-algorithms
157157
CUBLAS_WORKSPACE_CONFIG: :16:8
158158
run: |
@@ -169,7 +169,7 @@ jobs:
169169
170170
- name: Test suite reports artifacts
171171
if: ${{ always() }}
172-
uses: actions/upload-artifact@v2
172+
uses: actions/upload-artifact@v4
173173
with:
174174
name: torch_${{ matrix.module }}_cuda_test_reports
175175
path: reports
@@ -201,15 +201,15 @@ jobs:
201201
run: |
202202
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
203203
python -m uv pip install -e [quality,test]
204-
python -m uv pip install accelerate@git+https://github.com/huggingface/accelerate.git
204+
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
205205
python -m uv pip install pytest-reportlog
206206
207207
- name: Environment
208208
run: python utils/print_env.py
209209

210210
- name: Run nightly Flax TPU tests
211211
env:
212-
HF_TOKEN: ${{ secrets.HF_TOKEN }}
212+
HF_TOKEN: ${{ secrets.DIFFUSERS_HF_HUB_READ_TOKEN }}
213213
run: |
214214
python -m pytest -n 0 \
215215
-s -v -k "Flax" \
@@ -225,7 +225,7 @@ jobs:
225225
226226
- name: Test suite reports artifacts
227227
if: ${{ always() }}
228-
uses: actions/upload-artifact@v2
228+
uses: actions/upload-artifact@v4
229229
with:
230230
name: flax_tpu_test_reports
231231
path: reports
@@ -257,14 +257,14 @@ jobs:
257257
run: |
258258
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
259259
python -m uv pip install -e [quality,test]
260-
python -m uv pip install accelerate@git+https://github.com/huggingface/accelerate.git
260+
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
261261
python -m uv pip install pytest-reportlog
262262
- name: Environment
263263
run: python utils/print_env.py
264264

265265
- name: Run Nightly ONNXRuntime CUDA tests
266266
env:
267-
HF_TOKEN: ${{ secrets.HF_TOKEN }}
267+
HF_TOKEN: ${{ secrets.DIFFUSERS_HF_HUB_READ_TOKEN }}
268268
run: |
269269
python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile \
270270
-s -v -k "Onnx" \
@@ -280,9 +280,9 @@ jobs:
280280
281281
- name: Test suite reports artifacts
282282
if: ${{ always() }}
283-
uses: actions/upload-artifact@v2
283+
uses: actions/upload-artifact@v4
284284
with:
285-
name: ${{ matrix.config.report }}_test_reports
285+
name: tests_onnx_cuda_reports
286286
path: reports
287287

288288
- name: Generate Report and Notify Channel
@@ -291,64 +291,118 @@ jobs:
291291
pip install slack_sdk tabulate
292292
python utils/log_reports.py >> $GITHUB_STEP_SUMMARY
293293
294-
run_nightly_tests_apple_m1:
295-
name: Nightly PyTorch MPS tests on MacOS
296-
runs-on: [ self-hosted, apple-m1 ]
297-
if: github.event_name == 'schedule'
298-
299-
steps:
300-
- name: Checkout diffusers
301-
uses: actions/checkout@v3
302-
with:
303-
fetch-depth: 2
304-
305-
- name: Clean checkout
306-
shell: arch -arch arm64 bash {0}
307-
run: |
308-
git clean -fxd
309-
310-
- name: Setup miniconda
311-
uses: ./.github/actions/setup-miniconda
312-
with:
313-
python-version: 3.9
314-
315-
- name: Install dependencies
316-
shell: arch -arch arm64 bash {0}
317-
run: |
318-
${CONDA_RUN} python -m pip install --upgrade pip uv
319-
${CONDA_RUN} python -m uv pip install -e [quality,test]
320-
${CONDA_RUN} python -m uv pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu
321-
${CONDA_RUN} python -m uv pip install accelerate@git+https://github.com/huggingface/accelerate
322-
${CONDA_RUN} python -m uv pip install pytest-reportlog
323-
324-
- name: Environment
325-
shell: arch -arch arm64 bash {0}
326-
run: |
327-
${CONDA_RUN} python utils/print_env.py
328-
329-
- name: Run nightly PyTorch tests on M1 (MPS)
330-
shell: arch -arch arm64 bash {0}
331-
env:
332-
HF_HOME: /System/Volumes/Data/mnt/cache
333-
HF_TOKEN: ${{ secrets.HF_TOKEN }}
334-
run: |
335-
${CONDA_RUN} python -m pytest -n 1 -s -v --make-reports=tests_torch_mps \
336-
--report-log=tests_torch_mps.log \
337-
tests/
338-
339-
- name: Failure short reports
340-
if: ${{ failure() }}
341-
run: cat reports/tests_torch_mps_failures_short.txt
342-
343-
- name: Test suite reports artifacts
344-
if: ${{ always() }}
345-
uses: actions/upload-artifact@v2
346-
with:
347-
name: torch_mps_test_reports
348-
path: reports
349-
350-
- name: Generate Report and Notify Channel
351-
if: always()
352-
run: |
353-
pip install slack_sdk tabulate
354-
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@v4
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@v4
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/notify_slack_about_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
build:
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-22.04
1111

1212
steps:
1313
- uses: actions/checkout@v3

.github/workflows/pr_dependency_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ concurrency:
1616

1717
jobs:
1818
check_dependencies:
19-
runs-on: ubuntu-latest
19+
runs-on: ubuntu-22.04
2020
steps:
2121
- uses: actions/checkout@v3
2222
- name: Set up Python

.github/workflows/pr_flax_dependency_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ concurrency:
1616

1717
jobs:
1818
check_flax_dependencies:
19-
runs-on: ubuntu-latest
19+
runs-on: ubuntu-22.04
2020
steps:
2121
- uses: actions/checkout@v3
2222
- name: Set up Python

.github/workflows/pr_test_fetcher.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ jobs:
171171

172172
- name: Test suite reports artifacts
173173
if: ${{ always() }}
174-
uses: actions/upload-artifact@v2
174+
uses: actions/upload-artifact@v4
175175
with:
176176
name: pr_${{ matrix.config.report }}_test_reports
177177
path: reports

0 commit comments

Comments
 (0)