Skip to content

Rename method to avoid clash with property #18677

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.

Sign up for GitHub

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

Merged
amyeroberts merged 4 commits into from
Aug 18, 2022
Merged

Rename method to avoid clash with property #18677

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf05c3c
Rename method to avoid clash with property
amyeroberts Aug 18, 2022
e354865
Generate: validate model_kwargs on FLAX (and catch typos in generate …
gante Aug 18, 2022
b8c47ce
Ping `detectron2` for CircleCI tests (#18680)
ydshieh Aug 18, 2022
47448c1
Merge branch 'main' into fix-rename-rescale-method
amyeroberts Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/transformers/image_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def convert_rgb(self, image):

return image.convert("RGB")

def rescale(self, image: np.ndarray, scale: Union[float, int]) -> np.ndarray:
def rescale_image(self, image: np.ndarray, scale: Union[float, int]) -> np.ndarray:
"""
Rescale a numpy image by scale amount
"""
Expand Down Expand Up @@ -163,7 +163,7 @@ def to_numpy_array(self, image, rescale=None, channel_first=True):
rescale = isinstance(image.flat[0], np.integer) if rescale is None else rescale

if rescale:
image = self.rescale(image.astype(np.float32), 1 / 255.0)
image = self.rescale_image(image.astype(np.float32), 1 / 255.0)

if channel_first and image.ndim == 3:
image = image.transpose(2, 0, 1)
Expand Down Expand Up @@ -214,9 +214,9 @@ def normalize(self, image, mean, std, rescale=False):
# type it may need rescaling.
elif rescale:
if isinstance(image, np.ndarray):
image = self.rescale(image.astype(np.float32), 1 / 255.0)
image = self.rescale_image(image.astype(np.float32), 1 / 255.0)
elif is_torch_tensor(image):
image = self.rescale(image.float(), 1 / 255.0)
image = self.rescale_image(image.float(), 1 / 255.0)

if isinstance(image, np.ndarray):
if not isinstance(mean, np.ndarray):
Expand Down