Skip to content

Remove CLIP and Harmonization from base install #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukasMut merged 2 commits into from
Aug 6, 2025
Merged

Remove CLIP and Harmonization from base install #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57823bd
remove CLIP and Harmonization from base install
lciernik Aug 6, 2025
c776c6a
outsource extra packages
lciernik Aug 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
15 changes: 6 additions & 9 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -29,10 +27,6 @@
"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",
]

setuptools.setup(
Expand All @@ -56,7 +50,10 @@
],
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"],
"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" ],
}
)
Loading