[Mypy] Fix typing for R/S models (#54157)
Signed-off-by: Taneem Ibrahim <taneem.ibrahim@gmail.com>
This commit is contained in:
@@ -137,8 +137,9 @@ class ViTPatchGenerator(nn.Module):
|
||||
if isinstance(max_input_dims, int):
|
||||
max_input_dims = (max_input_dims, max_input_dims)
|
||||
|
||||
max_input_dims = tuple(
|
||||
int(math.ceil(d / patch_size) * patch_size) for d in max_input_dims
|
||||
max_input_dims = (
|
||||
int(math.ceil(max_input_dims[0] / patch_size) * patch_size),
|
||||
int(math.ceil(max_input_dims[1] / patch_size) * patch_size),
|
||||
)
|
||||
|
||||
self.cpe_mode = max_input_dims != input_dims
|
||||
@@ -154,7 +155,10 @@ class ViTPatchGenerator(nn.Module):
|
||||
|
||||
self.num_rows = max_input_dims[0] // patch_size
|
||||
self.num_cols = max_input_dims[1] // patch_size
|
||||
self.input_dims = tuple(d // patch_size for d in input_dims)
|
||||
self.input_dims = (
|
||||
input_dims[0] // patch_size,
|
||||
input_dims[1] // patch_size,
|
||||
)
|
||||
self.num_patches = self.num_rows * self.num_cols
|
||||
self.max_input_dims = max_input_dims
|
||||
|
||||
@@ -369,7 +373,10 @@ class ViTPatchGenerator(nn.Module):
|
||||
if input_size is None:
|
||||
input_dims = self.input_dims
|
||||
else:
|
||||
input_dims = tuple(d // self.patch_size for d in input_size)
|
||||
input_dims = (
|
||||
input_size[0] // self.patch_size,
|
||||
input_size[1] // self.patch_size,
|
||||
)
|
||||
|
||||
pos_embed = self._get_pos_embeddings(batch_size, input_dims)
|
||||
|
||||
@@ -538,8 +545,9 @@ class RadioInternVisionModel(nn.Module):
|
||||
|
||||
self.config = config
|
||||
self.img_size, self.grid_size, self.num_patches = self._init_img_size(
|
||||
to_2tuple(config.patch_size), config.image_size
|
||||
config.patch_size, config.image_size
|
||||
)
|
||||
assert self.img_size is not None
|
||||
max_img_size = int(
|
||||
round(config.cpe_max_size / config.patch_size) * config.patch_size
|
||||
)
|
||||
@@ -565,11 +573,21 @@ class RadioInternVisionModel(nn.Module):
|
||||
prefix=f"{prefix}.encoder",
|
||||
)
|
||||
|
||||
def _init_img_size(self, patch_size, img_size: int | tuple[int, int]):
|
||||
def _init_img_size(
|
||||
self,
|
||||
patch_size: input_dim_t,
|
||||
img_size: input_dim_t | None,
|
||||
) -> tuple[tuple[int, int] | None, tuple[int, int] | None, int | None]:
|
||||
if img_size is None:
|
||||
return None, None, None
|
||||
img_size = to_2tuple(img_size)
|
||||
grid_size = tuple([s // p for s, p in zip(img_size, patch_size)])
|
||||
if isinstance(img_size, int):
|
||||
img_size = (img_size, img_size)
|
||||
if isinstance(patch_size, int):
|
||||
patch_size = (patch_size, patch_size)
|
||||
grid_size = (
|
||||
img_size[0] // patch_size[0],
|
||||
img_size[1] // patch_size[1],
|
||||
)
|
||||
num_patches = grid_size[0] * grid_size[1]
|
||||
return img_size, grid_size, num_patches
|
||||
|
||||
|
||||
Reference in New Issue
Block a user