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

Speed up salt and pepper #2316

Merged
merged 2 commits into from
Jan 29, 2025
Merged

Speed up salt and pepper #2316

merged 2 commits into from
Jan 29, 2025

Conversation

ternaus
Copy link
Collaborator

@ternaus ternaus commented Jan 29, 2025

Summary by Sourcery

Improve the performance of the SaltAndPepper augmentation and ensure color consistency by applying the same noise mask to all image channels.

Enhancements:

  • Generate salt and pepper noise masks without overlap, resulting in a more precise application of the specified amount of noise.
  • Apply the same noise mask to all channels of an image to preserve color consistency.

Copy link
Contributor

sourcery-ai bot commented Jan 29, 2025

Reviewer's Guide by Sourcery

This pull request improves the performance of the SaltAndPepper augmentation by generating masks without overlap and applying them efficiently using NumPy's where function. The same noise mask is applied to all channels of the image to preserve color consistency.

Sequence diagram for improved Salt and Pepper noise application

sequenceDiagram
    participant Image
    participant Transform
    participant Mask Generator
    participant Noise Applier

    Image->>Transform: Input image
    Transform->>Mask Generator: Calculate dimensions
    Mask Generator->>Mask Generator: Generate random indices
    Mask Generator->>Mask Generator: Create salt mask
    Mask Generator->>Mask Generator: Create pepper mask
    Mask Generator->>Noise Applier: Send 2D masks
    Noise Applier->>Noise Applier: Apply masks to all channels
    Noise Applier->>Image: Return modified image
Loading

State diagram for pixel values in Salt and Pepper transformation

stateDiagram-v2
    [*] --> Original: Initial pixel value
    Original --> Salt: Selected for salt mask
    Original --> Pepper: Selected for pepper mask
    Salt --> MaxValue: Set to maximum value
    Pepper --> Zero: Set to 0
    MaxValue --> [*]
    Zero --> [*]

    note right of Salt: Applied to all channels
    note right of Pepper: Applied to all channels
Loading

File-Level Changes

Change Details Files
Generate salt and pepper masks without overlap.
  • Calculate the number of salt and pepper pixels based on the total amount and salt ratio.
  • Generate a flat array of random indices to select pixels for salt and pepper noise.
  • Create boolean masks from the selected indices.
  • Reshape the masks to match the image dimensions.
albumentations/augmentations/transforms.py
Apply salt and pepper noise using NumPy's where function.
  • Use np.where to apply salt and pepper noise based on the generated masks.
  • Avoid unnecessary copying of the image by using np.where.
albumentations/augmentations/functional.py
Apply the same noise mask to all channels.
  • The noise mask is generated once and applied to all channels to maintain color consistency.
albumentations/augmentations/transforms.py
Update documentation to reflect changes in mask generation and application.
  • Clarify that the same noise mask is applied to all channels.
  • Update the mathematical formulation to reflect the new mask generation and application.
  • Explain that the exact number of affected pixels matches the specified amount.
albumentations/augmentations/transforms.py

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey @ternaus - I've reviewed your changes and they look great!

Here's what I looked at during the review
  • 🟢 General issues: all looks good
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@ternaus ternaus merged commit 3e6945d into main Jan 29, 2025
14 checks passed
@ternaus ternaus deleted the speed_up_salt_and_pepper branch January 29, 2025 02:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant