-
Notifications
You must be signed in to change notification settings - Fork 183
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.
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
Danyil/feature/use marqo commons #607
Closed
Closed
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
9f7ab38
make use of marqo-commons
danyilq 4205c0d
uncomment
danyilq 06da0cd
use marqo-commons settings validation
danyilq 07ba4a9
refactor
danyilq 84b0806
reformat test validation
danyilq 6dc8cbb
resolve comments
danyilq 57fdc3f
new test and delete useless function
danyilq 697574e
replace model_size with memory_size
danyilq 863a9bd
fix conflicts with mainline
vicilliar 19a11b5
add marqo commons to requirements.txt
vicilliar 1a57491
Update test_encoding.py
danyilq a866a7c
add index_model_dimensions back to validate_dict
vicilliar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
from marqo.s2_inference.hf_utils import HF_MODEL | ||
from marqo.s2_inference.sbert_onnx_utils import SBERT_ONNX | ||
from marqo.s2_inference.sbert_utils import SBERT, TEST | ||
from marqo.s2_inference.random_utils import Random | ||
from marqo.s2_inference.clip_utils import CLIP, OPEN_CLIP, MULTILINGUAL_CLIP, FP16_CLIP, get_multilingual_clip_properties | ||
from marqo.s2_inference.types import Any, Dict, List, Optional, Union, FloatTensor | ||
from marqo.s2_inference.onnx_clip_utils import CLIP_ONNX | ||
|
||
# we need to keep track of the embed dim and model load functions/classes | ||
# we can use this as a registry | ||
|
||
def get_model_loaders() -> Dict: | ||
return {'clip': CLIP, | ||
'open_clip': OPEN_CLIP, | ||
'sbert': SBERT, | ||
'test': TEST, | ||
'sbert_onnx': SBERT_ONNX, | ||
'clip_onnx': CLIP_ONNX, | ||
"multilingual_clip": MULTILINGUAL_CLIP, | ||
"fp16_clip": FP16_CLIP, | ||
'random': Random, | ||
'hf': HF_MODEL} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this not declared at the top of the file?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
due to a circular import issue, we'd have to resolve it. maybe onnx clip object can work without that function but it needs deeper investigation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@pandu-k Do you have any input on resolving this circular import? Declaring it in this init function works but it feels a bit hacky. The issue is that
onnx_clip_utils
here callss2_inference
, which imports frommodel_loaders
, which imports fromonnx_clip_utils
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This strange situation is an indication that our package structure isn't ideal. Good pick up @vicilliar!
I think the best way is for the model_registry is purely for static data (a.k.a the model properties).
We can then create a new file that has
_get_model_load_mappings()
andload_model_properties()
. Would that solve this?