From 80724a666d54e9965632f7e966fc56758da95a04 Mon Sep 17 00:00:00 2001 From: Laure Ciernik <64899273+lciernik@users.noreply.github.com> Date: Wed, 6 Aug 2025 16:28:20 +0200 Subject: [PATCH 1/2] revert to old setup where extra packages need to be installed afterwards --- README.md | 17 +++++++++++++---- requirements.txt | 4 ++-- setup.py | 8 +------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index b9d71e0..685f391 100644 --- a/README.md +++ b/README.md @@ -97,17 +97,26 @@ Neural networks come from different sources. With `thingsvision`, you can extrac ### :computer: Setting up your environment #### Working locally -First, create a new `conda environment` with Python version 3.10, 3.11, or 3.12 e.g. by using `conda`: +First, create a new `conda environment` with Python version 3.10, or 3.11 e.g. by using `conda`: ```bash $ conda create -n thingsvision python=3.10 $ 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[full] +$ pip install --upgrade thingsvision +$ pip install git+https://github.com/openai/CLIP.git ``` - -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`. +If you want to extract features for [harmonized models](https://vicco-group.github.io/thingsvision/AvailableModels.html#harmonization) from the [Harmonization repo](https://github.com/serre-lab/harmonization), you have to additionally run the following `pip` command in your `thingsvision` environment, +```bash +$ pip install "keras-cv-attention-models>=1.3.5" "vit-keras==0.1.2" +$ pip install git+https://github.com/serre-lab/Harmonization.git +``` +If you want to extract features for [DreamSim](https://dreamsim-nights.github.io/) from the [DreamSim repo](https://github.com/ssundaram21/dreamsim), you have to additionally run the following `pip` command in your `thingsvision` environment, +```bash +$ pip install dreamsim==0.1.3 +``` +See the [docs](https://vicco-group.github.io/thingsvision/AvailableModels.html#dreamsim) for which `DreamSim` models are available in `thingsvision`. #### Google Colab Alternatively, you can use Google Colab to play around with `thingsvision` by uploading your image data to Google Drive (via directory mounting). diff --git a/requirements.txt b/requirements.txt index 709a05c..3b2b1f5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ ftfy h5py -keras-cv-attention-models>=1.3.5 matplotlib numba numpy<2 @@ -20,6 +19,7 @@ tqdm transformers==4.40.1 pytest git+https://github.com/openai/CLIP.git -dreamsim==0.1.3 +keras-cv-attention-models>=1.3.5 vit-keras==0.1.2 git+https://github.com/serre-lab/Harmonization.git +dreamsim==0.1.3 diff --git a/setup.py b/setup.py index 075bc37..ff2df9e 100644 --- a/setup.py +++ b/setup.py @@ -49,11 +49,5 @@ "Operating System :: OS Independent", ], entry_points={"console_scripts": ["thingsvision = thingsvision.thingsvision:main"]}, - python_requires=">=3.10", - extras_require={ - "clip": ["CLIP @ git+https://github.com/openai/CLIP.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" ], - } + python_requires=">=3.10" ) From b8ff0258884f9f6bd1ebf0a2a8ab7527caeba631 Mon Sep 17 00:00:00 2001 From: Laure Ciernik <64899273+lciernik@users.noreply.github.com> Date: Wed, 6 Aug 2025 16:29:19 +0200 Subject: [PATCH 2/2] typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 685f391..7d137d5 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ Neural networks come from different sources. With `thingsvision`, you can extrac ### :computer: Setting up your environment #### Working locally -First, create a new `conda environment` with Python version 3.10, or 3.11 e.g. by using `conda`: +First, create a new `conda environment` with Python version 3.10, 3.11, or 3.12 e.g. by using `conda`: ```bash $ conda create -n thingsvision python=3.10 $ conda activate thingsvision