Sourcery Starbot ⭐ refactored buts101/Detectron #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SourceryAI
commented
May 27, 2022
Comment on lines
-81
to
+82
| binary = os.path.join(binary_dir, 'test_net' + binary_ext) | ||
| assert os.path.exists(binary), 'Binary \'{}\' not found'.format(binary) | ||
| binary = os.path.join(binary_dir, f'test_net{binary_ext}') | ||
| assert os.path.exists(binary), f"Binary '{binary}' not found" |
There was a problem hiding this comment.
Function multi_gpu_generate_rpn_on_dataset refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation) - Replace call to format with f-string. (
use-fstring-for-formatting)
| logger.info('Wrote RPN proposals to {}'.format(os.path.abspath(rpn_file))) | ||
| logger.info(f'Wrote RPN proposals to {os.path.abspath(rpn_file)}') |
There was a problem hiding this comment.
Function generate_rpn_on_range refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting)
Comment on lines
-196
to
+204
| core.ScopedName('rpn_rois_fpn' + str(l)) | ||
| core.ScopedName(f'rpn_rois_fpn{str(l)}') | ||
| for l in range(k_min, k_max + 1) | ||
| ] | ||
|
|
||
| score_names = [ | ||
| core.ScopedName('rpn_roi_probs_fpn' + str(l)) | ||
| core.ScopedName(f'rpn_roi_probs_fpn{str(l)}') | ||
| for l in range(k_min, k_max + 1) | ||
| ] | ||
|
|
There was a problem hiding this comment.
Function im_proposals refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-272
to
+275
| im_size_min = np.min(im_shape[0:2]) | ||
| im_size_max = np.max(im_shape[0:2]) | ||
|
|
||
| processed_ims = [] | ||
| im_size_min = np.min(im_shape[:2]) | ||
| im_size_max = np.max(im_shape[:2]) |
There was a problem hiding this comment.
Function _get_image_blob refactored with the following changes:
- Merge append into list declaration (
merge-list-append) - Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (
remove-redundant-slice-index) - Move assignment closer to its usage within a block (
move-assign-in-block)
Comment on lines
-294
to
+298
| if not cfg.MODEL.FASTER_RCNN: | ||
| box_proposals_hf = box_utils.flip_boxes(box_proposals, im_width) | ||
| else: | ||
| box_proposals_hf = None | ||
| box_proposals_hf = ( | ||
| None | ||
| if cfg.MODEL.FASTER_RCNN | ||
| else box_utils.flip_boxes(box_proposals, im_width) | ||
| ) |
There was a problem hiding this comment.
Function im_detect_bbox_hflip refactored with the following changes:
- Swap if/else branches of if expression to remove negation (
swap-if-expression) - Replace if statement with if expression (
assign-if-exp)
| ds.classes = {i: name for i, name in enumerate(classes)} | ||
| ds.classes = dict(enumerate(classes)) |
There was a problem hiding this comment.
Function get_coco_dataset refactored with the following changes:
- Replace identity comprehension with call to collection constructor (
identity-comprehension)
Comment on lines
-57
to
+66
| assert name in DATASETS.keys(), \ | ||
| 'Unknown dataset name: {}'.format(name) | ||
| assert os.path.exists(DATASETS[name][IM_DIR]), \ | ||
| 'Image directory \'{}\' not found'.format(DATASETS[name][IM_DIR]) | ||
| assert os.path.exists(DATASETS[name][ANN_FN]), \ | ||
| 'Annotation file \'{}\' not found'.format(DATASETS[name][ANN_FN]) | ||
| logger.debug('Creating: {}'.format(name)) | ||
| assert name in DATASETS.keys(), f'Unknown dataset name: {name}' | ||
| assert os.path.exists( | ||
| DATASETS[name][IM_DIR] | ||
| ), f"Image directory '{DATASETS[name][IM_DIR]}' not found" | ||
|
|
||
| assert os.path.exists( | ||
| DATASETS[name][ANN_FN] | ||
| ), f"Annotation file '{DATASETS[name][ANN_FN]}' not found" | ||
|
|
||
| logger.debug(f'Creating: {name}') |
There was a problem hiding this comment.
Function JsonDataset.__init__ refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting)
Comment on lines
-255
to
+258
| logger.info('Loading proposals from: {}'.format(proposal_file)) | ||
| logger.info(f'Loading proposals from: {proposal_file}') |
There was a problem hiding this comment.
Function JsonDataset._add_proposals_from_file refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting)
Comment on lines
-316
to
+319
| x = kp[0::3] # 0-indexed x coordinates | ||
| x = kp[::3] |
There was a problem hiding this comment.
Function JsonDataset._get_gt_keypoints refactored with the following changes:
- Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (
remove-redundant-slice-index)
This removes the following comments ( why? ):
# 0-indexed x coordinates
Comment on lines
-47
to
+51
| output_dir, 'segmentations_' + json_dataset.name + '_results' | ||
| output_dir, f'segmentations_{json_dataset.name}_results' | ||
| ) | ||
|
|
||
| if use_salt: | ||
| res_file += '_{}'.format(str(uuid.uuid4())) | ||
| res_file += f'_{str(uuid.uuid4())}' |
There was a problem hiding this comment.
Function evaluate_masks refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation) - Replace call to format with f-string. (
use-fstring-for-formatting)
SourceryAI
commented
May 27, 2022
Comment on lines
-82
to
+85
| 'Writing segmentation results json to: {}'.format( | ||
| os.path.abspath(res_file))) | ||
| f'Writing segmentation results json to: {os.path.abspath(res_file)}' | ||
| ) | ||
|
|
There was a problem hiding this comment.
Function _write_coco_segms_results_file refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting)
Comment on lines
-122
to
+124
| logger.info('Wrote json eval results to: {}'.format(eval_file)) | ||
| logger.info(f'Wrote json eval results to: {eval_file}') |
There was a problem hiding this comment.
Function _do_segmentation_eval refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting)
Comment on lines
-129
to
+133
| res_file = os.path.join( | ||
| output_dir, 'bbox_' + json_dataset.name + '_results' | ||
| ) | ||
| res_file = os.path.join(output_dir, f'bbox_{json_dataset.name}_results') | ||
| if use_salt: | ||
| res_file += '_{}'.format(str(uuid.uuid4())) | ||
| res_file += f'_{str(uuid.uuid4())}' |
There was a problem hiding this comment.
Function evaluate_boxes refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation) - Replace call to format with f-string. (
use-fstring-for-formatting)
| logger.info( | ||
| 'Writing bbox results json to: {}'.format(os.path.abspath(res_file))) | ||
| logger.info(f'Writing bbox results json to: {os.path.abspath(res_file)}') |
There was a problem hiding this comment.
Function _write_coco_bbox_results_file refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting)
Comment on lines
-199
to
+198
| logger.info('Wrote json eval results to: {}'.format(eval_file)) | ||
| logger.info(f'Wrote json eval results to: {eval_file}') |
There was a problem hiding this comment.
Function _do_detection_eval refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting)
Comment on lines
-203
to
+201
| assert dataset in results, 'Dataset {} not in results'.format(dataset) | ||
| assert task in results[dataset], 'Task {} not in results'.format(task) | ||
| assert metric in results[dataset][task], \ | ||
| 'Metric {} not in results'.format(metric) | ||
| assert dataset in results, f'Dataset {dataset} not in results' | ||
| assert task in results[dataset], f'Task {task} not in results' | ||
| assert metric in results[dataset][task], f'Metric {metric} not in results' |
There was a problem hiding this comment.
Function check_expected_results refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting) - Use f-string instead of string concatenation (
use-fstring-for-concatenation)
| salt = '_{}'.format(str(uuid.uuid4())) if use_salt else '' | ||
| salt = f'_{str(uuid.uuid4())}' if use_salt else '' |
There was a problem hiding this comment.
Function evaluate_boxes refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting)
Comment on lines
-61
to
+64
| assert os.path.exists(image_set_path), \ | ||
| 'Image set path does not exist: {}'.format(image_set_path) | ||
| assert os.path.exists( | ||
| image_set_path | ||
| ), f'Image set path does not exist: {image_set_path}' | ||
|
|
There was a problem hiding this comment.
Function _write_voc_results_files refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting)
Comment on lines
-101
to
+104
| filename = 'comp4' + salt + '_det_' + image_set + '_{:s}.txt' | ||
| return os.path.join(devkit_path, 'results', 'VOC' + year, 'Main', filename) | ||
| filename = f'comp4{salt}_det_{image_set}' + '_{:s}.txt' | ||
| return os.path.join(devkit_path, 'results', f'VOC{year}', 'Main', filename) |
There was a problem hiding this comment.
Function _get_voc_results_file_template refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-114
to
+120
| use_07_metric = True if int(year) < 2010 else False | ||
| use_07_metric = int(year) < 2010 | ||
| logger.info('VOC07 metric? ' + ('Yes' if use_07_metric else 'No')) | ||
| if not os.path.isdir(output_dir): | ||
| os.mkdir(output_dir) | ||
| for _, cls in enumerate(json_dataset.classes): | ||
| for cls in json_dataset.classes: |
There was a problem hiding this comment.
Function _do_python_eval refactored with the following changes:
- Remove unnecessary casts to int, str, float or bool (
remove-unnecessary-cast) - Simplify boolean if expression (
boolean-if-exp-identity) - Remove unnecessary calls to
enumeratewhen the index is not used (remove-unused-enumerate) - Use f-string instead of string concatenation (
use-fstring-for-concatenation)
SourceryAI
commented
May 27, 2022
Comment on lines
-154
to
+161
| cmd = 'cd {} && '.format(path) | ||
| cmd += '{:s} -nodisplay -nodesktop '.format(cfg.MATLAB) | ||
| cmd = f'cd {path} && ' + '{:s} -nodisplay -nodesktop '.format(cfg.MATLAB) | ||
| cmd += '-r "dbstop if error; ' | ||
| cmd += 'voc_eval(\'{:s}\',\'{:s}\',\'{:s}\',\'{:s}\'); quit;"' \ | ||
| .format(info['devkit_path'], 'comp4' + salt, info['image_set'], | ||
| output_dir) | ||
| cmd += 'voc_eval(\'{:s}\',\'{:s}\',\'{:s}\',\'{:s}\'); quit;"'.format( | ||
| info['devkit_path'], f'comp4{salt}', info['image_set'], output_dir | ||
| ) | ||
|
|
There was a problem hiding this comment.
Function _do_matlab_eval refactored with the following changes:
- Replace assignment and augmented assignment with single assignment (
merge-assign-and-aug-assign) - Replace call to format with f-string. (
use-fstring-for-formatting) - Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-168
to
+175
| assert os.path.exists(devkit_path), \ | ||
| 'Devkit directory {} not found'.format(devkit_path) | ||
| anno_path = os.path.join( | ||
| devkit_path, 'VOC' + year, 'Annotations', '{:s}.xml') | ||
| assert os.path.exists(devkit_path), f'Devkit directory {devkit_path} not found' | ||
| anno_path = os.path.join(devkit_path, f'VOC{year}', 'Annotations', '{:s}.xml') | ||
| image_set_path = os.path.join( | ||
| devkit_path, 'VOC' + year, 'ImageSets', 'Main', image_set + '.txt') | ||
| devkit_path, f'VOC{year}', 'ImageSets', 'Main', f'{image_set}.txt' | ||
| ) | ||
|
|
There was a problem hiding this comment.
Function voc_info refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting) - Use f-string instead of string concatenation (
use-fstring-for-concatenation)
| obj_struct = {} | ||
| obj_struct['name'] = obj.find('name').text | ||
| obj_struct = {'name': obj.find('name').text} |
There was a problem hiding this comment.
Function parse_rec refactored with the following changes:
- Merge dictionary assignment with declaration (
merge-dict-assign)
Comment on lines
-62
to
+61
| if np.sum(rec >= t) == 0: | ||
| p = 0 | ||
| else: | ||
| p = np.max(prec[rec >= t]) | ||
| p = 0 if np.sum(rec >= t) == 0 else np.max(prec[rec >= t]) |
There was a problem hiding this comment.
Function voc_ap refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp)
Comment on lines
-122
to
+118
| cachefile = os.path.join(cachedir, imageset + '_annots.pkl') | ||
| cachefile = os.path.join(cachedir, f'{imageset}_annots.pkl') |
There was a problem hiding this comment.
Function voc_eval refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation) - Merge duplicate blocks in conditional (
merge-duplicate-blocks) - Remove redundant conditional (
remove-redundant-if)
Comment on lines
-294
to
377
| 'conv_rpn_fpn' + slvl, | ||
| f'conv_rpn_fpn{slvl}', | ||
| dim_in, | ||
| dim_out, | ||
| kernel=3, | ||
| pad=1, | ||
| stride=1, | ||
| weight_init=gauss_fill(0.01), | ||
| bias_init=const_fill(0.0) | ||
| bias_init=const_fill(0.0), | ||
| ) | ||
|
|
||
| model.Relu(conv_rpn_fpn, conv_rpn_fpn) | ||
| # Proposal classification scores | ||
| rpn_cls_logits_fpn = model.Conv( | ||
| conv_rpn_fpn, | ||
| 'rpn_cls_logits_fpn' + slvl, | ||
| f'rpn_cls_logits_fpn{slvl}', | ||
| dim_in, | ||
| num_anchors, | ||
| kernel=1, | ||
| pad=0, | ||
| stride=1, | ||
| weight_init=gauss_fill(0.01), | ||
| bias_init=const_fill(0.0) | ||
| bias_init=const_fill(0.0), | ||
| ) | ||
|
|
||
| # Proposal bbox regression deltas | ||
| rpn_bbox_pred_fpn = model.Conv( | ||
| conv_rpn_fpn, | ||
| 'rpn_bbox_pred_fpn' + slvl, | ||
| f'rpn_bbox_pred_fpn{slvl}', | ||
| dim_in, | ||
| 4 * num_anchors, | ||
| kernel=1, | ||
| pad=0, | ||
| stride=1, | ||
| weight_init=gauss_fill(0.01), | ||
| bias_init=const_fill(0.0) | ||
| bias_init=const_fill(0.0), | ||
| ) | ||
|
|
||
| else: | ||
| # Share weights and biases | ||
| sk_min = str(k_min) | ||
| # RPN hidden representation | ||
| conv_rpn_fpn = model.ConvShared( | ||
| bl_in, | ||
| 'conv_rpn_fpn' + slvl, | ||
| f'conv_rpn_fpn{slvl}', | ||
| dim_in, | ||
| dim_out, | ||
| kernel=3, | ||
| pad=1, | ||
| stride=1, | ||
| weight='conv_rpn_fpn' + sk_min + '_w', | ||
| bias='conv_rpn_fpn' + sk_min + '_b' | ||
| weight=f'conv_rpn_fpn{sk_min}_w', | ||
| bias=f'conv_rpn_fpn{sk_min}_b', | ||
| ) | ||
|
|
||
| model.Relu(conv_rpn_fpn, conv_rpn_fpn) | ||
| # Proposal classification scores | ||
| rpn_cls_logits_fpn = model.ConvShared( | ||
| conv_rpn_fpn, | ||
| 'rpn_cls_logits_fpn' + slvl, | ||
| f'rpn_cls_logits_fpn{slvl}', | ||
| dim_in, | ||
| num_anchors, | ||
| kernel=1, | ||
| pad=0, | ||
| stride=1, | ||
| weight='rpn_cls_logits_fpn' + sk_min + '_w', | ||
| bias='rpn_cls_logits_fpn' + sk_min + '_b' | ||
| weight=f'rpn_cls_logits_fpn{sk_min}_w', | ||
| bias=f'rpn_cls_logits_fpn{sk_min}_b', | ||
| ) | ||
|
|
||
| # Proposal bbox regression deltas | ||
| rpn_bbox_pred_fpn = model.ConvShared( | ||
| conv_rpn_fpn, | ||
| 'rpn_bbox_pred_fpn' + slvl, | ||
| f'rpn_bbox_pred_fpn{slvl}', | ||
| dim_in, | ||
| 4 * num_anchors, | ||
| kernel=1, | ||
| pad=0, | ||
| stride=1, | ||
| weight='rpn_bbox_pred_fpn' + sk_min + '_w', | ||
| bias='rpn_bbox_pred_fpn' + sk_min + '_b' | ||
| weight=f'rpn_bbox_pred_fpn{sk_min}_w', | ||
| bias=f'rpn_bbox_pred_fpn{sk_min}_b', | ||
| ) | ||
|
|
There was a problem hiding this comment.
Function add_fpn_rpn_outputs refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-477
to
+492
| blobs[blob_prefix + '_fpn' + str(lvl)] = rois[idx_lvl, :] | ||
| blobs[f'{blob_prefix}_fpn{str(lvl)}'] = rois[idx_lvl, :] | ||
| rois_idx_order = np.concatenate((rois_idx_order, idx_lvl)) | ||
| rois_stacked = np.vstack( | ||
| [rois_stacked, blobs[blob_prefix + '_fpn' + str(lvl)]] | ||
| ) | ||
| rois_stacked = np.vstack([rois_stacked, blobs[f'{blob_prefix}_fpn{str(lvl)}']]) | ||
| rois_idx_restore = np.argsort(rois_idx_order).astype(np.int32, copy=False) | ||
| blobs[blob_prefix + '_idx_restore_int32'] = rois_idx_restore | ||
| blobs[f'{blob_prefix}_idx_restore_int32'] = rois_idx_restore |
There was a problem hiding this comment.
Function add_multilevel_roi_blobs refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-74
to
+83
| '{}_{}'.format(prefix, i), | ||
| f'{prefix}_{i}', | ||
| blob_in, | ||
| dim_in, | ||
| dim_out, | ||
| dim_inner, | ||
| dilation, | ||
| stride_init, | ||
| # Not using inplace for the last block; | ||
| # it may be fetched externally or used by FPN | ||
| inplace_sum=i < n - 1 | ||
| inplace_sum=i < n - 1, | ||
| ) | ||
|
|
There was a problem hiding this comment.
Function add_stage refactored with the following changes:
- Replace call to format with f-string. (
use-fstring-for-formatting)
This removes the following comments ( why? ):
# Not using inplace for the last block;
# it may be fetched externally or used by FPN
Comment on lines
-189
to
+188
| s = model.net.Sum([tr, sc], prefix + '_sum') | ||
| s = model.net.Sum([tr, sc], f'{prefix}_sum') |
There was a problem hiding this comment.
Function add_residual_block refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-200
to
+207
| prefix + '_branch1', | ||
| f'{prefix}_branch1', | ||
| dim_in, | ||
| dim_out, | ||
| kernel=1, | ||
| stride=stride, | ||
| no_bias=1 | ||
| no_bias=1, | ||
| ) | ||
| return model.AffineChannel(c, prefix + '_branch1_bn', dim=dim_out) | ||
|
|
||
| return model.AffineChannel(c, f'{prefix}_branch1_bn', dim=dim_out) |
There was a problem hiding this comment.
Function add_shortcut refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Thanks for starring sourcery-ai/sourcery ✨ 🌟 ✨
Here's your pull request refactoring your most popular Python repo.
If you want Sourcery to refactor all your Python repos and incoming pull requests install our bot.
Review changes via command line
To manually merge these changes, make sure you're on the
masterbranch, then run: