Skip to content

Commit 01337da

Browse files
authored
Merge branch 'huggingface:main' into main
2 parents f2d29e3 + 07bd2fa commit 01337da

File tree

248 files changed

+16884
-1427
lines changed

Some content is hidden

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

248 files changed

+16884
-1427
lines changed

.github/workflows/benchmark.yml

Lines changed: 1 addition & 0 deletions
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

.github/workflows/nightly_tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ 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: |
@@ -130,8 +130,8 @@ 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
@@ -201,7 +201,7 @@ 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
@@ -257,7 +257,7 @@ 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
@@ -282,7 +282,7 @@ jobs:
282282
if: ${{ always() }}
283283
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

.github/workflows/pr_test_peft_backend.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
if [ "${{ matrix.lib-versions }}" == "main" ]; then
9696
python -m pip install -U peft@git+https://github.com/huggingface/peft.git
9797
python -m uv pip install -U transformers@git+https://github.com/huggingface/transformers.git
98-
python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
98+
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
9999
else
100100
python -m uv pip install -U peft transformers accelerate
101101
fi
@@ -110,23 +110,23 @@ jobs:
110110
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
111111
python -m pytest -n 4 --max-worker-restart=0 --dist=loadfile \
112112
-s -v \
113-
--make-reports=tests_${{ matrix.config.report }} \
113+
--make-reports=tests_${{ matrix.lib-versions }} \
114114
tests/lora/
115115
python -m pytest -n 4 --max-worker-restart=0 --dist=loadfile \
116116
-s -v \
117-
--make-reports=tests_models_lora_${{ matrix.config.report }} \
117+
--make-reports=tests_models_lora_${{ matrix.lib-versions }} \
118118
tests/models/ -k "lora"
119119
120120
121121
- name: Failure short reports
122122
if: ${{ failure() }}
123123
run: |
124-
cat reports/tests_${{ matrix.config.report }}_failures_short.txt
125-
cat reports/tests_models_lora_${{ matrix.config.report }}_failures_short.txt
124+
cat reports/tests_${{ matrix.lib-versions }}_failures_short.txt
125+
cat reports/tests_models_lora_${{ matrix.lib-versions }}_failures_short.txt
126126
127127
- name: Test suite reports artifacts
128128
if: ${{ always() }}
129129
uses: actions/upload-artifact@v4
130130
with:
131-
name: pr_${{ matrix.config.report }}_test_reports
131+
name: pr_${{ matrix.lib-versions }}_test_reports
132132
path: reports

.github/workflows/pr_tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ concurrency:
2222

2323
env:
2424
DIFFUSERS_IS_CI: yes
25+
HF_HUB_ENABLE_HF_TRANSFER: 1
2526
OMP_NUM_THREADS: 4
2627
MKL_NUM_THREADS: 4
2728
PYTEST_TIMEOUT: 60
@@ -170,7 +171,7 @@ jobs:
170171
if: ${{ always() }}
171172
uses: actions/upload-artifact@v4
172173
with:
173-
name: pr_${{ matrix.config.report }}_test_reports
174+
name: pr_${{ matrix.config.framework }}_${{ matrix.config.report }}_test_reports
174175
path: reports
175176

176177
run_staging_tests:

.github/workflows/push_tests.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ env:
1414
DIFFUSERS_IS_CI: yes
1515
OMP_NUM_THREADS: 8
1616
MKL_NUM_THREADS: 8
17+
HF_HUB_ENABLE_HF_TRANSFER: 1
1718
PYTEST_TIMEOUT: 600
1819
PIPELINE_USAGE_CUTOFF: 50000
1920

