Clean up deprecation warnings (#19654)
* Clean up deprecation warnings Notes: Changed some strings in tests to raw strings, which will change the literal content of the strings as they are fed into whatever machine handles them. Test cases for past in the past/past_key_values switch changed/removed due to warning of impending removal * Add PILImageResampling abstraction for PIL.Image.Resampling
This commit is contained in:
@@ -233,7 +233,7 @@ class FlaxBeitModelIntegrationTest(unittest.TestCase):
|
||||
pixel_values = feature_extractor(images=image, return_tensors="np").pixel_values
|
||||
|
||||
# prepare bool_masked_pos
|
||||
bool_masked_pos = np.ones((1, 196), dtype=np.bool)
|
||||
bool_masked_pos = np.ones((1, 196), dtype=bool)
|
||||
|
||||
# forward pass
|
||||
outputs = model(pixel_values=pixel_values, bool_masked_pos=bool_masked_pos)
|
||||
|
||||
@@ -31,6 +31,7 @@ if is_vision_available():
|
||||
from PIL import Image
|
||||
|
||||
from transformers import FlavaFeatureExtractor
|
||||
from transformers.image_utils import PILImageResampling
|
||||
from transformers.models.flava.feature_extraction_flava import (
|
||||
FLAVA_CODEBOOK_MEAN,
|
||||
FLAVA_CODEBOOK_STD,
|
||||
@@ -80,7 +81,7 @@ class FlavaFeatureExtractionTester(unittest.TestCase):
|
||||
self.min_resolution = min_resolution
|
||||
self.max_resolution = max_resolution
|
||||
self.size = size
|
||||
self.resample = resample if resample is not None else Image.BICUBIC
|
||||
self.resample = resample if resample is not None else PILImageResampling.BICUBIC
|
||||
self.do_normalize = do_normalize
|
||||
self.image_mean = image_mean
|
||||
self.image_std = image_std
|
||||
@@ -96,7 +97,7 @@ class FlavaFeatureExtractionTester(unittest.TestCase):
|
||||
|
||||
self.codebook_do_resize = codebook_do_resize
|
||||
self.codebook_size = codebook_size
|
||||
self.codebook_resample = codebook_resample if codebook_resample is not None else Image.LANCZOS
|
||||
self.codebook_resample = codebook_resample if codebook_resample is not None else PILImageResampling.LANCZOS
|
||||
self.codebook_do_center_crop = codebook_do_center_crop
|
||||
self.codebook_crop_size = codebook_crop_size
|
||||
self.codebook_do_map_pixels = codebook_do_map_pixels
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -362,7 +362,7 @@ class FlaxWav2Vec2UtilsTest(unittest.TestCase):
|
||||
self.assertTrue(abs(ppl.item() - 141.4291) < 1e-3)
|
||||
|
||||
# mask half of the input
|
||||
mask = np.ones((2,), dtype=np.bool)
|
||||
mask = np.ones((2,), dtype=bool)
|
||||
mask[0] = 0
|
||||
|
||||
ppl = FlaxWav2Vec2GumbelVectorQuantizer._compute_perplexity(probs, mask)
|
||||
|
||||
Reference in New Issue
Block a user