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

chore: bump open-clip-torch to v2.8.0 #883

Merged
merged 4 commits into from
Dec 26, 2022
Merged

chore: bump open-clip-torch to v2.8.0 #883

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
c8feced
chore: bump open-clip-torch to v2.8.0
ZiniuYu Dec 26, 2022
25719db
chore: bump open-clip-torch to v2.8.0
ZiniuYu Dec 26, 2022
29f65a9
fix: test md5
ZiniuYu Dec 26, 2022
32e4421
fix: address comments
ZiniuYu Dec 26, 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
17 changes: 14 additions & 3 deletions server/clip_server/model/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from open_clip.transformer import QuickGELU, LayerNorm, LayerNormFp32, Attention
from open_clip.timm_model import TimmModel
from open_clip.factory import _MODEL_CONFIGS
from open_clip.hf_model import PreTrainedTextEncoder
from open_clip.hf_model import HFTextEncoder
from open_clip.transformer import ResidualAttentionBlock as _ResidualAttentionBlock
from open_clip.transformer import Transformer as _Transformer
from open_clip.transformer import VisionTransformer as _VisionTransformer
Expand Down Expand Up @@ -75,11 +75,18 @@ def __init__(
self,
image_size: int,
patch_size: int,
global_average_pool: bool,
output_dim: int,
dtype: torch.dtype = torch.float32,
**kwargs,
):
super().__init__(image_size, patch_size, output_dim=output_dim, **kwargs)
super().__init__(
image_size,
patch_size,
global_average_pool=global_average_pool,
output_dim=output_dim,
**kwargs,
)
self.transformer = Transformer(dtype=dtype, **kwargs)

def forward(self, x: torch.Tensor):
Expand Down Expand Up @@ -111,6 +118,7 @@ class CLIPVisionCfg:
patch_size: int = 16
image_size: Union[Tuple[int, int], int] = 224
ls_init_value: Optional[float] = None # layer scale initial value
global_average_pool: bool = False # whether to global average pool the last embedding layer, instead of using CLS token (https://arxiv.org/abs/2205.01580)
timm_model_name: str = (
None # a valid model name overrides layers, width, patch_size
)
Expand All @@ -136,6 +144,7 @@ class CLIPTextCfg:
ls_init_value: Optional[float] = None # layer scale initial value
hf_model_name: str = None
hf_tokenizer_name: str = None
hf_model_pretrained: bool = True
proj: str = 'mlp'
pooler_type: str = 'mean_pooler'

Expand Down Expand Up @@ -189,6 +198,7 @@ def _build_vision_tower(
heads=vision_heads,
mlp_ratio=vision_cfg.mlp_ratio,
ls_init_value=vision_cfg.ls_init_value,
global_average_pool=vision_cfg.global_average_pool,
output_dim=embed_dim,
act_layer=act_layer,
norm_layer=norm_layer,
Expand All @@ -208,11 +218,12 @@ def _build_text_tower(
text_cfg = CLIPTextCfg(**text_cfg)

if text_cfg.hf_model_name:
text = PreTrainedTextEncoder(
text = HFTextEncoder(
text_cfg.hf_model_name,
output_dim=embed_dim,
proj=text_cfg.proj,
pooler_type=text_cfg.pooler_type,
pretrained=text_cfg.hf_model_pretrained,
)
else:
act_layer = QuickGELU if quick_gelu else nn.GELU
Expand Down
2 changes: 1 addition & 1 deletion server/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
'torchvision<=0.13.0' if sys.version_info <= (3, 7, 2) else 'torchvision',
'jina>=3.12.0',
'prometheus-client',
'open_clip_torch>=2.7.0',
'open_clip_torch>=2.8.0',
],
extras_require={
'onnx': [
Expand Down
6 changes: 3 additions & 3 deletions tests/test_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def test_server_download(tmpdir):
download_model(
url='https://docarray.jina.ai/_static/favicon.png',
target_folder=tmpdir,
md5sum='a084999188f4290e2654aec43207ff2e',
md5sum='66ea4817d73514888dcf6c7d2b00016d',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there any method we can auto-calculate the md5 in order not to block by this image chaning?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clip-as-service/server/clip_server/model/pretrained_models.py

Line 124 in 0b293ec

def md5file(filename: str):

with_resume=False,
)
target_path = os.path.join(tmpdir, 'favicon.png')
Expand All @@ -29,14 +29,14 @@ def test_server_download(tmpdir):
download_model(
url='https://docarray.jina.ai/_static/favicon.png',
target_folder=tmpdir,
md5sum='a084999188f4290e2654aec43207ff2e',
md5sum='66ea4817d73514888dcf6c7d2b00016d',
with_resume=True,
)
assert os.path.getsize(target_path) == file_size
assert not os.path.exists(part_path)


@pytest.mark.parametrize('md5', ['ABC', None, 'a084999188f4290e2654aec43207ff2e'])
@pytest.mark.parametrize('md5', ['ABC', None, '66ea4817d73514888dcf6c7d2b00016d'])
def test_server_download_md5(tmpdir, md5):
if md5 != 'ABC':
download_model(
Expand Down