From 57823bdbbfaddecbc68f99952518be50b41a009f Mon Sep 17 00:00:00 2001
From: Laure Ciernik <64899273+lciernik@users.noreply.github.com>
Date: Wed, 6 Aug 2025 14:59:50 +0200
Subject: [PATCH 1/2] remove CLIP and Harmonization from base install

---
 README.md        |  2 +-
 requirements.txt |  2 +-
 setup.py         | 14 ++++++--------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index bc13c8f..b9d71e0 100644
--- a/README.md
+++ b/README.md
@@ -104,7 +104,7 @@ $ conda activate thingsvision
 ```
 Then, activate the environment and simply install `thingsvision` via running the following `pip` command in your terminal.
 ```bash
-$ pip install --upgrade thingsvision
+$ pip install --upgrade thingsvision[full]
 ```
 
 The package automatically installs the [Harmonization](https://github.com/serre-lab/harmonization) and [DreamSim](https://github.com/ssundaram21/dreamsim) repositories. See the documentation for available [harmonized models](https://vicco-group.github.io/thingsvision/AvailableModels.html#harmonization) and [DreamSim models](https://vicco-group.github.io/thingsvision/AvailableModels.html#dreamsim) in `thingsvision`.
diff --git a/requirements.txt b/requirements.txt
index 46d2c66..709a05c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,9 +17,9 @@ torch>=2.0.0
 torchvision==0.15.2
 torchtyping
 tqdm
+transformers==4.40.1
 pytest
 git+https://github.com/openai/CLIP.git
 dreamsim==0.1.3
 vit-keras==0.1.2
 git+https://github.com/serre-lab/Harmonization.git
-transformers==4.40.1
diff --git a/setup.py b/setup.py
index 62c94a6..d622046 100644
--- a/setup.py
+++ b/setup.py
@@ -19,8 +19,6 @@
     "scikit-image",
     "scikit-learn",
     "scipy",
-    # "tensorflow==2.9.* ; sys_platform != 'darwin' or platform_machine != 'arm64'",
-    # "tensorflow-macos==2.9.* ; sys_platform == 'darwin' and platform_machine == 'arm64'",
     "tensorflow<2.16",
     "timm",
     "torch>=2.0.0",
@@ -29,10 +27,8 @@
     "tqdm",
     "transformers==4.40.1",
     "pytest",
-    "CLIP @ git+https://github.com/openai/CLIP.git",
     "dreamsim==0.1.3",
-    "Harmonization @ git+https://github.com/serre-lab/Harmonization.git",
-    "vit-keras==0.1.2",
+    "keras-cv-attention-models>=1.3.5",
     ]
 
 setuptools.setup(
@@ -56,7 +52,9 @@
     ],
     entry_points={"console_scripts": ["thingsvision = thingsvision.thingsvision:main"]},
     python_requires=">=3.10",
-    dependency_links=[
-        "git+https://github.com/openai/CLIP.git",
-    ],
+    extras_require={
+        "clip": ["CLIP @ git+https://github.com/openai/CLIP.git"],
+        "harmonization": ["vit-keras==0.1.2","Harmonization @ git+https://github.com/serre-lab/Harmonization.git"],
+        "full":["CLIP @ git+https://github.com/openai/CLIP.git", "vit-keras==0.1.2","Harmonization @ git+https://github.com/serre-lab/Harmonization.git" ],
+    }
 )

From c776c6a883c7a231ba358db0f83b15f934fe1b1b Mon Sep 17 00:00:00 2001
From: Laure Ciernik <64899273+lciernik@users.noreply.github.com>
Date: Wed, 6 Aug 2025 15:42:55 +0200
Subject: [PATCH 2/2] outsource extra packages

---
 setup.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index d622046..075bc37 100644
--- a/setup.py
+++ b/setup.py
@@ -27,8 +27,6 @@
     "tqdm",
     "transformers==4.40.1",
     "pytest",
-    "dreamsim==0.1.3",
-    "keras-cv-attention-models>=1.3.5",
     ]
 
 setuptools.setup(
@@ -54,7 +52,8 @@
     python_requires=">=3.10",
     extras_require={
         "clip": ["CLIP @ git+https://github.com/openai/CLIP.git"],
-        "harmonization": ["vit-keras==0.1.2","Harmonization @ git+https://github.com/serre-lab/Harmonization.git"],
-        "full":["CLIP @ git+https://github.com/openai/CLIP.git", "vit-keras==0.1.2","Harmonization @ git+https://github.com/serre-lab/Harmonization.git" ],
+        "dreamsim": ["dreamsim==0.1.3"],
+        "harmonization": ["keras-cv-attention-models>=1.3.5", "vit-keras==0.1.2","Harmonization @ git+https://github.com/serre-lab/Harmonization.git"],
+        "full":["CLIP @ git+https://github.com/openai/CLIP.git", "dreamsim==0.1.3", "keras-cv-attention-models>=1.3.5", "vit-keras==0.1.2","Harmonization @ git+https://github.com/serre-lab/Harmonization.git" ],
     }
 )