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.

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

[OTE_SDK] CVS-78747 rename .id to .id_ #925

Merged
merged 16 commits into from
Feb 24, 2022
Merged

Conversation

Harmjandevries
Copy link
Contributor

@Harmjandevries Harmjandevries commented Feb 16, 2022

As discussed previously we will be renaming the attribute .id to .id_.

Active e2e: https://ci.iotg.sclab.intel.com/job/IMPT/job/SC-MR-dev/1585/

@Harmjandevries Harmjandevries requested a review from a team February 16, 2022 08:37
@nervana-ff
Copy link

Can one of the admins verify this patch?

@github-actions github-actions bot added CLI Any changes in OTE CLI API Any changes in OTX API ALGO Any changes in OTX Algo Tasks implementation labels Feb 16, 2022
@Harmjandevries
Copy link
Contributor Author

run ote_sdk tests

@Harmjandevries Harmjandevries changed the title [OTE_SDK] CVS-78747 rename .id to .id_ [OTE_SDK][WIP] CVS-78747 rename .id to .id_ Feb 16, 2022
@github-actions github-actions bot removed CLI Any changes in OTE CLI ALGO Any changes in OTX Algo Tasks implementation labels Feb 16, 2022
@Harmjandevries
Copy link
Contributor Author

run ote_sdk tests

@Harmjandevries Harmjandevries changed the title [OTE_SDK][WIP] CVS-78747 rename .id to .id_ [OTE_SDK] CVS-78747 rename .id to .id_ Feb 16, 2022
@Harmjandevries
Copy link
Contributor Author

Hi @Ilya-Krylov and @samet-akcay, these are the ID changes required for sonoma creek. I've not updated the "id" parameter in the init functions yet, this is something we will do in the future.

Running e2e: https://ci.iotg.sclab.intel.com/job/IMPT/job/SC-MR-dev/1540/

@samet-akcay
Copy link
Contributor

@Harmjandevries would you be able to check this out, causing the fail in the CI

16:06:43  File �[0;32m/home/jenkins/b/workspace/ote/precommit/ote_sdk_tests_runner/src/ote_sdk/ote_sdk/usecases/exportable_code/prediction_to_annotation_converter.py:178�[0m, in �[0;36mDetectionBoxToAnnotationConverter.convert_to_annotation�[0;34m(self, predictions, metadata)�[0m
16:06:43  �[1;32m    176�[0m image_size �[38;5;241m=�[39m metadata[�[38;5;124m"�[39m�[38;5;124moriginal_shape�[39m�[38;5;124m"�[39m][�[38;5;241m1�[39m::�[38;5;241m-�[39m�[38;5;241m1�[39m]
16:06:43  �[1;32m    177�[0m �[38;5;28;01mfor�[39;00m box �[38;5;129;01min�[39;00m predictions:
16:06:43  �[0;32m--> 178�[0m     scored_label �[38;5;241m=�[39m ScoredLabel(�[38;5;28mself�[39m�[38;5;241m.�[39mlabels[�[38;5;28mint�[39m(�[43mbox�[49m�[38;5;241;43m.�[39;49m�[43mid_�[49m)], �[38;5;28mfloat�[39m(box�[38;5;241m.�[39mscore))
16:06:43  �[1;32m    179�[0m     coords �[38;5;241m=�[39m np�[38;5;241m.�[39marray(box�[38;5;241m.�[39mget_coords(), dtype�[38;5;241m=�[39m�[38;5;28mfloat�[39m) �[38;5;241m/�[39m np�[38;5;241m.�[39mtile(image_size, �[38;5;241m2�[39m)
16:06:43  �[1;32m    180�[0m     annotations�[38;5;241m.�[39mappend(
16:06:43  �[1;32m    181�[0m         Annotation(
16:06:43  �[1;32m    182�[0m             Rectangle(coords[�[38;5;241m0�[39m], coords[�[38;5;241m1�[39m], coords[�[38;5;241m2�[39m], coords[�[38;5;241m3�[39m]),
16:06:43  �[1;32m    183�[0m             labels�[38;5;241m=�[39m[scored_label],
16:06:43  �[1;32m    184�[0m         )
16:06:43  �[1;32m    185�[0m     )
16:06:43  
16:06:43  �[0;31mAttributeError�[0m: 'Detection' object has no attribute 'id_'

@Harmjandevries
Copy link
Contributor Author

run ote_sdk tests

@Harmjandevries
Copy link
Contributor Author

run ote_sdk tests

@Ilya-Krylov
Copy link
Contributor

@Harmjandevries please resolve conflicts and what are the next steps?

…_extensions into hv/CVS-78747_rename_id

� Conflicts:
�	ote_sdk/ote_sdk/entities/label.py
@Harmjandevries
Copy link
Contributor Author

@Harmjandevries please resolve conflicts and what are the next steps?

Step 1 (this PR): Replace .id with .id_ in ote_sdk and add .id attribute so we don't break SC
Step 2: Replace .id with .id_ in sc_sdk
Step 3: Remove unused .id attribute from OTE

Conflicts are resolved, the only failed checks are unrelated to this MR. (test_ote_eval_openvino)

@samet-akcay
Copy link
Contributor

run ote_sdk tests

@samet-akcay
Copy link
Contributor

The changes themselves look alright to me

@Harmjandevries
Copy link
Contributor Author

e2e passed except for known failures that are currently discussed in the validation channel. http://validationreports.sclab.intel.com:8004/reports/build_number_report?test_session_build_number=SC-MR-dev-1589&environment=idrefactore2e

I see a lot of tests are failing in the CI but these are related to the module 'torch' it seems, any suggestions for how to proceed?

@samet-akcay
Copy link
Contributor

@Ilya-Krylov , is it possible to merge this one if this PR is relevant to those fails?

@Ilya-Krylov
Copy link
Contributor

run ote_sdk tests

2 similar comments
@Ilya-Krylov
Copy link
Contributor

run ote_sdk tests

@Ilya-Krylov
Copy link
Contributor

run ote_sdk tests

ote_sdk/ote_sdk/entities/scored_label.py Outdated Show resolved Hide resolved
ote_sdk/ote_sdk/entities/resultset.py Outdated Show resolved Hide resolved
@Harmjandevries
Copy link
Contributor Author

@Ilya-Krylov
Copy link
Contributor

@Harmjandevries could you re-run build?

@Harmjandevries
Copy link
Contributor Author

@Ilya-Krylov
Copy link
Contributor

BMM 25548 🕐

@Harmjandevries
Copy link
Contributor Author

run ote_sdk tests

@Ilya-Krylov Ilya-Krylov merged commit 719e80a into develop Feb 24, 2022
@Ilya-Krylov Ilya-Krylov deleted the hv/CVS-78747_rename_id branch February 24, 2022 05:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
API Any changes in OTX API
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants