Skip to content
This repository has been archived by the owner on Nov 14, 2023. It is now read-only.

Do not create last job shorter than overlap size #8

Closed
wants to merge 3 commits into from
Closed

Do not create last job shorter than overlap size #8

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
6bab710
Add data_path attribute to lambda manager payload
mikhail-treskin Jul 1, 2023
54178a6
Merge pull request #5 from retailnext/mt/add_data_path
mikhail-treskin Jul 1, 2023
6965e09
Do not create last job shorter than overlap size
mikhail-treskin Sep 5, 2023
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
9 changes: 6 additions & 3 deletions cvat/apps/engine/task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,15 @@ def _segments():

segment_step -= overlap

segments = (
segments = [
SegmentParams(start_frame, min(start_frame + segment_size - 1, data_size - 1))
for start_frame in range(0, data_size, segment_step)
)
]
# Last segment is redundant if its size less than overlap size
if segments[-1].stop_frame - segments[-1].start_frame <= overlap:
segments.pop(-1)

return SegmentsParams(segments, segment_size, overlap)
return SegmentsParams(iter(segments), segment_size, overlap)

def _save_task_to_db(db_task: models.Task, *, job_file_mapping: Optional[JobFileMapping] = None):
job = rq.get_current_job()
Expand Down
11 changes: 9 additions & 2 deletions cvat/apps/lambda_manager/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

import cvat.apps.dataset_manager as dm
from cvat.apps.engine.frame_provider import FrameProvider
from cvat.apps.engine.models import Job, ShapeType, SourceType, Task
from cvat.apps.engine.models import Job, ShapeType, SourceType, Task, DataChoice
from cvat.apps.engine.serializers import LabeledDataSerializer
from cvat.apps.lambda_manager.serializers import (
FunctionCallRequestSerializer, FunctionCallSerializer
Expand Down Expand Up @@ -285,8 +285,15 @@ def invoke(


if self.kind == LambdaType.DETECTOR:
if db_task.data.original_chunk_type == DataChoice.VIDEO:
data_path = db_task.data.video.path
elif db_task.data.original_chunk_type == DataChoice.IMAGESET:
data_path = db_task.data.images.get(frame=data["frame"]).path
else:
data_path = ""
payload.update({
"image": self._get_image(db_task, data["frame"], quality)
"image": self._get_image(db_task, data["frame"], quality),
"data_path": data_path
})
elif self.kind == LambdaType.INTERACTOR:
payload.update({
Expand Down