Skip to content

Commit cc65d0a

Browse files
authored
Merge branch 'main' into feat/autoencodermixin
2 parents 2f2b325 + 57636ad commit cc65d0a

File tree

33 files changed

+2547
-26
lines changed

33 files changed

+2547
-26
lines changed

.github/workflows/benchmark.yml

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

.github/workflows/build_docker_images.yml

Lines changed: 29 additions & 8 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

.github/workflows/nightly_tests.yml

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

.github/workflows/pr_modular_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ concurrency:
2626

2727
env:
2828
DIFFUSERS_IS_CI: yes
29-
HF_HUB_ENABLE_HF_TRANSFER: 1
29+
HF_XET_HIGH_PERFORMANCE: 1
3030
OMP_NUM_THREADS: 4
3131
MKL_NUM_THREADS: 4
3232
PYTEST_TIMEOUT: 60

.github/workflows/pr_tests.yml

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

2323
env:
2424
DIFFUSERS_IS_CI: yes
25-
HF_HUB_ENABLE_HF_TRANSFER: 1
25+
HF_XET_HIGH_PERFORMANCE: 1
2626
OMP_NUM_THREADS: 4
2727
MKL_NUM_THREADS: 4
2828
PYTEST_TIMEOUT: 60

.github/workflows/pr_tests_gpu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ env:
2424
DIFFUSERS_IS_CI: yes
2525
OMP_NUM_THREADS: 8
2626
MKL_NUM_THREADS: 8
27-
HF_HUB_ENABLE_HF_TRANSFER: 1
27+
HF_XET_HIGH_PERFORMANCE: 1
2828
PYTEST_TIMEOUT: 600
2929
PIPELINE_USAGE_CUTOFF: 1000000000 # set high cutoff so that only always-test pipelines run
3030

.github/workflows/push_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +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
17+
HF_XET_HIGH_PERFORMANCE: 1
1818
PYTEST_TIMEOUT: 600
1919
PIPELINE_USAGE_CUTOFF: 50000
2020

.github/workflows/push_tests_fast.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +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
21+
HF_XET_HIGH_PERFORMANCE: 1
2222
PYTEST_TIMEOUT: 600
2323
RUN_SLOW: no
2424

.github/workflows/push_tests_mps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88
HF_HOME: /mnt/cache
99
OMP_NUM_THREADS: 8
1010
MKL_NUM_THREADS: 8
11-
HF_HUB_ENABLE_HF_TRANSFER: 1
11+
HF_XET_HIGH_PERFORMANCE: 1
1212
PYTEST_TIMEOUT: 600
1313
RUN_SLOW: no
1414

docker/diffusers-doc-builder/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ RUN uv pip install --no-cache-dir "git+https://github.com/huggingface/diffusers.
3333
RUN uv pip install --no-cache-dir \
3434
accelerate \
3535
numpy==1.26.4 \
36-
hf_transfer \
36+
hf_xet \
3737
setuptools==69.5.1 \
3838
bitsandbytes \
3939
torchao \

0 commit comments

Comments
 (0)