"git@developer.sourcefind.cn:chenpangpang/transformers.git" did not exist on "955b2b97a69cf071c3517afaadf10bdf5ff77e1b"
Unverified Commit 780253ce authored by amyeroberts's avatar amyeroberts Committed by GitHub
Browse files

Rename method to avoid clash with property (#18677)

parent 2c947d29
...@@ -131,7 +131,7 @@ class ImageFeatureExtractionMixin: ...@@ -131,7 +131,7 @@ class ImageFeatureExtractionMixin:
return image.convert("RGB") 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 Rescale a numpy image by scale amount
""" """
...@@ -163,7 +163,7 @@ class ImageFeatureExtractionMixin: ...@@ -163,7 +163,7 @@ class ImageFeatureExtractionMixin:
rescale = isinstance(image.flat[0], np.integer) if rescale is None else rescale rescale = isinstance(image.flat[0], np.integer) if rescale is None else rescale
if 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: if channel_first and image.ndim == 3:
image = image.transpose(2, 0, 1) image = image.transpose(2, 0, 1)
...@@ -214,9 +214,9 @@ class ImageFeatureExtractionMixin: ...@@ -214,9 +214,9 @@ class ImageFeatureExtractionMixin:
# type it may need rescaling. # type it may need rescaling.
elif rescale: elif rescale:
if isinstance(image, np.ndarray): 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): 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 isinstance(image, np.ndarray):
if not isinstance(mean, np.ndarray): if not isinstance(mean, np.ndarray):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment