Skip to content

Commit 63989af

Browse files
sayakpaulsayakpaul
committed
resolve conflicts.
2 parents b8b0fd1 + 6131a93 commit 63989af

File tree

1,034 files changed

+183741
-17959
lines changed

Some content is hidden

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

1,034 files changed

+183741
-17959
lines changed

‎.github/ISSUE_TEMPLATE/bug-report.yml‎

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -57,50 +57,54 @@ body:
5757
description: |
5858
Your issue will be replied to more quickly if you can figure out the right person to tag with @.
5959
If you know how to use git blame, that is the easiest way, otherwise, here is a rough guide of **who to tag**.
60-
60+
6161
All issues are read by one of the core maintainers, so if you don't know who to tag, just leave this blank and
6262
a core maintainer will ping the right person.
63-
63+
6464
Please tag a maximum of 2 people.
6565
66-
Questions on DiffusionPipeline (Saving, Loading, From pretrained, ...):
66+
Questions on DiffusionPipeline (Saving, Loading, From pretrained, ...): @sayakpaul @DN6
6767
6868
Questions on pipelines:
69-
- Stable Diffusion @yiyixuxu @DN6 @sayakpaul
70-
- Stable Diffusion XL @yiyixuxu @sayakpaul @DN6
71-
- Kandinsky @yiyixuxu
72-
- ControlNet @sayakpaul @yiyixuxu @DN6
73-
- T2I Adapter @sayakpaul @yiyixuxu @DN6
74-
- IF @DN6
75-
- Text-to-Video / Video-to-Video @DN6 @sayakpaul
76-
- Wuerstchen @DN6
69+
- Stable Diffusion @yiyixuxu @asomoza
70+
- Stable Diffusion XL @yiyixuxu @sayakpaul @DN6
71+
- Stable Diffusion 3: @yiyixuxu @sayakpaul @DN6 @asomoza
72+
- Kandinsky @yiyixuxu
73+
- ControlNet @sayakpaul @yiyixuxu @DN6
74+
- T2I Adapter @sayakpaul @yiyixuxu @DN6
75+
- IF @DN6
76+
- Text-to-Video / Video-to-Video @DN6 @a-r-r-o-w
77+
- Wuerstchen @DN6
7778
- Other: @yiyixuxu @DN6
79+
- Improving generation quality: @asomoza
7880
7981
Questions on models:
80-
- UNet @DN6 @yiyixuxu @sayakpaul
81-
- VAE @sayakpaul @DN6 @yiyixuxu
82-
- Transformers/Attention @DN6 @yiyixuxu @sayakpaul @DN6
82+
- UNet @DN6 @yiyixuxu @sayakpaul
83+
- VAE @sayakpaul @DN6 @yiyixuxu
84+
- Transformers/Attention @DN6 @yiyixuxu @sayakpaul
85+
86+
Questions on single file checkpoints: @DN6
8387
84-
Questions on Schedulers: @yiyixuxu
88+
Questions on Schedulers: @yiyixuxu
8589
86-
Questions on LoRA: @sayakpaul
90+
Questions on LoRA: @sayakpaul
8791
88-
Questions on Textual Inversion: @sayakpaul
92+
Questions on Textual Inversion: @sayakpaul
8993
90-
Questions on Training:
91-
- DreamBooth @sayakpaul
92-
- Text-to-Image Fine-tuning @sayakpaul
93-
- Textual Inversion @sayakpaul
94-
- ControlNet @sayakpaul
94+
Questions on Training:
95+
- DreamBooth @sayakpaul
96+
- Text-to-Image Fine-tuning @sayakpaul
97+
- Textual Inversion @sayakpaul
98+
- ControlNet @sayakpaul
9599
96-
Questions on Tests: @DN6 @sayakpaul @yiyixuxu
100+
Questions on Tests: @DN6 @sayakpaul @yiyixuxu
97101
98102
Questions on Documentation: @stevhliu
99103
100104
Questions on JAX- and MPS-related things: @pcuenca
101105
102-
Questions on audio pipelines: @DN6
103-
106+
Questions on audio pipelines: @sanchit-gandhi
107+
108+
104109
105-
106110
placeholder: "@Username ..."

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,18 @@ members/contributors who may be interested in your PR.
3838
3939
Core library:
4040
41-
- Schedulers: @yiyixuxu
42-
- Pipelines: @sayakpaul @yiyixuxu @DN6
43-
- Training examples: @sayakpaul
41+
- Schedulers: @yiyixuxu
42+
- Pipelines and pipeline callbacks: @yiyixuxu and @asomoza
43+
- Training examples: @sayakpaul
4444
- Docs: @stevhliu and @sayakpaul
4545
- JAX and MPS: @pcuenca
4646
- Audio: @sanchit-gandhi
4747
- General functionalities: @sayakpaul @yiyixuxu @DN6
4848
4949
Integrations:
5050
51-
- deepspeed: HF Trainer/Accelerate: @pacman100
51+
- deepspeed: HF Trainer/Accelerate: @SunMarc
52+
- PEFT: @sayakpaul @BenjaminBossan
5253
5354
HF projects:
5455

