Skip to content

Commit e522f66

Browse files
AstraliteHeartAstraliteHeart
authored
Merge branch 'main' into auraflow-gguf
2 parents d9b7fa9 + 03bcf5a commit e522f66

File tree

47 files changed

+247
-79
lines changed

Some content is hidden

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

47 files changed

+247
-79
lines changed

‎.github/workflows/build_docker_images.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
id: file_changes
3535
uses: jitterbit/get-changed-files@v1
3636
with:
37-
format: 'space-delimited'
37+
format: "space-delimited"
3838
token: ${{ secrets.GITHUB_TOKEN }}
3939

4040
- name: Build Changed Docker Images
@@ -67,6 +67,7 @@ jobs:
6767
- diffusers-pytorch-cuda
6868
- diffusers-pytorch-compile-cuda
6969
- diffusers-pytorch-xformers-cuda
70+
- diffusers-pytorch-minimum-cuda
7071
- diffusers-flax-cpu
7172
- diffusers-flax-tpu
7273
- diffusers-onnxruntime-cpu

‎.github/workflows/nightly_tests.yml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,64 @@ jobs:
235235
run: |
236236
pip install slack_sdk tabulate
237237
python utils/log_reports.py >> $GITHUB_STEP_SUMMARY
238+
239+
torch_minimum_version_cuda_tests:
240+
name: Torch Minimum Version CUDA Tests
241+
runs-on:
242+
group: aws-g4dn-2xlarge
243+
container:
244+
image: diffusers/diffusers-pytorch-minimum-cuda
245+
options: --shm-size "16gb" --ipc host --gpus 0
246+
defaults:
247+
run:
248+
shell: bash
249+
steps:
250+
- name: Checkout diffusers
251+
uses: actions/checkout@v3
252+
with:
253+
fetch-depth: 2
254+
255+
- name: Install dependencies
256+
run: |
257+
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
258+
python -m uv pip install -e [quality,test]
259+
python -m uv pip install peft@git+https://github.com/huggingface/peft.git
260+
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
238261
262+
- name: Environment
263+
run: |
264+
python utils/print_env.py
265+
266+
- name: Run PyTorch CUDA tests
267+
env:
268+
HF_TOKEN: ${{ secrets.HF_TOKEN }}
269+
# https://pytorch.org/docs/stable/notes/randomness.html#avoiding-nondeterministic-algorithms
270+
CUBLAS_WORKSPACE_CONFIG: :16:8
271+
run: |
272+
python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile \
273+
-s -v -k "not Flax and not Onnx" \
274+
--make-reports=tests_torch_minimum_version_cuda \
275+
tests/models/test_modelling_common.py \
276+
tests/pipelines/test_pipelines_common.py \
277+
tests/pipelines/test_pipeline_utils.py \
278+
tests/pipelines/test_pipelines.py \
279+
tests/pipelines/test_pipelines_auto.py \
280+
tests/schedulers/test_schedulers.py \
281+
tests/others
282+
283+
- name: Failure short reports
284+
if: ${{ failure() }}
285+
run: |
286+
cat reports/tests_torch_minimum_version_cuda_stats.txt
287+
cat reports/tests_torch_minimum_version_cuda_failures_short.txt
288+
289+
- name: Test suite reports artifacts
290+
if: ${{ always() }}
291+
uses: actions/upload-artifact@v4
292+
with:
293+
name: torch_minimum_version_cuda_test_reports
294+
path: reports
295+
239296
run_flax_tpu_tests:
240297
name: Nightly Flax TPU Tests
241298
runs-on:

‎.github/workflows/release_tests_fast.yml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,63 @@ jobs:
157157
name: torch_cuda_${{ matrix.module }}_test_reports
158158
path: reports
159159

