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

Fixed auto annotation, tf annotation and auto segmentation apps #1409

Merged
merged 2 commits into from
Apr 16, 2020
+4 −4
Merged

Fixed auto annotation, tf annotation and auto segmentation apps #1409

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
f121fbf
fixed code that uses FrameProvider, as the interface has changed
Apr 16, 2020
dfa0f94
Update CHANGELOG.md
azhavoro Apr 16, 2020
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
-

### Fixed
-
- Auto annotation, TF annotation and Auto segmentation apps (https://github.com/opencv/cvat/pull/1409)

### Security
-
Expand Down
2 changes: 1 addition & 1 deletion cvat/apps/auto_annotation/image_loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def __init__(self, frame_provider):
self._frame_provider = frame_provider

def __iter__(self):
for frame in self._frame_provider.get_frames(self._frame_provider.Quality.ORIGINAL):
for frame, _ in self._frame_provider.get_frames(self._frame_provider.Quality.ORIGINAL):
yield self._load_image(frame)

def __len__(self):
Expand Down
2 changes: 1 addition & 1 deletion cvat/apps/auto_segmentation/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class InferenceConfig(coco.CocoConfig):
## RUN OBJECT DETECTION
result = {}
frames = frame_provider.get_frames(frame_provider.Quality.ORIGINAL)
for image_num, image_bytes in enumerate(frames):
for image_num, (image_bytes, _) in enumerate(frames):
job.refresh()
if 'cancel' in job.meta:
del job.meta['cancel']
Expand Down
2 changes: 1 addition & 1 deletion cvat/apps/tf_annotation/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def _normalize_box(box, w, h):
config.gpu_options.allow_growth=True
sess = tf.Session(graph=detection_graph, config=config)
frames = frame_provider.get_frames(frame_provider.Quality.ORIGINAL)
for image_num, image in enumerate(frames):
for image_num, (image, _) in enumerate(frames):

job.refresh()
if 'cancel' in job.meta:
Expand Down