From 1ec6cd9d4562c9a70cd3dd008d7ca244cd911552 Mon Sep 17 00:00:00 2001 From: pharmapsychotic Date: Wed, 4 Jan 2023 12:39:45 -0600 Subject: [PATCH 1/3] Update to nicer BLIP packaging --- README.md | 3 +-- clip_interrogator.ipynb | 2 +- clip_interrogator/__init__.py | 2 +- clip_interrogator/clip_interrogator.py | 2 +- cog.yaml | 3 +-- predict.py | 2 -- requirements.txt | 3 ++- setup.py | 2 +- 8 files changed, 8 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index ca819c7..9f4e0c0 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,7 @@ Install with PIP # install torch with GPU support for example: pip3 install torch torchvision torchaudio --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 +# install clip-interrogator pip install clip-interrogator==0.3.2 ``` diff --git a/clip_interrogator.ipynb b/clip_interrogator.ipynb index 167a1c1..9c702b2 100644 --- a/clip_interrogator.ipynb +++ b/clip_interrogator.ipynb @@ -55,7 +55,7 @@ " install_cmds = [\n", " ['pip', 'install', 'gradio'],\n", " ['pip', 'install', 'open_clip_torch'],\n", - " ['pip', 'install', '-e', 'git+https://github.com/pharmapsychotic/BLIP.git@lib#egg=blip'],\n", + " ['pip', 'install', 'git+https://github.com/pharmapsychotic/BLIP.git'],\n", " ['git', 'clone', 'https://github.com/pharmapsychotic/clip-interrogator.git']\n", " ]\n", " for cmd in install_cmds:\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 a978e43..f3f3d6c 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/requirements.txt b/requirements.txt index 735e90b..73b7fea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,5 @@ torchvision Pillow requests tqdm -open_clip_torch \ No newline at end of file +open_clip_torch +git+https://github.com/pharmapsychotic/BLIP.git \ No newline at end of file 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', From 02576df0cee1ef172d52fd341afc91741381e62f Mon Sep 17 00:00:00 2001 From: pharmapsychotic Date: Wed, 4 Jan 2023 12:41:06 -0600 Subject: [PATCH 2/3] . --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9f4e0c0..d2eaf3a 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Install with PIP pip3 install torch torchvision torchaudio --extra-index-url https://download.pytorch.org/whl/cu117 # install clip-interrogator -pip install clip-interrogator==0.3.2 +pip install clip-interrogator==0.3.3 ``` You can then use it in your script From a8ecf52a387090d6636adbdfb35770fe927e7eec Mon Sep 17 00:00:00 2001 From: pharmapsychotic Date: Wed, 4 Jan 2023 13:03:14 -0600 Subject: [PATCH 3/3] . --- README.md | 5 +++-- clip_interrogator.ipynb | 8 ++------ requirements.txt | 3 +-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index d2eaf3a..d9df433 100644 --- a/README.md +++ b/README.md @@ -33,10 +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 clip-interrogator +# 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 9c702b2..99bf7fe 100644 --- a/clip_interrogator.ipynb +++ b/clip_interrogator.ipynb @@ -55,8 +55,8 @@ " install_cmds = [\n", " ['pip', 'install', 'gradio'],\n", " ['pip', 'install', 'open_clip_torch'],\n", + " ['pip', 'install', 'clip-interrogator'],\n", " ['pip', 'install', 'git+https://github.com/pharmapsychotic/BLIP.git'],\n", - " ['git', 'clone', 'https://github.com/pharmapsychotic/clip-interrogator.git']\n", " ]\n", " for cmd in install_cmds:\n", " print(subprocess.run(cmd, stdout=subprocess.PIPE).stdout.decode('utf-8'))\n", @@ -86,10 +86,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", @@ -279,7 +275,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.7.15" + "version": "3.7.15 (default, Nov 24 2022, 18:44:54) [MSC v.1916 64 bit (AMD64)]" }, "orig_nbformat": 4, "vscode": { diff --git a/requirements.txt b/requirements.txt index 73b7fea..735e90b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,4 @@ torchvision Pillow requests tqdm -open_clip_torch -git+https://github.com/pharmapsychotic/BLIP.git \ No newline at end of file +open_clip_torch \ No newline at end of file