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

Jump to bottom

Qi sdkk #252

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+48 −33
Open

Qi sdkk #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66df516
fixed re-download projector everytime
qiqiWav Nov 18, 2024
ecb31fb
nexa run omnivision:model-
qiqiWav Nov 18, 2024
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 nexa/general.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def pull_model(model_path, hf = False, **kwargs):
if result["success"]:
# Only add to model list if not using custom download path
model_path = model_path if not hf else f"{model_path}:{result['local_path'].split('/')[-1]}"
if not kwargs.get('local_download_path') and 'projector' not in model_path.lower():
if not kwargs.get('local_download_path'):
add_model_to_list(model_path, result["local_path"], result["model_type"], result["run_type"])

if hf:
Expand Down
79 changes: 47 additions & 32 deletions nexa/gguf/nexa_inference_vlm_omni.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ def __init__(

self.model = None
self.projector = None
self.projector_path = NEXA_RUN_OMNI_VLM_PROJECTOR_MAP.get(model_path, None)
self.downloaded_path = local_path
self.projector_downloaded_path = projector_local_path
self.device = device
self.context = None
self.omni_vlm_version = "vlm-81-instruct"
Expand All @@ -43,39 +40,57 @@ def __init__(
else:
self.n_gpu_layers = 0

if self.downloaded_path is not None and self.projector_downloaded_path is not None:
# when running from local, both path should be provided
self.omni_vlm_version = self._determine_vlm_version(str(self.downloaded_path))
elif self.downloaded_path is not None:
if model_path in NEXA_RUN_OMNI_VLM_MAP:
# Handle direct model file paths (e.g., omnivision:model-fp16)
if model_path and ':model-' in model_path:
base_name = model_path.split(':')[0]
model_type = model_path.split('model-')[1]
if base_name in NEXA_RUN_OMNI_VLM_PROJECTOR_MAP:
self.model_path = model_path
# Construct corresponding projector path
self.projector_path = f"{base_name}:projector-{model_type}"
self.downloaded_path, _ = pull_model(self.model_path, **kwargs)
self.projector_downloaded_path, _ = pull_model(self.projector_path, **kwargs)
self.omni_vlm_version = self._determine_vlm_version(model_path)

else:
# Handle other path formats and model loading scenarios
self.projector_path = NEXA_RUN_OMNI_VLM_PROJECTOR_MAP.get(model_path, None)
self.downloaded_path = local_path
self.projector_downloaded_path = projector_local_path

if self.downloaded_path is not None and self.projector_downloaded_path is not None:
# when running from local, both path should be provided
self.omni_vlm_version = self._determine_vlm_version(str(self.downloaded_path))
elif self.downloaded_path is not None:
if model_path in NEXA_RUN_OMNI_VLM_MAP:
self.projector_path = NEXA_RUN_OMNI_VLM_PROJECTOR_MAP[model_path]
self.projector_downloaded_path, _ = pull_model(self.projector_path, **kwargs)
self.omni_vlm_version = self._determine_vlm_version(model_path)
elif model_path in NEXA_RUN_OMNI_VLM_MAP:
self.model_path = NEXA_RUN_OMNI_VLM_MAP[model_path]
self.projector_path = NEXA_RUN_OMNI_VLM_PROJECTOR_MAP[model_path]
self.downloaded_path, _ = pull_model(self.model_path, **kwargs)
self.projector_downloaded_path, _ = pull_model(self.projector_path, **kwargs)
self.omni_vlm_version = self._determine_vlm_version(model_path)
elif model_path in NEXA_RUN_OMNI_VLM_MAP:
self.model_path = NEXA_RUN_OMNI_VLM_MAP[model_path]
self.projector_path = NEXA_RUN_OMNI_VLM_PROJECTOR_MAP[model_path]
self.downloaded_path, _ = pull_model(self.model_path, **kwargs)
self.projector_downloaded_path, _ = pull_model(self.projector_path, **kwargs)
self.omni_vlm_version = self._determine_vlm_version(model_path)
elif Path(model_path).parent.exists():
local_dir = Path(model_path).parent
model_name = Path(model_path).name
tag_and_ext = model_name.split(":")[-1]
self.downloaded_path = local_dir / f"model-{tag_and_ext}"
self.projector_downloaded_path = local_dir / f"projector-{tag_and_ext}"
if not (
self.downloaded_path.exists()
and self.projector_downloaded_path.exists()
):
logging.error(
f"Model or projector not found in {local_dir}. "
"Make sure to name them as 'model-<tag>.gguf' and 'projector-<tag>.gguf'."
)
elif Path(model_path).parent.exists():
local_dir = Path(model_path).parent
model_name = Path(model_path).name
tag_and_ext = model_name.split(":")[-1]
self.downloaded_path = local_dir / f"model-{tag_and_ext}"
self.projector_downloaded_path = local_dir / f"projector-{tag_and_ext}"
if not (
self.downloaded_path.exists()
and self.projector_downloaded_path.exists()
):
logging.error(
f"Model or projector not found in {local_dir}. "
"Make sure to name them as 'model-<tag>.gguf' and 'projector-<tag>.gguf'."
)
exit(1)
self.omni_vlm_version = self._determine_vlm_version(model_path)
else:
logging.error("VLM user model from hub is not supported yet.")
exit(1)
self.omni_vlm_version = self._determine_vlm_version(model_path)
else:
logging.error("VLM user model from hub is not supported yet.")
exit(1)

# Override version if specified in kwargs
if 'omni_vlm_version' in kwargs:
Expand Down
Loading