@@ -76,7 +77,7 @@ jobs:
7677
run: |
7778
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
7879
python -m uv pip install -e [quality,test]
79-
python -m uv pip install accelerate@git+https://github.com/huggingface/accelerate.git
80+
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
8081
- name: Environment
8182
run: |
8283
python utils/print_env.py
@@ -127,8 +128,8 @@ jobs:
127128
run: |
128129
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
129130
python -m uv pip install -e [quality,test]
130-
python -m uv pip install accelerate@git+https://github.com/huggingface/accelerate.git
131131
python -m uv pip install peft@git+https://github.com/huggingface/peft.git
132+
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
132133
133134
- name: Environment
134135
run: |
@@ -142,20 +143,20 @@ jobs:
142143
run: |
143144
python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile \
144145
-s -v -k "not Flax and not Onnx" \
145-
--make-reports=tests_torch_cuda \
146+
--make-reports=tests_torch_cuda_${{ matrix.module }} \
146147
tests/${{ matrix.module }}
147148
148149
- name: Failure short reports
149150
if: ${{ failure() }}
150151
run: |
151-
cat reports/tests_torch_cuda_stats.txt
152-
cat reports/tests_torch_cuda_failures_short.txt
152+
cat reports/tests_torch_cuda_${{ matrix.module }}_stats.txt
153+
cat reports/tests_torch_cuda_${{ matrix.module }}_failures_short.txt
153154
154155
- name: Test suite reports artifacts
155156
if: ${{ always() }}
156157
uses: actions/upload-artifact@v4
157158
with:
158-
name: torch_cuda_test_reports
159+
name: torch_cuda_test_reports_${{ matrix.module }}
159160
path: reports
160161

161162
flax_tpu_tests:
@@ -177,7 +178,7 @@ jobs:
177178
run: |
178179
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
179180
python -m uv pip install -e [quality,test]
180-
python -m uv pip install accelerate@git+https://github.com/huggingface/accelerate.git
181+
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
181182
182183
- name: Environment
183184
run: |
@@ -225,7 +226,7 @@ jobs:
225226
run: |
226227
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
227228
python -m uv pip install -e [quality,test]
228-
python -m uv pip install accelerate@git+https://github.com/huggingface/accelerate.git
229+
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
229230
230231
- name: Environment
231232
run: |

.github/workflows/push_tests_fast.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ env:
1818
HF_HOME: /mnt/cache
1919
OMP_NUM_THREADS: 8
2020
MKL_NUM_THREADS: 8
21+
HF_HUB_ENABLE_HF_TRANSFER: 1
2122
PYTEST_TIMEOUT: 600
2223
RUN_SLOW: no
2324

.github/workflows/push_tests_mps.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ env:
1313
HF_HOME: /mnt/cache
1414
OMP_NUM_THREADS: 8
1515
MKL_NUM_THREADS: 8
16+
HF_HUB_ENABLE_HF_TRANSFER: 1
1617
PYTEST_TIMEOUT: 600
1718
RUN_SLOW: no
1819

.github/workflows/release_tests_fast.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
run: |
7676
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
7777
python -m uv pip install -e [quality,test]
78-
python -m uv pip install accelerate@git+https://github.com/huggingface/accelerate.git
78+
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
7979
- name: Environment
8080
run: |
8181
python utils/print_env.py
@@ -126,8 +126,8 @@ jobs:
126126
run: |
127127
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
128128
python -m uv pip install -e [quality,test]
129-
python -m uv pip install accelerate@git+https://github.com/huggingface/accelerate.git
130129
python -m uv pip install peft@git+https://github.com/huggingface/peft.git
130+
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
131131
132132
- name: Environment
133133
run: |
@@ -141,20 +141,20 @@ jobs:
141141
run: |
142142
python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile \
143143
-s -v -k "not Flax and not Onnx" \
144-
--make-reports=tests_torch_cuda \
144+
--make-reports=tests_torch_${{ matrix.module }}_cuda \
145145
tests/${{ matrix.module }}
146146
147147
- name: Failure short reports
148148
if: ${{ failure() }}
149149
run: |
150-
cat reports/tests_torch_cuda_stats.txt
151-
cat reports/tests_torch_cuda_failures_short.txt
150+
cat reports/tests_torch_${{ matrix.module }}_cuda_stats.txt
151+
cat reports/tests_torch_${{ matrix.module }}_cuda_failures_short.txt
152152
153153
- name: Test suite reports artifacts
154154
if: ${{ always() }}
155155
uses: actions/upload-artifact@v4
156156
with:
157-
name: torch_cuda_test_reports
157+
name: torch_cuda_${{ matrix.module }}_test_reports
158158
path: reports
159159

