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

feat(entity): Rework duplicate method #1013

Merged
merged 2 commits into from
Dec 12, 2023

Conversation

AndreyYashkin
Copy link
Contributor

closes #1012

Copy link

cla-bot bot commented Dec 3, 2023

For contributing to BlenderProc you need to sign our Contributor License Agreement. As an individual please sign CLA_individuals.pdf, as a company please sign CLA_entities.pdf and send it to [email protected]

@cornerfarmer
Copy link
Member

Hey @AndreyYashkin,

thanks a lot for your PR. Could you please sign the CLA, otherwise I cannot merge this.

@AndreyYashkin
Copy link
Contributor Author

Could you please sign the CLA, otherwise I cannot merge this.

Sorry. Forgot to send the scan. Check the mail.

@cla-bot cla-bot bot added the cla-signed label Dec 12, 2023
@cornerfarmer
Copy link
Member

cornerfarmer commented Dec 12, 2023

BlenderProcHelper result for run 555:

Done with: [amass_human_poses_python 45s, auto_shading_python 9s, basic_python 13s, blenderkit_python 18s, bop_object_on_surface_sampling_python 88s, bop_object_physics_positioning_python 119s, bop_object_pose_sampling_python 73s, bop_scene_replication_python 145s, camera_depth_of_field_python 19s, camera_object_pose_python 22s, camera_random_trajectories_python 49s, camera_sampling_python 20s, coco_annotations_python 13s, diffuse_color_image_python 18s, dust_python 28s, entity_displacement_modifier_python 13s, entity_manipulation_python 10s, front_3d_object_sampling_python 83s, front_3d_python 97s, front_3d_with_improved_mat_python 112s, git_log 1s, haven_python 22s, ikea_python 17s, kinect_azure_noise_python 11s, lens_distortion_python 14s, lens_distortion_python 12s, light_sampling_python 11s, material_manipulation_python 10s, material_randomizer_python 13s, matterport3d_python 67s, motion_blur_rolling_shutter_python 30s, motion_blur_rolling_shutter_python 22s, multi_render_python 250s, nocs_python 20s, object_pose_sampling_python 10s, on_surface_object_sampling_python 10s, optical_flow_python 26s, physics_convex_decomposition_python 127s, physics_positioning_python 23s, pix3d_python 16s, random_backgrounds_python 17s, random_room_constructor_python 72s, replica_python 334s, scenenet_python 51s, scenenet_with_cctextures_python 65s, semantic_segmentation_python 13s, shapenet_python 18s, shapenet_with_scenenet_python 51s, shapenet_with_suncg_python 66s, spotlight_python 47s, stereo_matching_python 42s, stereo_matching_with_projector_python 129s, suncg_basic_python 31s, suncg_with_cam_sampling_python 54s, suncg_with_improved_mat_python 73s, suncg_with_object_replacer_python 57s, tests_python 14s, urdf_loading_and_manipulation_python 45s]
Done with 58 of 58 tests.
There were errors:
Unit tests output:

${INTERNAL_NODES_DISC_SPACE}/Dominik_Winkelbauer/blender/blender-3.5.1-linux-x64/3.5/python/lib/python3.10/site-packages/numpy/core/getlimits.py:500: UserWarning: The value of the smallest subnormal for <class 'numpy.float64'> type is zero.
  setattr(self, word, getattr(machar, word).flat[0])
${INTERNAL_NODES_DISC_SPACE}/Dominik_Winkelbauer/blender/blender-3.5.1-linux-x64/3.5/python/lib/python3.10/site-packages/numpy/core/getlimits.py:89: UserWarning: The value of the smallest subnormal for <class 'numpy.float64'> type is zero.
  return self._float_to_str(self.smallest_subnormal)
${INTERNAL_NODES_DISC_SPACE}/Dominik_Winkelbauer/blender/blender-3.5.1-linux-x64/3.5/python/lib/python3.10/site-packages/numpy/core/getlimits.py:500: UserWarning: The value of the smallest subnormal for <class 'numpy.float32'> type is zero.
  setattr(self, word, getattr(machar, word).flat[0])
${INTERNAL_NODES_DISC_SPACE}/Dominik_Winkelbauer/blender/blender-3.5.1-linux-x64/3.5/python/lib/python3.10/site-packages/numpy/core/getlimits.py:89: UserWarning: The value of the smallest subnormal for <class 'numpy.float32'> type is zero.
  return self._float_to_str(self.smallest_subnormal)
.............
----------------------------------------------------------------------
Ran 13 tests in 9.365s

OK

urdf_loading_and_manipulation (main_python)

The output of urdf_loading_and_manipulation:main_python:000000_scene_gt_info_json has changed:

Expand
+ root['9'][4]['bbox_visib'][3]: 33
- root['9'][4]['bbox_visib'][3]: 32

stereo_matching (main_python)

The output of stereo_matching:main_python:disparity has changed: Diff: 0.0230, Pixel diff: 0.0029



Compare image Newly generated image

The output of stereo_matching:main_python:disparity has changed: Diff: 0.0126, Pixel diff: 0.0036



Compare image Newly generated image

Pylint output

Expand

Messages

Module blenderproc.python.loader.CCMaterialLoader (blenderproc/python/loader/CCMaterialLoader.py)

Line Col. Type Symbol ID Obj Message
73 0 convention line-too-long C0301
Line too long (152/120)

Module blenderproc.python.types.EntityUtility (blenderproc/python/types/EntityUtility.py)

Line Col. Type Symbol ID Obj Message
168 11 convention unidiomatic-typecheck C0123 Entity.duplicate
Use isinstance() rather than type() for a typecheck.

Module blenderproc.python.types.LightUtility (blenderproc/python/types/LightUtility.py)

Line Col. Type Symbol ID Obj Message
125 12 refactor consider-using-augmented-assign R6104 Light.setup_as_projector
Use '/=' to do an augmented assign directly
216 0 convention trailing-whitespace C0303
Trailing whitespace

Module blenderproc.python.utility.InstallUtility (blenderproc/python/utility/InstallUtility.py)

Line Col. Type Symbol ID Obj Message
129 0 convention trailing-whitespace C0303
Trailing whitespace

Module blenderproc.python.writer.BopWriterUtility (blenderproc/python/writer/BopWriterUtility.py)