160+
torch_minimum_version_cuda_tests:
161+
name: Torch Minimum Version CUDA Tests
162+
runs-on:
163+
group: aws-g4dn-2xlarge
164+
container:
165+
image: diffusers/diffusers-pytorch-minimum-cuda
166+
options: --shm-size "16gb" --ipc host --gpus 0
167+
defaults:
168+
run:
169+
shell: bash
170+
steps:
171+
- name: Checkout diffusers
172+
uses: actions/checkout@v3
173+
with:
174+
fetch-depth: 2
175+
176+
- name: Install dependencies
177+
run: |
178+
python -m venv /opt/venv && export PATH="/opt/venv/bin:$PATH"
179+
python -m uv pip install -e [quality,test]
180+
python -m uv pip install peft@git+https://github.com/huggingface/peft.git
181+
pip uninstall accelerate -y && python -m uv pip install -U accelerate@git+https://github.com/huggingface/accelerate.git
182+
183+
- name: Environment
184+
run: |
185+
python utils/print_env.py
186+
187+
- name: Run PyTorch CUDA tests
188+
env:
189+
HF_TOKEN: ${{ secrets.HF_TOKEN }}
190+
# https://pytorch.org/docs/stable/notes/randomness.html#avoiding-nondeterministic-algorithms
191+
CUBLAS_WORKSPACE_CONFIG: :16:8
192+
run: |
193+
python -m pytest -n 1 --max-worker-restart=0 --dist=loadfile \
194+
-s -v -k "not Flax and not Onnx" \
195+
--make-reports=tests_torch_minimum_cuda \
196+
tests/models/test_modelling_common.py \
197+
tests/pipelines/test_pipelines_common.py \
198+
tests/pipelines/test_pipeline_utils.py \
199+
tests/pipelines/test_pipelines.py \
200+
tests/pipelines/test_pipelines_auto.py \
201+
tests/schedulers/test_schedulers.py \
202+
tests/others
203+
204+
- name: Failure short reports
205+
if: ${{ failure() }}
206+
run: |
207+
cat reports/tests_torch_minimum_version_cuda_stats.txt
208+
cat reports/tests_torch_minimum_version_cuda_failures_short.txt
209+
210+
- name: Test suite reports artifacts
211+
if: ${{ always() }}
212+
uses: actions/upload-artifact@v4
213+
with:
214+
name: torch_minimum_version_cuda_test_reports
215+
path: reports
216+
160217
flax_tpu_tests:
161218
name: Flax TPU Tests
162219
runs-on: docker-tpu

‎docker/diffusers-pytorch-minimum-cuda/Dockerfile‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
FROM nvidia/cuda:12.1.0-runtime-ubuntu20.04
2+
LABEL maintainer="Hugging Face"
3+
LABEL repository="diffusers"
4+
5+
ENV DEBIAN_FRONTEND=noninteractive
6+
ENV MINIMUM_SUPPORTED_TORCH_VERSION="2.1.0"
7+
ENV MINIMUM_SUPPORTED_TORCHVISION_VERSION="0.16.0"
8+
ENV MINIMUM_SUPPORTED_TORCHAUDIO_VERSION="2.1.0"
9+
10+
RUN apt-get -y update \
11+
&& apt-get install -y software-properties-common \
12+
&& add-apt-repository ppa:deadsnakes/ppa
13+
14+
RUN apt install -y bash \
15+
build-essential \
16+
git \
17+
git-lfs \
18+
curl \
19+
ca-certificates \
20+
libsndfile1-dev \
21+
libgl1 \
22+
python3.10 \
23+
python3.10-dev \
24+
python3-pip \
25+
python3.10-venv && \
26+
rm -rf /var/lib/apt/lists
27+
28+
# make sure to use venv
29+
RUN python3.10 -m venv /opt/venv
30+
ENV PATH="/opt/venv/bin:$PATH"
31+
32+
# pre-install the heavy dependencies (these can later be overridden by the deps from setup.py)
33+
RUN python3.10 -m pip install --no-cache-dir --upgrade pip uv==0.1.11 && \
34+
python3.10 -m uv pip install --no-cache-dir \
35+
torch==$MINIMUM_SUPPORTED_TORCH_VERSION \
36+
torchvision==$MINIMUM_SUPPORTED_TORCHVISION_VERSION \
37+
torchaudio==$MINIMUM_SUPPORTED_TORCHAUDIO_VERSION \
38+
invisible_watermark && \
39+
python3.10 -m pip install --no-cache-dir \
40+
accelerate \
41+
datasets \
42+
hf-doc-builder \
43+
huggingface-hub \
44+
hf_transfer \
45+
Jinja2 \
46+
librosa \
47+
numpy==1.26.4 \
48+
scipy \
49+
tensorboard \
50+
transformers \
51+
hf_transfer
52+
53+
CMD ["/bin/bash"]