160160
flax_tpu_tests:
@@ -176,7 +176,7 @@ jobs:
176176
run: |
177177
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
178178
python -m uv pip install -e [quality,test]
179-
python -m uv pip install accelerate@git+https://github.com/huggingface/accelerate.git
179+
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
180180
181181
- name: Environment
182182
run: |
@@ -224,7 +224,7 @@ jobs:
224224
run: |
225225
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
226226
python -m uv pip install -e [quality,test]
227-
python -m uv pip install accelerate@git+https://github.com/huggingface/accelerate.git
227+
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
228228
229229
- name: Environment
230230
run: |

.github/workflows/ssh-runner.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@ on:
44
workflow_dispatch:
55
inputs:
66
runner_type:
7-
description: 'Type of runner to test (a10 or t4)'
7+
description: 'Type of runner to test (aws-g6-4xlarge-plus: a10 or aws-g4dn-2xlarge: t4)'
8+
type: choice
89
required: true
10+
options:
11+
- aws-g6-4xlarge-plus
12+
- aws-g4dn-2xlarge
913
docker_image:
1014
description: 'Name of the Docker image'
1115
required: true

PHILOSOPHY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Pipelines are designed to be easy to use (therefore do not follow [*Simple over
6565
The following design principles are followed:
6666
- Pipelines follow the single-file policy. All pipelines can be found in individual directories under src/diffusers/pipelines. One pipeline folder corresponds to one diffusion paper/project/release. Multiple pipeline files can be gathered in one pipeline folder, as it’s done for [`src/diffusers/pipelines/stable-diffusion`](https://github.com/huggingface/diffusers/tree/main/src/diffusers/pipelines/stable_diffusion). If pipelines share similar functionality, one can make use of the [# Copied from mechanism](https://github.com/huggingface/diffusers/blob/125d783076e5bd9785beb05367a2d2566843a271/src/diffusers/pipelines/stable_diffusion/pipeline_stable_diffusion_img2img.py#L251).
6767
- Pipelines all inherit from [`DiffusionPipeline`].
68-
- Every pipeline consists of different model and scheduler components, that are documented in the [`model_index.json` file](https://huggingface.co/runwayml/stable-diffusion-v1-5/blob/main/model_index.json), are accessible under the same name as attributes of the pipeline and can be shared between pipelines with [`DiffusionPipeline.components`](https://huggingface.co/docs/diffusers/main/en/api/diffusion_pipeline#diffusers.DiffusionPipeline.components) function.
68+
- Every pipeline consists of different model and scheduler components, that are documented in the [`model_index.json` file](https://huggingface.co/stable-diffusion-v1-5/stable-diffusion-v1-5/blob/main/model_index.json), are accessible under the same name as attributes of the pipeline and can be shared between pipelines with [`DiffusionPipeline.components`](https://huggingface.co/docs/diffusers/main/en/api/diffusion_pipeline#diffusers.DiffusionPipeline.components) function.
6969
- Every pipeline should be loadable via the [`DiffusionPipeline.from_pretrained`](https://huggingface.co/docs/diffusers/main/en/api/diffusion_pipeline#diffusers.DiffusionPipeline.from_pretrained) function.
7070
- Pipelines should be used **only** for inference.
7171
- Pipelines should be very readable, self-explanatory, and easy to tweak.

0 commit comments

Comments
 (0)