Sourcery refactored main branch #1
Open
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
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
| solver = solvers.get_solver(cfg) | ||
| return solver | ||
| return solvers.get_solver(cfg) |
There was a problem hiding this comment.
Function get_solver refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-78
to
+77
| assert load_best is True | ||
| assert load_best |
There was a problem hiding this comment.
Function get_solver_from_xp refactored with the following changes:
- Simplify comparison to boolean (
simplify-boolean-comparison)
| destination[prefix + 'optimizer'] = self.optimizer.state_dict() | ||
| destination[f'{prefix}optimizer'] = self.optimizer.state_dict() |
There was a problem hiding this comment.
Function AdversarialLoss._save_to_state_dict refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
| self.optimizer.load_state_dict(state_dict.pop(prefix + 'optimizer')) | ||
| self.optimizer.load_state_dict(state_dict.pop(f'{prefix}optimizer')) |
There was a problem hiding this comment.
Function AdversarialLoss._load_from_state_dict refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-81
to
+88
| assert isinstance(logits, list) and all([isinstance(t, torch.Tensor) for t in logits]), \ | ||
| f'Expecting a list of tensors as logits but {type(logits)} found.' | ||
| assert isinstance(logits, list) and all( | ||
| isinstance(t, torch.Tensor) for t in logits | ||
| ), f'Expecting a list of tensors as logits but {type(logits)} found.' | ||
| assert isinstance(fmaps, list), f'Expecting a list of features maps but {type(fmaps)} found.' | ||
| for fmap in fmaps: | ||
| assert isinstance(fmap, list) and all([isinstance(f, torch.Tensor) for f in fmap]), \ | ||
| f'Expecting a list of tensors as feature maps but {type(fmap)} found.' | ||
| assert isinstance(fmap, list) and all( | ||
| isinstance(f, torch.Tensor) for f in fmap | ||
| ), f'Expecting a list of tensors as feature maps but {type(fmap)} found.' |
There was a problem hiding this comment.
Function AdversarialLoss.get_adversary_pred refactored with the following changes:
- Replace unneeded comprehension with generator [×2] (
comprehension-to-generator)
Comment on lines
-473
to
+467
| max_len = max([wav.shape[-1] for wav, _ in samples]) | ||
| max_len = max(wav.shape[-1] for wav, _ in samples) |
There was a problem hiding this comment.
Function AudioDataset.collater refactored with the following changes:
- Replace unneeded comprehension with generator (
comprehension-to-generator)
Comment on lines
-126
to
+144
| if strategy == 'peak': | ||
| if strategy == 'clip': | ||
| wav = wav.clamp(-scale_peak, scale_peak) | ||
| elif strategy == 'loudness': | ||
| assert sample_rate is not None, "Loudness normalization requires sample rate." | ||
| wav = normalize_loudness(wav, sample_rate, loudness_headroom_db, loudness_compressor) | ||
| _clip_wav(wav, log_clipping=log_clipping, stem_name=stem_name) | ||
| elif strategy == 'peak': | ||
| rescaling = (scale_peak / wav.abs().max()) | ||
| if normalize or rescaling < 1: | ||
| wav = wav * rescaling | ||
| elif strategy == 'clip': | ||
| wav = wav.clamp(-scale_peak, scale_peak) | ||
| elif strategy == 'rms': | ||
| mono = wav.mean(dim=0) | ||
| rescaling = scale_rms / mono.pow(2).mean().sqrt() | ||
| if normalize or rescaling < 1: | ||
| wav = wav * rescaling | ||
| _clip_wav(wav, log_clipping=log_clipping, stem_name=stem_name) | ||
| elif strategy == 'loudness': | ||
| assert sample_rate is not None, "Loudness normalization requires sample rate." | ||
| wav = normalize_loudness(wav, sample_rate, loudness_headroom_db, loudness_compressor) | ||
| _clip_wav(wav, log_clipping=log_clipping, stem_name=stem_name) | ||
| else: | ||
| assert wav.abs().max() < 1 | ||
| assert strategy == '' or strategy == 'none', f"Unexpected strategy: '{strategy}'" | ||
| assert strategy in {'', 'none'}, f"Unexpected strategy: '{strategy}'" |
There was a problem hiding this comment.
Function normalize_audio refactored with the following changes:
- Simplify conditional into switch-like form [×3] (
switch) - Replace multiple comparisons of same variable with
inoperator (merge-comparisons) - Use set when checking membership of a collection of literals (
collection-into-set)
| if len(kw_list) == 0: | ||
| return None | ||
| else: | ||
| return kw_list | ||
| return None if not kw_list else kw_list |
There was a problem hiding this comment.
Function get_keyword_list refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp) - Simplify sequence length comparison (
simplify-len-comparison)
Comment on lines
-78
to
+88
| preprocess_func = get_bpm | ||
| return get_bpm | ||
| elif attribute == 'key': | ||
| preprocess_func = get_musical_key | ||
| return get_musical_key | ||
| elif attribute in ['moods', 'keywords']: | ||
| preprocess_func = get_keyword_list | ||
| return get_keyword_list | ||
| elif attribute in ['genre', 'name', 'instrument']: | ||
| preprocess_func = get_keyword | ||
| return get_keyword | ||
| elif attribute in ['title', 'artist', 'description']: | ||
| preprocess_func = get_string | ||
| return get_string | ||
| else: | ||
| preprocess_func = None | ||
| return preprocess_func | ||
| return None |
There was a problem hiding this comment.
Function MusicInfo.attribute_getter refactored with the following changes:
- Lift return into if (
lift-return-into-if)
| if attribute == 'description': | ||
| preprocess_func = get_keyword_or_keyword_list | ||
| else: | ||
| preprocess_func = None | ||
| return preprocess_func | ||
| return get_keyword_or_keyword_list if attribute == 'description' else None |
There was a problem hiding this comment.
Function SoundInfo.attribute_getter refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp) - Inline variable that is immediately returned (
inline-immediately-returned-variable)
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.
Branch
mainrefactored by Sourcery.If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.
See our documentation here.
Run Sourcery locally
Reduce the feedback loop during development by using the Sourcery editor plugin:
Review changes via command line
To manually merge these changes, make sure you're on the
mainbranch, then run:Help us improve this pull request!