Skip to content

Commit baff8a6

Browse files
committed
Merge branch 'main' into sd3-xformers
# Conflicts: # src/diffusers/models/attention_processor.py
2 parents 376297a + dac623b commit baff8a6

File tree

298 files changed

+27707
-4490
lines changed

Some content is hidden

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

298 files changed

+27707
-4490
lines changed

.github/workflows/nightly_tests.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,62 @@ jobs:
180180
pip install slack_sdk tabulate
181181
python utils/log_reports.py >> $GITHUB_STEP_SUMMARY
182182
183+
run_big_gpu_torch_tests:
184+
name: Torch tests on big GPU
185+
strategy:
186+
fail-fast: false
187+
max-parallel: 2
188+
runs-on:
189+
group: aws-g6e-xlarge-plus
190+
container:
191+
image: diffusers/diffusers-pytorch-cuda
192+
options: --shm-size "16gb" --ipc host --gpus 0
193+
steps:
194+
- name: Checkout diffusers
195+
uses: actions/checkout@v3
196+
with:
197+
fetch-depth: 2
198+
- name: NVIDIA-SMI
199+
run: nvidia-smi
200+
- name: Install dependencies
201+
run: |
202+
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
203+
python -m uv pip install -e [quality,test]
204+
python -m uv pip install peft@git+https://github.com/huggingface/peft.git
205+
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
206+
python -m uv pip install pytest-reportlog
207+
- name: Environment
208+
run: |
209+
python utils/print_env.py
210+
- name: Selected Torch CUDA Test on big GPU
211+
env:
212+
HF_TOKEN: ${{ secrets.DIFFUSERS_HF_HUB_READ_TOKEN }}
213+
# https://pytorch.org/docs/stable/notes/randomness.html#avoiding-nondeterministic-algorithms
214+
CUBLAS_WORKSPACE_CONFIG: :16:8
215+
BIG_GPU_MEMORY: 40
216+
run: |
217+
python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile \
218+
-m "big_gpu_with_torch_cuda" \
219+
--make-reports=tests_big_gpu_torch_cuda \
220+
--report-log=tests_big_gpu_torch_cuda.log \
221+
tests/
222+
- name: Failure short reports
223+
if: ${{ failure() }}
224+
run: |
225+
cat reports/tests_big_gpu_torch_cuda_stats.txt
226+
cat reports/tests_big_gpu_torch_cuda_failures_short.txt
227+
- name: Test suite reports artifacts
228+
if: ${{ always() }}
229+
uses: actions/upload-artifact@v4
230+
with:
231+
name: torch_cuda_big_gpu_test_reports
232+
path: reports
233+
- name: Generate Report and Notify Channel
234+
if: always()
235+
run: |
236+
pip install slack_sdk tabulate
237+
python utils/log_reports.py >> $GITHUB_STEP_SUMMARY
238+
183239
run_flax_tpu_tests:
184240
name: Nightly Flax TPU Tests
185241
runs-on: docker-tpu

.github/workflows/pr_test_peft_backend.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,14 @@ jobs:
9292
run: |
9393
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
9494
python -m uv pip install -e [quality,test]
95+
# TODO (sayakpaul, DN6): revisit `--no-deps`
9596
if [ "${{ matrix.lib-versions }}" == "main" ]; then
96-
python -m pip install -U peft@git+https://github.com/huggingface/peft.git
97-
python -m uv pip install -U transformers@git+https://github.com/huggingface/transformers.git
98-
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
97+
python -m pip install -U peft@git+https://github.com/huggingface/peft.git --no-deps
98+
python -m uv pip install -U transformers@git+https://github.com/huggingface/transformers.git --no-deps
99+
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git --no-deps
99100
else
100-
python -m uv pip install -U peft transformers accelerate
101+
python -m uv pip install -U peft --no-deps
102+
python -m uv pip install -U transformers accelerate --no-deps
101103
fi
102104
103105
- name: Environment

.github/workflows/push_tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
- name: Environment
8282
run: |
8383
python utils/print_env.py
84-
- name: Slow PyTorch CUDA checkpoint tests on Ubuntu
84+
- name: PyTorch CUDA checkpoint tests on Ubuntu
8585
env:
8686
HF_TOKEN: ${{ secrets.HF_TOKEN }}
8787
# https://pytorch.org/docs/stable/notes/randomness.html#avoiding-nondeterministic-algorithms
@@ -184,7 +184,7 @@ jobs:
184184
run: |
185185
python utils/print_env.py
186186
187-
- name: Run slow Flax TPU tests
187+
- name: Run Flax TPU tests
188188
env:
189189
HF_TOKEN: ${{ secrets.HF_TOKEN }}
190190
run: |
@@ -232,7 +232,7 @@ jobs:
232232
run: |
233233
python utils/print_env.py
234234
235-
- name: Run slow ONNXRuntime CUDA tests
235+
- name: Run ONNXRuntime CUDA tests
236236
env:
237237
HF_TOKEN: ${{ secrets.HF_TOKEN }}
238238
run: |

.github/workflows/ssh-runner.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ on:
44
workflow_dispatch:
55
inputs:
66
runner_type:
7-
description: 'Type of runner to test (aws-g6-4xlarge-plus: a10 or aws-g4dn-2xlarge: t4)'
7+
description: 'Type of runner to test (aws-g6-4xlarge-plus: a10, aws-g4dn-2xlarge: t4, aws-g6e-xlarge-plus: L40)'
88
type: choice
99
required: true
1010
options:
1111
- aws-g6-4xlarge-plus
1212
- aws-g4dn-2xlarge
13+
- aws-g6e-xlarge-plus
1314
docker_image:
1415
description: 'Name of the Docker image'
1516
required: true

