Skip to content
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

fix: change onnx and trt default model name to ViT-B-32::openai #793

Merged
merged 4 commits into from
Aug 3, 2022
Merged

fix: change onnx and trt default model name to ViT-B-32::openai #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2b05a2
fix: change onnx default model name to ViT-B-32::openai
ZiniuYu Aug 3, 2022
d4f6155
fix: trt default model name
ZiniuYu Aug 3, 2022
2c8629d
fix: update trt model list
ZiniuYu Aug 3, 2022
d8162d2
fix: trt file path
ZiniuYu Aug 3, 2022
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 server/clip_server/executors/clip_onnx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
class CLIPEncoder(Executor):
def __init__(
self,
name: str = 'ViT-B/32',
name: str = 'ViT-B-32::openai',
device: Optional[str] = None,
num_worker_preprocess: int = 4,
minibatch_size: int = 32,
Expand Down
2 changes: 1 addition & 1 deletion server/clip_server/executors/clip_tensorrt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
class CLIPEncoder(Executor):
def __init__(
self,
name: str = 'ViT-B/32',
name: str = 'ViT-B-32::openai',
device: str = 'cuda',
num_worker_preprocess: int = 4,
minibatch_size: int = 32,
Expand Down
2 changes: 1 addition & 1 deletion server/clip_server/model/clip_onnx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def __init__(self, name: str, model_path: str = None):
if name in _MODELS:
if not model_path:
cache_dir = os.path.expanduser(
f'~/.cache/clip/{name.replace("/", "-")}'
f'~/.cache/clip/{name.replace("/", "-").replace("::", "-")}'
)
textual_model_name, textual_model_md5 = _MODELS[name][0]
self._textual_path = download_model(
Expand Down
18 changes: 17 additions & 1 deletion server/clip_server/model/clip_trt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,20 @@
from clip_server.model.clip_onnx import _MODELS as ONNX_MODELS

_MODELS = [
'RN50::openai',
'RN50::yfcc15m',
'RN50::cc12m',
'RN101::openai',
'RN101::yfcc15m',
'RN50x4::openai',
'ViT-B-32::openai',
'ViT-B-32::laion2b_e16',
'ViT-B-32::laion400m_e31',
'ViT-B-32::laion400m_e32',
'ViT-B-16::openai',
'ViT-B-16::laion400m_e31',
'ViT-B-16::laion400m_e32',
# older version name format
'RN50',
'RN101',
'RN50x4',
Expand All @@ -41,7 +55,9 @@ def __init__(
super().__init__(name)

if name in _MODELS:
cache_dir = os.path.expanduser(f'~/.cache/clip/{name.replace("/", "-")}')
cache_dir = os.path.expanduser(
f'~/.cache/clip/{name.replace("/", "-").replace("::", "-")}'
)

self._textual_path = os.path.join(
cache_dir,
Expand Down
4 changes: 3 additions & 1 deletion tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ def make_flow(port_generator, request):
f = Flow(port=port_generator()).add(
name=request.param,
uses=CLIPEncoder,
uses_with={'model_path': os.path.expanduser('~/.cache/clip/ViT-B-32')},
uses_with={
'model_path': os.path.expanduser('~/.cache/clip/ViT-B-32-openai')
},
)
with f:
yield f
Expand Down