diff --git a/README.md b/README.md index ca819c7..d9df433 100644 --- a/README.md +++ b/README.md @@ -33,11 +33,11 @@ python3 -m venv ci_env Install with PIP ``` # install torch with GPU support for example: -pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu117 +pip3 install torch torchvision --extra-index-url https://download.pytorch.org/whl/cu117 -# install blip and clip-interrogator -pip install -e git+https://github.com/pharmapsychotic/BLIP.git@lib#egg=blip -pip install clip-interrogator==0.3.2 +# install clip-interrogator and blip +pip install clip-interrogator==0.3.3 +pip install git+https://github.com/pharmapsychotic/BLIP.git ``` You can then use it in your script diff --git a/clip_interrogator.ipynb b/clip_interrogator.ipynb index 545e295..17a6e46 100644 --- a/clip_interrogator.ipynb +++ b/clip_interrogator.ipynb @@ -76,10 +76,6 @@ " print(subprocess.run(['wget', url, '-P', 'cache'], stdout=subprocess.PIPE).stdout.decode('utf-8'))\n", "\n", "\n", - "import sys\n", - "sys.path.append('src/blip')\n", - "sys.path.append('clip-interrogator')\n", - "\n", "import gradio as gr\n", "from clip_interrogator import Config, Interrogator\n", "\n", diff --git a/clip_interrogator/__init__.py b/clip_interrogator/__init__.py index 057cf78..925f76a 100644 --- a/clip_interrogator/__init__.py +++ b/clip_interrogator/__init__.py @@ -1,4 +1,4 @@ from .clip_interrogator import Interrogator, Config -__version__ = '0.3.2' +__version__ = '0.3.3' __author__ = 'pharmapsychotic' \ No newline at end of file diff --git a/clip_interrogator/clip_interrogator.py b/clip_interrogator/clip_interrogator.py index 6078288..3315885 100644 --- a/clip_interrogator/clip_interrogator.py +++ b/clip_interrogator/clip_interrogator.py @@ -9,7 +9,7 @@ import time import torch from dataclasses import dataclass -from models.blip import blip_decoder, BLIP_Decoder +from blip.models.blip import blip_decoder, BLIP_Decoder from PIL import Image from torchvision import transforms from torchvision.transforms.functional import InterpolationMode diff --git a/cog.yaml b/cog.yaml index 20c411a..638f2c6 100644 --- a/cog.yaml +++ b/cog.yaml @@ -15,7 +15,6 @@ build: - "open_clip_torch==2.7.0" - "timm==0.4.12" - "pycocoevalcap==1.2" - run: - - git clone https://github.com/salesforce/BLIP /root/blip + - "git+https://github.com/pharmapsychotic/BLIP.git" predict: "predict.py:Predictor" diff --git a/predict.py b/predict.py index 3a7d0f9..abceb28 100644 --- a/predict.py +++ b/predict.py @@ -2,8 +2,6 @@ import sys from PIL import Image from cog import BasePredictor, Input, Path -sys.path.append('/root/blip') - from clip_interrogator import Interrogator, Config diff --git a/setup.py b/setup.py index 19525b5..8201892 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from setuptools import setup, find_packages setup( name="clip-interrogator", - version="0.3.2", + version="0.3.3", license='MIT', author='pharmapsychotic', author_email='me@pharmapsychotic.com',