Merge branch 'main' into torch-main-dep

up
2025-12-07 04:54:47 +08:00 · 2025-09-12 15:46:59 +05:30 · 2025-08-26 15:26:43 +02:00 · 2025-08-26 15:24:32 +02:00 · 2025-08-26 15:15:35 +02:00 · 2025-08-26 15:10:23 +02:00
2 changed files with 4 additions and 2 deletions
--- a/setup.py
+++ b/setup.py
@@ -100,7 +100,6 @@ _deps = [
    "compel==0.1.8",
    "datasets",
    "filelock",
-    "flax>=0.4.1",
    "hf-doc-builder>=0.3.0",
    "huggingface-hub>=0.34.0",
    "requests-mock==1.10.0",
@@ -137,6 +136,7 @@ _deps = [
    "requests",
    "tensorboard",
    "tiktoken>=0.7.0",
+    "flax>=0.4.1",
    "torch>=1.4",
    "torchvision",
    "transformers>=4.41.2",
@@ -252,6 +252,7 @@ if os.name == "nt":  # windows
 else:
    extras["flax"] = deps_list("jax", "jaxlib", "flax")

+
 extras["dev"] = (
    extras["quality"] + extras["test"] + extras["training"] + extras["docs"] + extras["torch"] + extras["flax"]
 )
@@ -265,6 +266,7 @@ install_requires = [
    deps["requests"],
    deps["safetensors"],
    deps["Pillow"],
+    deps["torch"],
 ]

 version_range_max = max(sys.version_info[1], 10) + 1
--- a/src/diffusers/dependency_versions_table.py
+++ b/src/diffusers/dependency_versions_table.py
@@ -7,7 +7,6 @@ deps = {
    "compel": "compel==0.1.8",
    "datasets": "datasets",
    "filelock": "filelock",
-    "flax": "flax>=0.4.1",
    "hf-doc-builder": "hf-doc-builder>=0.3.0",
    "huggingface-hub": "huggingface-hub>=0.34.0",
    "requests-mock": "requests-mock==1.10.0",
@@ -44,6 +43,7 @@ deps = {
    "requests": "requests",
    "tensorboard": "tensorboard",
    "tiktoken": "tiktoken>=0.7.0",
+    "flax": "flax>=0.4.1",
    "torch": "torch>=1.4",
    "torchvision": "torchvision",
    "transformers": "transformers>=4.41.2",
Author	SHA1	Message	Date
Sayak Paul	70b816a3da	Merge branch 'main' into torch-main-dep	2025-09-12 15:46:59 +05:30
sayakpaul	c46cefb674	up	2025-08-26 15:26:43 +02:00
sayakpaul	e8a5666f81	up	2025-08-26 15:24:32 +02:00
sayakpaul	0ba7bd4963	add flax back.	2025-08-26 15:15:35 +02:00
sayakpaul	522e70d3b3	make torch a required dependency and remove flax/jax from setup.	2025-08-26 15:10:23 +02:00
sayakpaul	211f84e997	remove flax from setup.py	2025-08-26 15:06:01 +02:00