Line Col. Type Symbol ID Obj Message
9 0 convention wrong-import-order C0411
standard import "from typing import List, Optional, Dict, Tuple" should be placed before "import trimesh"
10 0 convention wrong-import-order C0411
standard import "import warnings" should be placed before "import trimesh"
11 0 convention wrong-import-order C0411
standard import "import datetime" should be placed before "import trimesh"
18 0 convention wrong-import-order C0411
standard import "import sys" should be placed before "import trimesh"
62 0 convention line-too-long C0301
Line too long (131/120)
79 8 warning redefined-outer-name W0621 write_bop
Redefining name 'dataset_objects' from outer scope (line 532)
172 44 warning protected-access W0212 write_bop
Access to a protected member _pyrender_init of a client class
172 15 refactor consider-using-with R1732 write_bop
Consider using 'with' for resource-allocating operations
176 0 convention trailing-whitespace C0303
Trailing whitespace
301 21 warning redefined-outer-name W0621 _BopWriterUtility.get_frame_gt
Redefining name 'dataset_objects' from outer scope (line 532)
388 38 warning redefined-outer-name W0621 _BopWriterUtility.write_frames
Redefining name 'dataset_objects' from outer scope (line 532)
514 0 convention trailing-whitespace C0303
Trailing whitespace
526 78 convention trailing-whitespace C0303
Trailing whitespace
530 8 warning global-variable-undefined W0601 _BopWriterUtility._pyrender_init
Global variable 'renderer' undefined at the module level
530 8 warning global-variable-undefined W0601 _BopWriterUtility._pyrender_init
Global variable 'renderer_large' undefined at the module level
530 8 warning global-variable-undefined W0601 _BopWriterUtility._pyrender_init
Global variable 'dataset_objects' undefined at the module level
548 0 convention line-too-long C0301
Line too long (173/120)
563 78 convention trailing-whitespace C0303
Trailing whitespace
569 8 warning global-variable-not-assigned W0602 _BopWriterUtility._calc_gt_masks_iteration
Using global for 'renderer' but no assignment is done
569 8 warning global-variable-not-assigned W0602 _BopWriterUtility._calc_gt_masks_iteration
Using global for 'dataset_objects' but no assignment is done
576 0 convention trailing-whitespace C0303
Trailing whitespace
666 0 convention line-too-long C0301
Line too long (160/120)
667 0 convention trailing-whitespace C0303
Trailing whitespace
668 0 convention trailing-whitespace C0303
Trailing whitespace
671 0 convention line-too-long C0301
Line too long (196/120)
684 11 convention trailing-whitespace C0303
Trailing whitespace
686 78 convention trailing-whitespace C0303
Trailing whitespace
692 8 warning global-variable-not-assigned W0602 _BopWriterUtility._calc_gt_info_iteration
Using global for 'renderer_large' but no assignment is done
692 8 warning global-variable-not-assigned W0602 _BopWriterUtility._calc_gt_info_iteration
Using global for 'dataset_objects' but no assignment is done
692 8 warning global-variable-not-assigned W0602 _BopWriterUtility._calc_gt_info_iteration
Using global for 'renderer' but no assignment is done
696 11 warning protected-access W0212 _BopWriterUtility._calc_gt_info_iteration
Access to a protected member _renderer of a client class
697 12 warning protected-access W0212 _BopWriterUtility._calc_gt_info_iteration
Access to a protected member _renderer of a client class
698 12 warning protected-access W0212 _BopWriterUtility._calc_gt_info_iteration
Access to a protected member _renderer of a client class
705 0 convention trailing-whitespace C0303
Trailing whitespace
833 0 convention line-too-long C0301
Line too long (202/120)
834 0 convention trailing-whitespace C0303
Trailing whitespace
842 44 warning redefined-outer-name W0621 _BopWriterUtility.calc_gt_coco
Redefining name 'dataset_objects' from outer scope (line 532)

Metrics

Count per types

Name Count
convention 24
refactor 2
warning 16

Count per messages

Name Count
line-too-long 6
trailing-whitespace 13
consider-using-augmented-assign 1
unidiomatic-typecheck 1
redefined-outer-name 4
protected-access 4
consider-using-with 1
global-variable-undefined 3
global-variable-not-assigned 5
wrong-import-order 4

Count per modules

Name Count
blenderproc.python.loader.CCMaterialLoader 1
blenderproc.python.types.LightUtility 2
blenderproc.python.types.EntityUtility 1
blenderproc.python.utility.InstallUtility 1
blenderproc.python.writer.BopWriterUtility 37

Count per path

Name Count
blenderproc/python/loader/CCMaterialLoader.py 1
blenderproc/python/types/LightUtility.py 2
blenderproc/python/types/EntityUtility.py 1
blenderproc/python/utility/InstallUtility.py 1
blenderproc/python/writer/BopWriterUtility.py 37
***The tests are done.*** Check the log:

Last update: 12/12/2023, 13:14:49

Copy link
Member

@cornerfarmer cornerfarmer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look good, thank you

@cornerfarmer cornerfarmer merged commit 777be65 into DLR-RM:main Dec 12, 2023
2 checks passed
@AndreyYashkin AndreyYashkin deleted the duplicate_rework branch January 2, 2024 07:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

On object duplication
2 participants