docker/diffusers-onnxruntime-cuda/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ENV PATH="/opt/venv/bin:$PATH"
2828
# pre-install the heavy dependencies (these can later be overridden by the deps from setup.py)
2929
RUN python3.10 -m pip install --no-cache-dir --upgrade pip uv==0.1.11 && \
3030
python3.10 -m uv pip install --no-cache-dir \
31-
torch \
31+
"torch<2.5.0" \
3232
torchvision \
3333
torchaudio \
3434
"onnxruntime-gpu>=1.13.1" \

docker/diffusers-pytorch-compile-cuda/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ENV PATH="/opt/venv/bin:$PATH"
2929
# pre-install the heavy dependencies (these can later be overridden by the deps from setup.py)
3030
RUN python3.10 -m pip install --no-cache-dir --upgrade pip uv==0.1.11 && \
3131
python3.10 -m uv pip install --no-cache-dir \
32-
torch \
32+
"torch<2.5.0" \
3333
torchvision \
3434
torchaudio \
3535
invisible_watermark && \

docker/diffusers-pytorch-cpu/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ENV PATH="/opt/venv/bin:$PATH"
2929
# pre-install the heavy dependencies (these can later be overridden by the deps from setup.py)
3030
RUN python3.10 -m pip install --no-cache-dir --upgrade pip uv==0.1.11 && \
3131
python3.10 -m uv pip install --no-cache-dir \
32-
torch \
32+
"torch<2.5.0" \
3333
torchvision \
3434
torchaudio \
3535
invisible_watermark \

docker/diffusers-pytorch-cuda/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ENV PATH="/opt/venv/bin:$PATH"
2929
# pre-install the heavy dependencies (these can later be overridden by the deps from setup.py)
3030
RUN python3.10 -m pip install --no-cache-dir --upgrade pip uv==0.1.11 && \
3131
python3.10 -m uv pip install --no-cache-dir \
32-
torch \
32+
"torch<2.5.0" \
3333
torchvision \
3434
torchaudio \
3535
invisible_watermark && \

docker/diffusers-pytorch-xformers-cuda/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ENV PATH="/opt/venv/bin:$PATH"
2929
# pre-install the heavy dependencies (these can later be overridden by the deps from setup.py)
3030
RUN python3.10 -m pip install --no-cache-dir --upgrade pip uv==0.1.11 && \
3131
python3.10 -m pip install --no-cache-dir \
32-
torch \
32+
"torch<2.5.0" \
3333
torchvision \
3434
torchaudio \
3535
invisible_watermark && \

docs/source/en/_toctree.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,12 @@
150150
title: Reinforcement learning training with DDPO
151151
title: Methods
152152
title: Training
153+
- sections:
154+
- local: quantization/overview
155+
title: Getting Started
156+
- local: quantization/bitsandbytes
157+
title: bitsandbytes
158+
title: Quantization Methods
153159
- sections:
154160
- local: optimization/fp16
155161
title: Speed up inference
@@ -182,6 +188,8 @@
182188
title: Metal Performance Shaders (MPS)
183189
- local: optimization/habana
184190
title: Habana Gaudi
191+
- local: optimization/neuron
192+
title: AWS Neuron
185193
title: Optimized hardware
186194
title: Accelerate inference and reduce memory
187195
- sections:
@@ -209,6 +217,8 @@
209217
title: Logging
210218
- local: api/outputs
211219
title: Outputs
220+
- local: api/quantization
221+
title: Quantization
212222
title: Main Classes
213223
- isExpanded: false
214224
sections:
@@ -242,6 +252,8 @@
242252
title: SparseControlNetModel
243253
title: ControlNets
244254
- sections:
255+
- local: api/models/allegro_transformer3d
256+
title: AllegroTransformer3DModel
245257
- local: api/models/aura_flow_transformer2d
246258
title: AuraFlowTransformer2DModel
247259
- local: api/models/cogvideox_transformer3d
@@ -258,6 +270,8 @@
258270
title: LatteTransformer3DModel
259271
- local: api/models/lumina_nextdit2d
260272
title: LuminaNextDiT2DModel
273+
- local: api/models/mochi_transformer3d
274+
title: MochiTransformer3DModel
261275
- local: api/models/pixart_transformer2d
262276
title: PixArtTransformer2DModel
263277
- local: api/models/prior_transformer
@@ -290,8 +304,12 @@
290304
- sections:
291305
- local: api/models/autoencoderkl
292306
title: AutoencoderKL
307+
- local: api/models/autoencoderkl_allegro
308+
title: AutoencoderKLAllegro
293309
- local: api/models/autoencoderkl_cogvideox
294310
title: AutoencoderKLCogVideoX
311+
- local: api/models/autoencoderkl_mochi
312+
title: AutoencoderKLMochi
295313
- local: api/models/asymmetricautoencoderkl
296314
title: AsymmetricAutoencoderKL
297315
- local: api/models/consistency_decoder_vae
@@ -308,6 +326,8 @@
308326
sections:
309327
- local: api/pipelines/overview
310328
title: Overview
329+
- local: api/pipelines/allegro
330+
title: Allegro
311331
- local: api/pipelines/amused
312332
title: aMUSEd
313333
- local: api/pipelines/animatediff
@@ -384,6 +404,8 @@
384404
title: Lumina-T2X
385405
- local: api/pipelines/marigold
386406
title: Marigold
407+
- local: api/pipelines/mochi
408+
title: Mochi
387409
- local: api/pipelines/panorama
388410
title: MultiDiffusion
389411
- local: api/pipelines/musicldm

0 commit comments

Comments
 (0)