‎.github/workflows/benchmark.yml‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,24 @@ 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
1314

1415
jobs:
1516
torch_pipelines_cuda_benchmark_tests:
17+
env:
18+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL_BENCHMARK }}
1619
name: Torch Core Pipelines CUDA Benchmarking Tests
1720
strategy:
1821
fail-fast: false
1922
max-parallel: 1
20-
runs-on: [single-gpu, nvidia-gpu, a10, ci]
23+
runs-on:
24+
group: aws-g6-4xlarge-plus
2125
container:
22-
image: diffusers/diffusers-pytorch-cuda
23-
options: --shm-size "16gb" --ipc host -v /mnt/hf_cache:/mnt/cache/ --gpus 0
26+
image: diffusers/diffusers-pytorch-compile-cuda
27+
options: --shm-size "16gb" --ipc host --gpus 0
2428
steps:
2529
- name: Checkout diffusers
2630
uses: actions/checkout@v3
@@ -47,7 +51,17 @@ jobs:
4751
4852
- name: Test suite reports artifacts
4953
if: ${{ always() }}
50-
uses: actions/upload-artifact@v2
54+
uses: actions/upload-artifact@v4
5155
with:
5256
name: benchmark_test_reports
53-
path: benchmarks/benchmark_outputs
57+
path: benchmarks/benchmark_outputs
58+
59+
- name: Report success status
60+
if: ${{ success() }}
61+
run: |
62+
pip install requests && python utils/notify_benchmarking_status.py --status=success
63+
64+
- name: Report failure status
65+
if: ${{ failure() }}
66+
run: |
67+
pip install requests && python utils/notify_benchmarking_status.py --status=failure

‎.github/workflows/build_docker_images.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ env:
2020

2121
jobs:
2222
test-build-docker-images:
23-
runs-on: [ self-hosted, intel-cpu, 8-cpu, ci ]
23+
runs-on:
24+
group: aws-general-8-plus
2425
if: github.event_name == 'pull_request'
2526
steps:
2627
- name: Set up Docker Buildx
@@ -50,7 +51,8 @@ jobs:
5051
if: steps.file_changes.outputs.all != ''
5152

5253
build-and-push-docker-images:
53-
runs-on: [ self-hosted, intel-cpu, 8-cpu, ci ]
54+
runs-on:
55+
group: aws-general-8-plus
5456
if: github.event_name != 'pull_request'
5557

5658
permissions:
@@ -98,4 +100,4 @@ jobs:
98100
slack_channel: ${{ env.CI_SLACK_CHANNEL }}
99101
title: "🤗 Results of the ${{ matrix.image-name }} Docker Image build"
100102
status: ${{ job.status }}
101-
slack_token: ${{ secrets.SLACK_CIFEEDBACK_BOT_TOKEN }}
103+
slack_token: ${{ secrets.SLACK_CIFEEDBACK_BOT_TOKEN }}

