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 elastic #2321

Merged
merged 3 commits into from
Jan 30, 2025
Merged

Speed up elastic #2321

merged 3 commits into from
Jan 30, 2025

Conversation

ternaus
Copy link
Collaborator

@ternaus ternaus commented Jan 30, 2025

Summary by Sourcery

Improve the performance and memory efficiency of the elastic transform by optimizing displacement field generation and map creation. Use vectorized operations and in-place modifications to reduce memory usage and speed up computations.

Enhancements:

  • Optimize displacement field generation for elastic transform.
  • Vectorize map coordinate calculations for elastic transform.

Tests:

  • Add comprehensive tests for the elastic transform displacement field generation, including parameter variations, reproducibility checks, blur effect verification, and memory efficiency tests.

Copy link
Contributor

sourcery-ai bot commented Jan 30, 2025

Reviewer's Guide by Sourcery

This pull request focuses on optimizing the generate_displacement_fields function in functional.py for improved performance and memory efficiency. It also includes comprehensive tests to ensure the correctness of the implementation.

Sequence diagram for optimized elastic transform

sequenceDiagram
    participant M as Main Process
    participant G as Random Generator
    participant B as Gaussian Blur
    M->>G: Request noise fields
    G-->>M: Return pre-allocated fields
    M->>B: Apply blur to all fields at once
    B-->>M: Return blurred fields
    Note over M: Scale fields by alpha
    Note over M: Return field views
Loading

Flow diagram for optimized elastic transform process

flowchart TD
    A[Start] --> B[Generate Fields]
    B --> C{Same DXDY?}
    C -->|Yes| D[Generate single field]
    C -->|No| E[Generate two fields]
    D --> F[Apply Gaussian Blur]
    E --> F
    F --> G[Scale by Alpha]
    G --> H[Return displacement fields]
    H --> I[End]
Loading

File-Level Changes

Change Details Files
Optimized displacement field generation
  • Pre-allocate memory for noise fields.
  • Generate and normalize noise in a single step.
  • Apply Gaussian blur using fast OpenCV operations.
  • Return views of the array to avoid copies.
albumentations/augmentations/geometric/functional.py
Added comprehensive tests for displacement field generation
  • Added tests for various image shapes, alpha values, sigma values, and kernel sizes.
  • Added tests for both gaussian and uniform noise distributions.
  • Added tests for same_dxdy behavior.
  • Added tests for alpha scaling.
  • Added tests for value ranges for uniform distribution.
  • Added tests for reproducibility.
  • Added tests to ensure that Gaussian blur is actually smoothing the displacement field.
  • Added tests to ensure memory efficiency.
tests/functional/test_geometric.py
Vectorized map generation in ElasticTransform
  • Use np.meshgrid and np.stack to generate coordinate maps.
  • Avoid explicit loops for map generation.
albumentations/augmentations/geometric/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: 1 issue found
  • 🟢 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.

tests/functional/test_geometric.py Show resolved Hide resolved
tests/functional/test_geometric.py Show resolved Hide resolved
tests/functional/test_geometric.py Show resolved Hide resolved
tests/functional/test_geometric.py Show resolved Hide resolved
@ternaus ternaus merged commit 0ed2c0e into main Jan 30, 2025
14 checks passed
@ternaus ternaus deleted the speed_up_elastic branch January 30, 2025 02:06
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