‎examples/community/adaptive_mask_inpainting.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ def __init__(
372372
self.register_adaptive_mask_model()
373373
self.register_adaptive_mask_settings()
374374

375-
if hasattr(scheduler.config, "steps_offset") and scheduler.config.steps_offset != 1:
375+
if scheduler is not None and getattr(scheduler.config, "steps_offset", 1) != 1:
376376
deprecation_message = (
377377
f"The configuration file of this scheduler: {scheduler} is outdated. `steps_offset`"
378378
f" should be set to 1 instead of {scheduler.config.steps_offset}. Please make sure "
@@ -386,7 +386,7 @@ def __init__(
386386
new_config["steps_offset"] = 1
387387
scheduler._internal_dict = FrozenDict(new_config)
388388

389-
if hasattr(scheduler.config, "skip_prk_steps") and scheduler.config.skip_prk_steps is False:
389+
if scheduler is not None and getattr(scheduler.config, "skip_prk_steps", True) is False:
390390
deprecation_message = (
391391
f"The configuration file of this scheduler: {scheduler} has not set the configuration"
392392
" `skip_prk_steps`. `skip_prk_steps` should be set to True in the configuration file. Please make"

‎examples/community/composable_stable_diffusion.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def __init__(
8989
):
9090
super().__init__()
9191

92-
if hasattr(scheduler.config, "steps_offset") and scheduler.config.steps_offset != 1:
92+
if scheduler is not None and getattr(scheduler.config, "steps_offset", 1) != 1:
9393
deprecation_message = (
9494
f"The configuration file of this scheduler: {scheduler} is outdated. `steps_offset`"
9595
f" should be set to 1 instead of {scheduler.config.steps_offset}. Please make sure "
@@ -103,7 +103,7 @@ def __init__(
103103
new_config["steps_offset"] = 1
104104
scheduler._internal_dict = FrozenDict(new_config)
105105

106-
if hasattr(scheduler.config, "clip_sample") and scheduler.config.clip_sample is True:
106+
if scheduler is not None and getattr(scheduler.config, "clip_sample", False) is True:
107107
deprecation_message = (
108108
f"The configuration file of this scheduler: {scheduler} has not set the configuration `clip_sample`."
109109
" `clip_sample` should be set to False in the configuration file. Please make sure to update the"

‎examples/community/img2img_inpainting.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def __init__(
9595
):
9696
super().__init__()
9797

98-
if hasattr(scheduler.config, "steps_offset") and scheduler.config.steps_offset != 1:
98+
if scheduler is not None and getattr(scheduler.config, "steps_offset", 1) != 1:
9999
deprecation_message = (
100100
f"The configuration file of this scheduler: {scheduler} is outdated. `steps_offset`"
101101
f" should be set to 1 instead of {scheduler.config.steps_offset}. Please make sure "

‎examples/community/instaflow_one_step.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ def __init__(
109109
):
110110
super().__init__()
111111

112-
if hasattr(scheduler.config, "steps_offset") and scheduler.config.steps_offset != 1:
112+
if scheduler is not None and getattr(scheduler.config, "steps_offset", 1) != 1:
113113
deprecation_message = (
114114
f"The configuration file of this scheduler: {scheduler} is outdated. `steps_offset`"
115115
f" should be set to 1 instead of {scheduler.config.steps_offset}. Please make sure "
@@ -123,7 +123,7 @@ def __init__(
123123
new_config["steps_offset"] = 1
124124
scheduler._internal_dict = FrozenDict(new_config)
125125

126-
if hasattr(scheduler.config, "clip_sample") and scheduler.config.clip_sample is True:
126+
if scheduler is not None and getattr(scheduler.config, "clip_sample", False) is True:
127127
deprecation_message = (
128128
f"The configuration file of this scheduler: {scheduler} has not set the configuration `clip_sample`."
129129
" `clip_sample` should be set to False in the configuration file. Please make sure to update the"

‎examples/community/interpolate_stable_diffusion.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def __init__(
8686
):
8787
super().__init__()
8888

89-
if hasattr(scheduler.config, "steps_offset") and scheduler.config.steps_offset != 1:
89+
if scheduler is not None and getattr(scheduler.config, "steps_offset", 1) != 1:
9090
deprecation_message = (
9191
f"The configuration file of this scheduler: {scheduler} is outdated. `steps_offset`"
9292
f" should be set to 1 instead of {scheduler.config.steps_offset}. Please make sure "

‎examples/community/ip_adapter_face_id.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ def __init__(
191191
):
192192
super().__init__()
193193

194-
if hasattr(scheduler.config, "steps_offset") and scheduler.config.steps_offset != 1:
194+
if scheduler is not None and getattr(scheduler.config, "steps_offset", 1) != 1:
195195
deprecation_message = (
196196
f"The configuration file of this scheduler: {scheduler} is outdated. `steps_offset`"
197197
f" should be set to 1 instead of {scheduler.config.steps_offset}. Please make sure "
@@ -205,7 +205,7 @@ def __init__(
205205
new_config["steps_offset"] = 1
206206
scheduler._internal_dict = FrozenDict(new_config)
207207

208-
if hasattr(scheduler.config, "clip_sample") and scheduler.config.clip_sample is True:
208+
if scheduler is not None and getattr(scheduler.config, "clip_sample", False) is True:
209209
deprecation_message = (
210210
f"The configuration file of this scheduler: {scheduler} has not set the configuration `clip_sample`."
211211
" `clip_sample` should be set to False in the configuration file. Please make sure to update the"

0 commit comments

Comments
 (0)