Skip to content

Jrobble/llava detection #382

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

Merged
merged 3 commits into from
Sep 12, 2024
Merged

Jrobble/llava detection #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc9105c
Fix width/height bug.
jrobble Sep 12, 2024
cfcbe6a
Use BUILD_REGISTRY var.
jrobble Sep 12, 2024
2a9cbf8
Add video_decode_timer.start() back.
jrobble Sep 12, 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 python/LlavaDetection/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

ARG BUILD_REGISTRY
ARG BUILD_TAG=latest
FROM openmpf/openmpf_python_executor_ssb:${BUILD_TAG}
FROM ${BUILD_REGISTRY}openmpf_python_executor_ssb:${BUILD_TAG}

RUN --mount=type=tmpfs,target=/var/cache/apt \
--mount=type=tmpfs,target=/var/lib/apt/lists \
Expand Down
9 changes: 6 additions & 3 deletions python/LlavaDetection/llava_component/llava_component.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def get_detections_from_video(self, video_job: mpf.VideoJob) -> Iterable[mpf.Vid

return tracks

def _get_frame_detections(self, media, config, is_video_job=False):
def _get_frame_detections(self, reader, config, is_video_job=False):
self._update_prompts(config.prompt_config_path)
self._check_client(config.ollama_server)

Expand All @@ -90,11 +90,11 @@ def _get_frame_detections(self, media, config, is_video_job=False):
video_process_timer = Timer()

video_decode_timer.start()
for idx, frame in enumerate(media):
for idx, frame in enumerate(reader):
video_decode_timer.pause()
frame_count += 1

width, height, _ = frame.shape
height, width, _ = frame.shape
detection_properties = dict()

self._get_ollama_response(self.frame_prompts, frame, detection_properties, video_process_timer)
Expand All @@ -107,6 +107,9 @@ def _get_frame_detections(self, media, config, is_video_job=False):

video_decode_timer.start()

for track in tracks:
reader.reverse_transform(track)

if is_video_job:
return tracks, video_process_timer, video_decode_timer, frame_count
return tracks
Expand Down