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

Fix to gray #2050

Merged
merged 3 commits into from
Nov 2, 2024
Merged

Fix to gray #2050

merged 3 commits into from
Nov 2, 2024

Conversation

ternaus
Copy link
Collaborator

@ternaus ternaus commented Nov 2, 2024

Summary by Sourcery

Fix image dimensionality checks by replacing 'len(shape)' with 'ndim' across various functions, enhancing consistency and correctness in handling image dimensions.

Bug Fixes:

  • Correct the condition checks for image dimensionality using 'ndim' instead of 'len(shape)' across multiple functions to ensure proper handling of image dimensions.

Enhancements:

  • Improve the 'grayscale_to_multichannel' function to handle single-channel outputs more efficiently by directly returning the grayscale image when only one output channel is needed.
  • Refactor the 'bbox_distort_image' function to use 'cv2.merge' for combining distorted masks and ensure correct dimensionality by transposing when necessary.
  • Enhance the 'convert_image_to_pil' function to use 'ndim' for checking image dimensions, improving readability and consistency.

Copy link
Contributor

sourcery-ai bot commented Nov 2, 2024

Reviewer's Guide by Sourcery

This PR focuses on improving image dimension handling and channel operations across the codebase. The main changes involve replacing numpy's shape-based operations with ndim for dimension checks, and using cv2.merge instead of np.stack/np.expand_dims for channel operations.

Updated class diagram for image processing functions

classDiagram
    class Functional {
        +solarize(img: np.ndarray, threshold: int) np.ndarray
        +grayscale_to_multichannel(grayscale_image: np.ndarray, num_output_channels: int) np.ndarray
    }
    class GeometricFunctional {
        +bbox_distort_image(bboxes, image_shape)
    }
    class TextFunctional {
        +convert_image_to_pil(image: np.ndarray) Image
    }
    class DomainAdaptationFunctional {
        +fourier_domain_adaptation(img: np.ndarray, target_img: np.ndarray, beta: float)
    }
    class Transforms {
        +get_params_dependent_on_data(params: dict[str, Any], data: dict[str, Any])
    }
    note for Functional "Updated ndim checks and cv2.merge usage"
    note for GeometricFunctional "Updated ndim checks and cv2.merge usage"
    note for TextFunctional "Updated ndim checks"
    note for DomainAdaptationFunctional "Updated ndim checks"
    note for Transforms "Updated cv2.merge usage"
Loading

File-Level Changes

Change Details Files
Replace shape length checks with ndim attribute for dimension validation
  • Replace len(image.shape) with image.ndim for more efficient dimension checking
  • Update dimension checks in PIL image conversion logic
  • Update dimension checks in Fourier domain adaptation
albumentations/augmentations/functional.py
albumentations/augmentations/text/functional.py
albumentations/augmentations/domain_adaptation/functional.py
Optimize multi-channel image operations using OpenCV
  • Replace np.stack with cv2.merge for channel operations
  • Update grayscale to multichannel conversion logic
  • Add special handling for single channel output in grayscale conversion
  • Update bbox distortion to use cv2.merge with proper dimension handling
albumentations/augmentations/geometric/functional.py
albumentations/augmentations/domain_adaptation/transforms.py
albumentations/augmentations/functional.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.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a 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. You can also use
    this command to specify where the summary should be inserted.

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 - here's some feedback:

Overall Comments:

  • Consider restoring the removed note in grayscale_to_multichannel() docstring about handling of existing multi-channel images, as this is important information for users.
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.

Copy link

codecov bot commented Nov 2, 2024

Codecov Report

Attention: Patch coverage is 92.85714% with 1 line in your changes missing coverage. Please review.

Project coverage is 90.32%. Comparing base (b1a79c2) to head (b0836ec).
Report is 249 commits behind head on main.

Files with missing lines Patch % Lines
albumentations/augmentations/functional.py 80.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff            @@
##           main    #2050       +/-   ##
=========================================
+ Coverage      0   90.32%   +90.32%     
=========================================
  Files         0       46       +46     
  Lines         0     7600     +7600     
=========================================
+ Hits          0     6865     +6865     
- Misses        0      735      +735     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ternaus ternaus merged commit 63da7b7 into main Nov 2, 2024
16 checks passed
@ternaus ternaus deleted the fix_to_gray branch November 2, 2024 02:22
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