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

Jump to bottom

feat: support openclip&mclip models + refactor model loader #774

Merged

numb3r3 merged 45 commits into main from refactor-model-loader

Jul 21, 2022

Contributor

shan-mx commented Jul 19, 2022

No description provided.

numb3r3 and others added 4 commits

July 20, 2022 06:34


          fix: draft commits

de85197


          feat: add openclip+mclip support

55e650b


          feat: add openclip+mclip support

b3cae09


          fix: update openclip model list

5aa2723

github-actions bot added size/l component/server labels

shan-mx and others added 6 commits

July 20, 2022 06:45


          fix: import error

613e4d5


          fix: import error

286f58f


          fix: import error

9d20385


          fix: remove executor clip_oc

5ae85cc


          fix: recovered procs in helper for older version onnx&trt executors

266648f


          fix: recovered procs in helper

67cde9b

for older version onnx&trt executors

codecov bot commented Jul 19, 2022 •

edited

Loading

Codecov Report

Merging #774 (4839d19) into main (2b78b12) will increase coverage by 4.52%.
The diff coverage is 86.76%.

@@            Coverage Diff             @@
##             main     #774      +/-   ##
==========================================
+ Coverage   82.09%   86.61%   +4.52%     
==========================================
  Files          17       21       +4     
  Lines        1240     1106     -134     
==========================================
- Hits         1018      958      -60     
+ Misses        222      148      -74

Flag	Coverage Δ
cas	`86.61% <86.76%> (+4.52%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
server/clip_server/executors/helper.py	`97.05% <60.00%> (-2.95%)`	⬇️
server/clip_server/model/mclip_model.py	`83.33% <83.33%> (ø)`
server/clip_server/model/clip_model.py	`84.21% <84.21%> (ø)`
server/clip_server/model/pretrained_models.py	`85.71% <85.71%> (ø)`
server/clip_server/model/tokenization.py	`87.87% <87.87%> (ø)`
server/clip_server/model/openclip_model.py	`89.28% <89.28%> (ø)`
server/clip_server/executors/clip_onnx.py	`85.93% <100.00%> (+0.45%)`	⬆️
server/clip_server/executors/clip_tensorrt.py	`100.00% <100.00%> (ø)`
server/clip_server/executors/clip_torch.py	`87.93% <100.00%> (+0.89%)`	⬆️
server/clip_server/model/clip.py	`93.42% <100.00%> (+3.61%)`	⬆️
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ca03dca...4839d19. Read the comment docs.

shan-mx added 5 commits

July 20, 2022 07:36


          fix: add openclip requirement

8d1bd76


          fix: recover helper.py

dc9e97d


          fix: add openclip requirement

a2db88e


          fix: add openclip requirement

afb23ca


          fix: recover helper.py

ecaf7cd

numb3r3 requested changes

View reviewed changes

Member

numb3r3 left a comment

Bassically, the clip_model.py is good. However, I just feel the preprocessor.py is an over-kill. I want to simplify this part in a new branch, and merge into this PR later.

server/clip_server/executors/clip_torch.py Outdated Show resolved Hide resolved

server/clip_server/executors/clip_torch.py Outdated Show resolved Hide resolved

server/clip_server/executors/clip_torch.py Outdated Show resolved Hide resolved

server/clip_server/model/clip_model.py Outdated Show resolved Hide resolved

server/clip_server/model/mclip_model.py Outdated Show resolved Hide resolved

server/clip_server/model/mclip_model.py Outdated Show resolved Hide resolved

server/clip_server/model/mclip_model.py Show resolved Hide resolved

server/clip_server/model/mclip_model.py Outdated Show resolved Hide resolved

numb3r3 and others added 2 commits

July 20, 2022 16:42


          fix: refactor preprocessor (#776)

ff11161

* fix: refactor preprocessor

* fix: error

* fix: missing functions


          fix: revert commit

8ce9f6b

github-actions bot added size/m and removed size/l labels

numb3r3 reviewed

View reviewed changes

server/clip_server/executors/clip_torch.py Outdated Show resolved Hide resolved

numb3r3 and others added 6 commits

July 20, 2022 17:01


          fix: tests

7d623ae


          fix: simple tokenizer

eec5a4e


          fix: clip model mixin

c055cf3


          feat: support customized download

02c20ea


          Merge branch 'refactor-model-loader' of https://github.com/jina-ai/cl…

8dcf536

…ip-as-service into refactor-model-loader


          feat: support customized download

d8e93f5

shan-mx and others added 7 commits

July 20, 2022 18:39


          Merge branch 'refactor-model-loader' of https://github.com/jina-ai/cl…

1001f13

…ip-as-service into refactor-model-loader


          fix: update open ai model loading

d727755


          fix: clean codes

03cb6be


          fix: clean codes

457732a


          fix: open clip base model name

78a6685


          fix: minor revision

f7cfddf


          fix: clean unused codes

af65b88

github-actions bot added size/xl and removed size/l labels

github-actions bot commented Jul 20, 2022

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.


          fix: mclip image size

bda3a5f

github-actions bot commented Jul 20, 2022

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.


          fix: mclip tokenizer error

5f4ecfd

github-actions bot commented Jul 21, 2022

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.


          fix: set padding

ce5cec7

github-actions bot commented Jul 21, 2022

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.


          fix: set truncation

86b509f

github-actions bot commented Jul 21, 2022

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.


          fix: update tokenizer api

508c931

github-actions bot commented Jul 21, 2022

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.


          fix: add unittest

bc8ce94

github-actions bot commented Jul 21, 2022

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

github-actions bot added the area/testing label


          fix: update license

031bd45

github-actions bot commented Jul 21, 2022

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.


          fix: unittest

4839d19

github-actions bot commented Jul 21, 2022

This PR exceeds the recommended size of 1000 lines. Please make sure you are NOT addressing multiple issues with one PR. Note this PR might be rejected due to its size.

Member

ZiniuYu commented Jul 21, 2022

86.61 wow new record

numb3r3 merged commit fa62d8e into main

numb3r3 deleted the refactor-model-loader branch

July 21, 2022 09:30

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/testing component/server size/xl