Skip to content

Commit dfad056

Browse files
authored
Merge branch 'huggingface:main' into control-lora
2 parents 9d94c37 + 6f1042e commit dfad056

File tree

712 files changed

+42030
-12771
lines changed

Some content is hidden

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

712 files changed

+42030
-12771
lines changed

.github/workflows/benchmark.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
env:
99
DIFFUSERS_IS_CI: yes
10-
HF_HUB_ENABLE_HF_TRANSFER: 1
10+
HF_XET_HIGH_PERFORMANCE: 1
1111
HF_HOME: /mnt/cache
1212
OMP_NUM_THREADS: 8
1313
MKL_NUM_THREADS: 8
@@ -38,9 +38,8 @@ jobs:
3838
run: |
3939
apt update
4040
apt install -y libpq-dev postgresql-client
41-
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
42-
python -m uv pip install -e [quality,test]
43-
python -m uv pip install -r benchmarks/requirements.txt
41+
uv pip install -e ".[quality]"
42+
uv pip install -r benchmarks/requirements.txt
4443
- name: Environment
4544
run: |
4645
python utils/print_env.py

.github/workflows/build_docker_images.yml

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,39 @@ jobs:
4242
CHANGED_FILES: ${{ steps.file_changes.outputs.all }}
4343
run: |
4444
echo "$CHANGED_FILES"
45-
for FILE in $CHANGED_FILES; do
45+
ALLOWED_IMAGES=(
46+
diffusers-pytorch-cpu
47+
diffusers-pytorch-cuda
48+
diffusers-pytorch-xformers-cuda
49+
diffusers-pytorch-minimum-cuda
50+
diffusers-doc-builder
51+
)
52+
53+
declare -A IMAGES_TO_BUILD=()
54+
55+
for FILE in $CHANGED_FILES; do
4656
# skip anything that isn't still on disk
47-
if [[ ! -f "$FILE" ]]; then
57+
if [[ ! -e "$FILE" ]]; then
4858
echo "Skipping removed file $FILE"
4959
continue
50-
fi
51-
if [[ "$FILE" == docker/*Dockerfile ]]; then
52-
DOCKER_PATH="${FILE%/Dockerfile}"
53-
DOCKER_TAG=$(basename "$DOCKER_PATH")
54-
echo "Building Docker image for $DOCKER_TAG"
55-
docker build -t "$DOCKER_TAG" "$DOCKER_PATH"
5660
fi
61+
62+
for IMAGE in "${ALLOWED_IMAGES[@]}"; do
63+
if [[ "$FILE" == docker/${IMAGE}/* ]]; then
64+
IMAGES_TO_BUILD["$IMAGE"]=1
65+
fi
66+
done
67+
done
68+
69+
if [[ ${#IMAGES_TO_BUILD[@]} -eq 0 ]]; then
70+
echo "No relevant Docker changes detected."
71+
exit 0
72+
fi
73+
74+
for IMAGE in "${!IMAGES_TO_BUILD[@]}"; do
75+
DOCKER_PATH="docker/${IMAGE}"
76+
echo "Building Docker image for $IMAGE"
77+
docker build -t "$IMAGE" "$DOCKER_PATH"
5778
done
5879
if: steps.file_changes.outputs.all != ''
5980

@@ -72,7 +93,6 @@ jobs:
7293
image-name:
7394
- diffusers-pytorch-cpu
7495
- diffusers-pytorch-cuda
75-
- diffusers-pytorch-cuda
7696
- diffusers-pytorch-xformers-cuda
7797
- diffusers-pytorch-minimum-cuda
7898
- diffusers-doc-builder

.github/workflows/build_pr_documentation.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,33 @@ concurrency:
1212
cancel-in-progress: true
1313

1414
jobs:
15+
check-links:
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- name: Checkout repository
20+
uses: actions/checkout@v4
21+
22+
- name: Set up Python
23+
uses: actions/setup-python@v5
24+
with:
25+
python-version: '3.10'
26+
27+
- name: Install uv
28+
run: |
29+
curl -LsSf https://astral.sh/uv/install.sh | sh
30+
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
31+
32+
- name: Install doc-builder
33+
run: |
34+
uv pip install --system git+https://github.com/huggingface/doc-builder.git@main
35+
36+
- name: Check documentation links
37+
run: |
38+
uv run doc-builder check-links docs/source/en
39+
1540
build:
41+
needs: check-links
1642
uses: huggingface/doc-builder/.github/workflows/build_pr_documentation.yml@main
1743
with:
1844
commit_sha: ${{ github.event.pull_request.head.sha }}

.github/workflows/mirror_community_pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
python-version: "3.10"
7575
- name: Install dependencies
7676
run: |
77-
python -m pip install --upgrade pip
77+
pip install --upgrade pip
7878
pip install --upgrade huggingface_hub
7979
8080
# Check secret is set

.github/workflows/nightly_tests.yml

Lines changed: 61 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
env:
99
DIFFUSERS_IS_CI: yes
10-
HF_HUB_ENABLE_HF_TRANSFER: 1
10+
HF_XET_HIGH_PERFORMANCE: 1
1111
OMP_NUM_THREADS: 8
1212
MKL_NUM_THREADS: 8
1313
PYTEST_TIMEOUT: 600
@@ -71,10 +71,11 @@ jobs:
7171
run: nvidia-smi
7272
- name: Install dependencies
7373
run: |
74-
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
75-
python -m uv pip install -e [quality,test]
76-
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
77-
python -m uv pip install pytest-reportlog
74+
uv pip install -e ".[quality]"
75+
uv pip uninstall accelerate && uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
76+
#uv pip uninstall transformers huggingface_hub && uv pip install --prerelease allow -U transformers@git+https://github.com/huggingface/transformers.git
77+
uv pip uninstall transformers huggingface_hub && uv pip install transformers==4.57.1
78+
uv pip install pytest-reportlog
7879
- name: Environment
7980
run: |
8081
python utils/print_env.py
@@ -84,8 +85,8 @@ jobs:
8485
# https://pytorch.org/docs/stable/notes/randomness.html#avoiding-nondeterministic-algorithms
8586
CUBLAS_WORKSPACE_CONFIG: :16:8
8687
run: |
87-
python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile \
88-
-s -v -k "not Flax and not Onnx" \
88+
pytest -n 1 --max-worker-restart=0 --dist=loadfile \
89+
-k "not Flax and not Onnx" \
8990
--make-reports=tests_pipeline_${{ matrix.module }}_cuda \
9091
--report-log=tests_pipeline_${{ matrix.module }}_cuda.log \
9192
tests/pipelines/${{ matrix.module }}
@@ -124,11 +125,12 @@ jobs:
124125

125126
- name: Install dependencies
126127
run: |
127-
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
128-
python -m uv pip install -e [quality,test]
129-
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
131-
python -m uv pip install pytest-reportlog
128+
uv pip install -e ".[quality]"
129+
uv pip install peft@git+https://github.com/huggingface/peft.git
130+
uv pip uninstall accelerate && uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
131+
#uv pip uninstall transformers huggingface_hub && uv pip install --prerelease allow -U transformers@git+https://github.com/huggingface/transformers.git
132+
uv pip uninstall transformers huggingface_hub && uv pip install transformers==4.57.1
133+
uv pip install pytest-reportlog
132134
- name: Environment
133135
run: python utils/print_env.py
134136

@@ -139,8 +141,8 @@ jobs:
139141
# https://pytorch.org/docs/stable/notes/randomness.html#avoiding-nondeterministic-algorithms
140142
CUBLAS_WORKSPACE_CONFIG: :16:8
141143
run: |
142-
python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile \
143-
-s -v -k "not Flax and not Onnx" \
144+
pytest -n 1 --max-worker-restart=0 --dist=loadfile \
145+
-k "not Flax and not Onnx" \
144146
--make-reports=tests_torch_${{ matrix.module }}_cuda \
145147
--report-log=tests_torch_${{ matrix.module }}_cuda.log \
146148
tests/${{ matrix.module }}
@@ -152,8 +154,8 @@ jobs:
152154
# https://pytorch.org/docs/stable/notes/randomness.html#avoiding-nondeterministic-algorithms
153155
CUBLAS_WORKSPACE_CONFIG: :16:8
154156
run: |
155-
python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile \
156-
-s -v --make-reports=examples_torch_cuda \
157+
pytest -n 1 --max-worker-restart=0 --dist=loadfile \
158+
--make-reports=examples_torch_cuda \
157159
--report-log=examples_torch_cuda.log \
158160
examples/
159161
@@ -191,8 +193,9 @@ jobs:
191193
nvidia-smi
192194
- name: Install dependencies
193195
run: |
194-
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
195-
python -m uv pip install -e [quality,test,training]
196+
uv pip install -e ".[quality,training]"
197+
#uv pip uninstall transformers huggingface_hub && uv pip install --prerelease allow -U transformers@git+https://github.com/huggingface/transformers.git
198+
uv pip uninstall transformers huggingface_hub && uv pip install transformers==4.57.1
196199
- name: Environment
197200
run: |
198201
python utils/print_env.py
@@ -201,7 +204,7 @@ jobs:
201204
HF_TOKEN: ${{ secrets.DIFFUSERS_HF_HUB_READ_TOKEN }}
202205
RUN_COMPILE: yes
203206
run: |
204-
python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile -s -v -k "compile" --make-reports=tests_torch_compile_cuda tests/
207+
pytest -n 1 --max-worker-restart=0 --dist=loadfile -k "compile" --make-reports=tests_torch_compile_cuda tests/
205208
- name: Failure short reports
206209
if: ${{ failure() }}
207210
run: cat reports/tests_torch_compile_cuda_failures_short.txt
@@ -232,11 +235,12 @@ jobs:
232235
run: nvidia-smi
233236
- name: Install dependencies
234237
run: |
235-
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
236-
python -m uv pip install -e [quality,test]
237-
python -m uv pip install peft@git+https://github.com/huggingface/peft.git
238-
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
239-
python -m uv pip install pytest-reportlog
238+
uv pip install -e ".[quality]"
239+
uv pip install peft@git+https://github.com/huggingface/peft.git
240+
uv pip uninstall accelerate && uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
241+
#uv pip uninstall transformers huggingface_hub && uv pip install --prerelease allow -U transformers@git+https://github.com/huggingface/transformers.git
242+
uv pip uninstall transformers huggingface_hub && uv pip install transformers==4.57.1
243+
uv pip install pytest-reportlog
240244
- name: Environment
241245
run: |
242246
python utils/print_env.py
@@ -247,7 +251,7 @@ jobs:
247251
CUBLAS_WORKSPACE_CONFIG: :16:8
248252
BIG_GPU_MEMORY: 40
249253
run: |
250-
python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile \
254+
pytest -n 1 --max-worker-restart=0 --dist=loadfile \
251255
-m "big_accelerator" \
252256
--make-reports=tests_big_gpu_torch_cuda \
253257
--report-log=tests_big_gpu_torch_cuda.log \
@@ -282,10 +286,11 @@ jobs:
282286

283287
- name: Install dependencies
284288
run: |
285-
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
286-
python -m uv pip install -e [quality,test]
287-
python -m uv pip install peft@git+https://github.com/huggingface/peft.git
288-
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
289+
uv pip install -e ".[quality]"
290+
uv pip install peft@git+https://github.com/huggingface/peft.git
291+
uv pip uninstall accelerate && uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
292+
#uv pip uninstall transformers huggingface_hub && uv pip install --prerelease allow -U transformers@git+https://github.com/huggingface/transformers.git
293+
uv pip uninstall transformers huggingface_hub && uv pip install transformers==4.57.1
289294
290295
- name: Environment
291296
run: |
@@ -297,8 +302,8 @@ jobs:
297302
# https://pytorch.org/docs/stable/notes/randomness.html#avoiding-nondeterministic-algorithms
298303
CUBLAS_WORKSPACE_CONFIG: :16:8
299304
run: |
300-
python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile \
301-
-s -v -k "not Flax and not Onnx" \
305+
pytest -n 1 --max-worker-restart=0 --dist=loadfile \
306+
-k "not Flax and not Onnx" \
302307
--make-reports=tests_torch_minimum_version_cuda \
303308
tests/models/test_modeling_common.py \
304309
tests/pipelines/test_pipelines_common.py \
@@ -357,13 +362,14 @@ jobs:
357362
run: nvidia-smi
358363
- name: Install dependencies
359364
run: |
360-
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
361-
python -m uv pip install -e [quality,test]
362-
python -m uv pip install -U ${{ matrix.config.backend }}
365+
uv pip install -e ".[quality]"
366+
uv pip install -U ${{ matrix.config.backend }}
363367
if [ "${{ join(matrix.config.additional_deps, ' ') }}" != "" ]; then
364-
python -m uv pip install ${{ join(matrix.config.additional_deps, ' ') }}
368+
uv pip install ${{ join(matrix.config.additional_deps, ' ') }}
365369
fi
366-
python -m uv pip install pytest-reportlog
370+
uv pip install pytest-reportlog
371+
#uv pip uninstall transformers huggingface_hub && uv pip install --prerelease allow -U transformers@git+https://github.com/huggingface/transformers.git
372+
uv pip uninstall transformers huggingface_hub && uv pip install transformers==4.57.1
367373
- name: Environment
368374
run: |
369375
python utils/print_env.py
@@ -374,7 +380,7 @@ jobs:
374380
CUBLAS_WORKSPACE_CONFIG: :16:8
375381
BIG_GPU_MEMORY: 40
376382
run: |
377-
python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile \
383+
pytest -n 1 --max-worker-restart=0 --dist=loadfile \
378384
--make-reports=tests_${{ matrix.config.backend }}_torch_cuda \
379385
--report-log=tests_${{ matrix.config.backend }}_torch_cuda.log \
380386
tests/quantization/${{ matrix.config.test_location }}
@@ -409,10 +415,11 @@ jobs:
409415
run: nvidia-smi
410416
- name: Install dependencies
411417
run: |
412-
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
413-
python -m uv pip install -e [quality,test]
414-
python -m uv pip install -U bitsandbytes optimum_quanto
415-
python -m uv pip install pytest-reportlog
418+
uv pip install -e ".[quality]"
419+
uv pip install -U bitsandbytes optimum_quanto
420+
#uv pip uninstall transformers huggingface_hub && uv pip install --prerelease allow -U transformers@git+https://github.com/huggingface/transformers.git
421+
uv pip uninstall transformers huggingface_hub && uv pip install transformers==4.57.1
422+
uv pip install pytest-reportlog
416423
- name: Environment
417424
run: |
418425
python utils/print_env.py
@@ -423,7 +430,7 @@ jobs:
423430
CUBLAS_WORKSPACE_CONFIG: :16:8
424431
BIG_GPU_MEMORY: 40
425432
run: |
426-
python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile \
433+
pytest -n 1 --max-worker-restart=0 --dist=loadfile \
427434
--make-reports=tests_pipeline_level_quant_torch_cuda \
428435
--report-log=tests_pipeline_level_quant_torch_cuda.log \
429436
tests/quantization/test_pipeline_level_quantization.py
@@ -523,11 +530,11 @@ jobs:
523530
# - name: Install dependencies
524531
# shell: arch -arch arm64 bash {0}
525532
# run: |
526-
# ${CONDA_RUN} python -m pip install --upgrade pip uv
527-
# ${CONDA_RUN} python -m uv pip install -e [quality,test]
528-
# ${CONDA_RUN} python -m uv pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu
529-
# ${CONDA_RUN} python -m uv pip install accelerate@git+https://github.com/huggingface/accelerate
530-
# ${CONDA_RUN} python -m uv pip install pytest-reportlog
533+
# ${CONDA_RUN} pip install --upgrade pip uv
534+
# ${CONDA_RUN} uv pip install -e ".[quality]"
535+
# ${CONDA_RUN} uv pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu
536+
# ${CONDA_RUN} uv pip install accelerate@git+https://github.com/huggingface/accelerate
537+
# ${CONDA_RUN} uv pip install pytest-reportlog
531538
# - name: Environment
532539
# shell: arch -arch arm64 bash {0}
533540
# run: |
@@ -538,7 +545,7 @@ jobs:
538545
# HF_HOME: /System/Volumes/Data/mnt/cache
539546
# HF_TOKEN: ${{ secrets.DIFFUSERS_HF_HUB_READ_TOKEN }}
540547
# run: |
541-
# ${CONDA_RUN} python -m pytest -n 1 -s -v --make-reports=tests_torch_mps \
548+
# ${CONDA_RUN} pytest -n 1 --make-reports=tests_torch_mps \
542549
# --report-log=tests_torch_mps.log \
543550
# tests/
544551
# - name: Failure short reports
@@ -579,11 +586,11 @@ jobs:
579586
# - name: Install dependencies
580587
# shell: arch -arch arm64 bash {0}
581588
# run: |
582-
# ${CONDA_RUN} python -m pip install --upgrade pip uv
583-
# ${CONDA_RUN} python -m uv pip install -e [quality,test]
584-
# ${CONDA_RUN} python -m uv pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu
585-
# ${CONDA_RUN} python -m uv pip install accelerate@git+https://github.com/huggingface/accelerate
586-
# ${CONDA_RUN} python -m uv pip install pytest-reportlog
589+
# ${CONDA_RUN} pip install --upgrade pip uv
590+
# ${CONDA_RUN} uv pip install -e ".[quality]"
591+
# ${CONDA_RUN} uv pip install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cpu
592+
# ${CONDA_RUN} uv pip install accelerate@git+https://github.com/huggingface/accelerate
593+
# ${CONDA_RUN} uv pip install pytest-reportlog
587594
# - name: Environment
588595
# shell: arch -arch arm64 bash {0}
589596
# run: |
@@ -594,7 +601,7 @@ jobs:
594601
# HF_HOME: /System/Volumes/Data/mnt/cache
595602
# HF_TOKEN: ${{ secrets.DIFFUSERS_HF_HUB_READ_TOKEN }}
596603
# run: |
597-
# ${CONDA_RUN} python -m pytest -n 1 -s -v --make-reports=tests_torch_mps \
604+
# ${CONDA_RUN} pytest -n 1 --make-reports=tests_torch_mps \
598605
# --report-log=tests_torch_mps.log \
599606
# tests/
600607
# - name: Failure short reports

.github/workflows/pr_dependency_test.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,8 @@ jobs:
2525
python-version: "3.8"
2626
- name: Install dependencies
2727
run: |
28-
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
29-
python -m pip install --upgrade pip uv
30-
python -m uv pip install -e .
31-
python -m uv pip install pytest
28+
pip install -e .
29+
pip install pytest
3230
- name: Check for soft dependencies
3331
run: |
34-
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
35-
pytest tests/others/test_dependencies.py
32+
pytest tests/others/test_dependencies.py

0 commit comments

Comments
 (0)