‎.github/workflows/mirror_community_pipeline.yml‎

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
name: Mirror Community Pipeline
2+
3+
on:
4+
# Push changes on the main branch
5+
push:
6+
branches:
7+
- main
8+
paths:
9+
- 'examples/community/**.py'
10+
11+
# And on tag creation (e.g. `v0.28.1`)
12+
tags:
13+
- '*'
14+
15+
# Manual trigger with ref input
16+
workflow_dispatch:
17+
inputs:
18+
ref:
19+
description: "Either 'main' or a tag ref"
20+
required: true
21+
default: 'main'
22+
23+
jobs:
24+
mirror_community_pipeline:
25+
env:
26+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL_COMMUNITY_MIRROR }}
27+
28+
runs-on: ubuntu-22.04
29+
steps:
30+
# Checkout to correct ref
31+
# If workflow dispatch
32+
# If ref is 'main', set:
33+
# CHECKOUT_REF=refs/heads/main
34+
# PATH_IN_REPO=main
35+
# Else it must be a tag. Set:
36+
# CHECKOUT_REF=refs/tags/{tag}
37+
# PATH_IN_REPO={tag}
38+
# If not workflow dispatch
39+
# If ref is 'refs/heads/main' => set 'main'
40+
# Else it must be a tag => set {tag}
41+
- name: Set checkout_ref and path_in_repo
42+
run: |
43+
if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
44+
if [ -z "${{ github.event.inputs.ref }}" ]; then
45+
echo "Error: Missing ref input"
46+
exit 1
47+
elif [ "${{ github.event.inputs.ref }}" == "main" ]; then
48+
echo "CHECKOUT_REF=refs/heads/main" >> $GITHUB_ENV
49+
echo "PATH_IN_REPO=main" >> $GITHUB_ENV
50+
else
51+
echo "CHECKOUT_REF=refs/tags/${{ github.event.inputs.ref }}" >> $GITHUB_ENV
52+
echo "PATH_IN_REPO=${{ github.event.inputs.ref }}" >> $GITHUB_ENV
53+
fi
54+
elif [ "${{ github.ref }}" == "refs/heads/main" ]; then
55+
echo "CHECKOUT_REF=${{ github.ref }}" >> $GITHUB_ENV
56+
echo "PATH_IN_REPO=main" >> $GITHUB_ENV
57+
else
58+
# e.g. refs/tags/v0.28.1 -> v0.28.1
59+
echo "CHECKOUT_REF=${{ github.ref }}" >> $GITHUB_ENV
60+
echo "PATH_IN_REPO=$(echo ${{ github.ref }} | sed 's/^refs\/tags\///')" >> $GITHUB_ENV
61+
fi
62+
- name: Print env vars
63+
run: |
64+
echo "CHECKOUT_REF: ${{ env.CHECKOUT_REF }}"
65+
echo "PATH_IN_REPO: ${{ env.PATH_IN_REPO }}"
66+
- uses: actions/checkout@v3
67+
with:
68+
ref: ${{ env.CHECKOUT_REF }}
69+
70+
# Setup + install dependencies
71+
- name: Set up Python
72+
uses: actions/setup-python@v4
73+
with:
74+
python-version: "3.10"
75+
- name: Install dependencies
76+
run: |
77+
python -m pip install --upgrade pip
78+
pip install --upgrade huggingface_hub
79+
80+
# Check secret is set
81+
- name: whoami
82+
run: huggingface-cli whoami
83+
env:
84+
HF_TOKEN: ${{ secrets.HF_TOKEN_MIRROR_COMMUNITY_PIPELINES }}
85+
86+
# Push to HF! (under subfolder based on checkout ref)
87+
# https://huggingface.co/datasets/diffusers/community-pipelines-mirror
88+
- name: Mirror community pipeline to HF
89+
run: huggingface-cli upload diffusers/community-pipelines-mirror ./examples/community ${PATH_IN_REPO} --repo-type dataset
90+
env:
91+
PATH_IN_REPO: ${{ env.PATH_IN_REPO }}
92+
HF_TOKEN: ${{ secrets.HF_TOKEN_MIRROR_COMMUNITY_PIPELINES }}
93+
94+
- name: Report success status
95+
if: ${{ success() }}
96+
run: |
97+
pip install requests && python utils/notify_community_pipelines_mirror.py --status=success
98+
99+
- name: Report failure status
100+
if: ${{ failure() }}
101+
run: |
102+
pip install requests && python utils/notify_community_pipelines_mirror.py --status=failure

0 commit comments

Comments
 (0)