From 8c2b0b01f87f62aa66019a88d8461d4e11f72cf6 Mon Sep 17 00:00:00 2001 From: generatedunixname89002005307016 Date: Mon, 6 Feb 2023 09:05:41 -0800 Subject: [PATCH] upgrade pyre version in `fbcode/vision` - batch 2 Differential Revision: D43044534 fbshipit-source-id: dc841b6704ccd562f5a40e7b2834e26063a9f7ae --- pytorch3d/datasets/r2n2/r2n2.py | 2 -- pytorch3d/implicitron/evaluation/evaluator.py | 1 - pytorch3d/implicitron/models/generic_model.py | 2 -- .../implicit_function/scene_representation_networks.py | 4 ---- pytorch3d/implicitron/models/model_dbir.py | 2 -- pytorch3d/implicitron/models/renderer/raymarcher.py | 2 -- pytorch3d/implicitron/models/renderer/sdf_renderer.py | 2 -- pytorch3d/io/obj_io.py | 4 ---- pytorch3d/io/off_io.py | 2 -- pytorch3d/io/ply_io.py | 4 ---- pytorch3d/renderer/cameras.py | 8 -------- pytorch3d/renderer/fisheyecameras.py | 2 -- pytorch3d/renderer/mesh/textures.py | 8 -------- 13 files changed, 43 deletions(-) diff --git a/pytorch3d/datasets/r2n2/r2n2.py b/pytorch3d/datasets/r2n2/r2n2.py index 46692354..6f93ad76 100644 --- a/pytorch3d/datasets/r2n2/r2n2.py +++ b/pytorch3d/datasets/r2n2/r2n2.py @@ -368,8 +368,6 @@ class R2N2(ShapeNetBase): # pragma: no cover T = RT[3, :3] return R, T - # pyre-fixme[14]: `render` overrides method defined in `ShapeNetBase` - # inconsistently. def render( self, model_ids: Optional[List[str]] = None, diff --git a/pytorch3d/implicitron/evaluation/evaluator.py b/pytorch3d/implicitron/evaluation/evaluator.py index 40a003f3..59981091 100644 --- a/pytorch3d/implicitron/evaluation/evaluator.py +++ b/pytorch3d/implicitron/evaluation/evaluator.py @@ -57,7 +57,6 @@ class ImplicitronEvaluator(EvaluatorBase): def __post_init__(self): run_auto_creation(self) - # pyre-fixme[14]: `run` overrides method defined in `EvaluatorBase` inconsistently. def run( self, model: ImplicitronModelBase, diff --git a/pytorch3d/implicitron/models/generic_model.py b/pytorch3d/implicitron/models/generic_model.py index 45daa8a3..979a8435 100644 --- a/pytorch3d/implicitron/models/generic_model.py +++ b/pytorch3d/implicitron/models/generic_model.py @@ -315,8 +315,6 @@ class GenericModel(ImplicitronModelBase): # pyre-ignore: 13 self.log_loss_weights() - # pyre-fixme[14]: `forward` overrides method defined in `ImplicitronModelBase` - # inconsistently. def forward( self, *, # force keyword-only arguments diff --git a/pytorch3d/implicitron/models/implicit_function/scene_representation_networks.py b/pytorch3d/implicitron/models/implicit_function/scene_representation_networks.py index 193e007e..4ca71ee1 100644 --- a/pytorch3d/implicitron/models/implicit_function/scene_representation_networks.py +++ b/pytorch3d/implicitron/models/implicit_function/scene_representation_networks.py @@ -345,8 +345,6 @@ class SRNImplicitFunction(ImplicitFunctionBase, torch.nn.Module): def raymarch_function_tweak_args(cls, type, args: DictConfig) -> None: args.pop("latent_dim", None) - # pyre-fixme[14]: `forward` overrides method defined in `ImplicitFunctionBase` - # inconsistently. def forward( self, *, @@ -406,8 +404,6 @@ class SRNHyperNetImplicitFunction(ImplicitFunctionBase, torch.nn.Module): args.pop("latent_dim", None) args.pop("latent_dim_hypernet", None) - # pyre-fixme[14]: `forward` overrides method defined in `ImplicitFunctionBase` - # inconsistently. def forward( self, *, diff --git a/pytorch3d/implicitron/models/model_dbir.py b/pytorch3d/implicitron/models/model_dbir.py index 4f470a6e..826731fc 100644 --- a/pytorch3d/implicitron/models/model_dbir.py +++ b/pytorch3d/implicitron/models/model_dbir.py @@ -41,8 +41,6 @@ class ModelDBIR(ImplicitronModelBase): bg_color: Tuple[float, float, float] = (0.0, 0.0, 0.0) max_points: int = -1 - # pyre-fixme[14]: `forward` overrides method defined in `ImplicitronModelBase` - # inconsistently. def forward( self, *, # force keyword-only arguments diff --git a/pytorch3d/implicitron/models/renderer/raymarcher.py b/pytorch3d/implicitron/models/renderer/raymarcher.py index dffc505a..3e42815d 100644 --- a/pytorch3d/implicitron/models/renderer/raymarcher.py +++ b/pytorch3d/implicitron/models/renderer/raymarcher.py @@ -111,8 +111,6 @@ class AccumulativeRaymarcherBase(RaymarcherBase, torch.nn.Module): "minimum": lambda curr, acc: torch.minimum(curr, acc), }[self.weight_function_type] - # pyre-fixme[14]: `forward` overrides method defined in `RaymarcherBase` - # inconsistently. def forward( self, rays_densities: torch.Tensor, diff --git a/pytorch3d/implicitron/models/renderer/sdf_renderer.py b/pytorch3d/implicitron/models/renderer/sdf_renderer.py index 053d9907..4326e09e 100644 --- a/pytorch3d/implicitron/models/renderer/sdf_renderer.py +++ b/pytorch3d/implicitron/models/renderer/sdf_renderer.py @@ -66,8 +66,6 @@ class SignedDistanceFunctionRenderer(BaseRenderer, torch.nn.Module): # pyre-ign def requires_object_mask(self) -> bool: return True - # pyre-fixme[14]: `forward` overrides method defined in `BaseRenderer` - # inconsistently. def forward( self, ray_bundle: ImplicitronRayBundle, diff --git a/pytorch3d/io/obj_io.py b/pytorch3d/io/obj_io.py index 1ddd1dfd..be9b108e 100644 --- a/pytorch3d/io/obj_io.py +++ b/pytorch3d/io/obj_io.py @@ -298,8 +298,6 @@ class MeshObjFormat(MeshFormatInterpreter): def __init__(self) -> None: self.known_suffixes = (".obj",) - # pyre-fixme[14]: `read` overrides method defined in `MeshFormatInterpreter` - # inconsistently. def read( self, path: PathOrStr, @@ -324,8 +322,6 @@ class MeshObjFormat(MeshFormatInterpreter): ) return mesh - # pyre-fixme[14]: `save` overrides method defined in `MeshFormatInterpreter` - # inconsistently. def save( self, data: Meshes, diff --git a/pytorch3d/io/off_io.py b/pytorch3d/io/off_io.py index ab14f38a..4262269e 100644 --- a/pytorch3d/io/off_io.py +++ b/pytorch3d/io/off_io.py @@ -456,8 +456,6 @@ class MeshOffFormat(MeshFormatInterpreter): ) return mesh - # pyre-fixme[14]: `save` overrides method defined in `MeshFormatInterpreter` - # inconsistently. def save( self, data: Meshes, diff --git a/pytorch3d/io/ply_io.py b/pytorch3d/io/ply_io.py index 37ebde44..bce00bec 100644 --- a/pytorch3d/io/ply_io.py +++ b/pytorch3d/io/ply_io.py @@ -1372,8 +1372,6 @@ class MeshPlyFormat(MeshFormatInterpreter): ) return mesh - # pyre-fixme[14]: `save` overrides method defined in `MeshFormatInterpreter` - # inconsistently. def save( self, data: Meshes, @@ -1454,8 +1452,6 @@ class PointcloudPlyFormat(PointcloudFormatInterpreter): ) return pointcloud - # pyre-fixme[14]: `save` overrides method defined in - # `PointcloudFormatInterpreter` inconsistently. def save( self, data: Pointclouds, diff --git a/pytorch3d/renderer/cameras.py b/pytorch3d/renderer/cameras.py index 1b5037f9..22df74a8 100644 --- a/pytorch3d/renderer/cameras.py +++ b/pytorch3d/renderer/cameras.py @@ -695,8 +695,6 @@ class FoVPerspectiveCameras(CamerasBase): ) return transform - # pyre-fixme[14]: `unproject_points` overrides method defined in `CamerasBase` - # inconsistently. def unproject_points( self, xy_depth: torch.Tensor, @@ -940,8 +938,6 @@ class FoVOrthographicCameras(CamerasBase): ) return transform - # pyre-fixme[14]: `unproject_points` overrides method defined in `CamerasBase` - # inconsistently. def unproject_points( self, xy_depth: torch.Tensor, @@ -1149,8 +1145,6 @@ class PerspectiveCameras(CamerasBase): ) return transform - # pyre-fixme[14]: `unproject_points` overrides method defined in `CamerasBase` - # inconsistently. def unproject_points( self, xy_depth: torch.Tensor, @@ -1388,8 +1382,6 @@ class OrthographicCameras(CamerasBase): ) return transform - # pyre-fixme[14]: `unproject_points` overrides method defined in `CamerasBase` - # inconsistently. def unproject_points( self, xy_depth: torch.Tensor, diff --git a/pytorch3d/renderer/fisheyecameras.py b/pytorch3d/renderer/fisheyecameras.py index 6f6b9b8b..3da558df 100644 --- a/pytorch3d/renderer/fisheyecameras.py +++ b/pytorch3d/renderer/fisheyecameras.py @@ -347,8 +347,6 @@ class FishEyeCameras(CamerasBase): point3d_est[..., :2] = theta.tan()[..., None] / xr_yrNorm[..., None] * xr_yr return point3d_est - # pyre-fixme[14]: `unproject_points` overrides method defined in `CamerasBase` - # inconsistently. def unproject_points( self, xy_depth: torch.Tensor, diff --git a/pytorch3d/renderer/mesh/textures.py b/pytorch3d/renderer/mesh/textures.py index 0d7479cd..5b96fd0e 100644 --- a/pytorch3d/renderer/mesh/textures.py +++ b/pytorch3d/renderer/mesh/textures.py @@ -491,8 +491,6 @@ class TexturesAtlas(TexturesBase): new_tex._num_faces_per_mesh = new_props["_num_faces_per_mesh"] return new_tex - # pyre-fixme[14]: `sample_textures` overrides method defined in `TexturesBase` - # inconsistently. def sample_textures(self, fragments, **kwargs) -> torch.Tensor: """ This is similar to a nearest neighbor sampling and involves a @@ -929,8 +927,6 @@ class TexturesUV(TexturesBase): new_tex._num_faces_per_mesh = new_props["_num_faces_per_mesh"] return new_tex - # pyre-fixme[14]: `sample_textures` overrides method defined in `TexturesBase` - # inconsistently. def sample_textures(self, fragments, **kwargs) -> torch.Tensor: """ Interpolate a 2D texture map using uv vertex texture coordinates for each @@ -1454,8 +1450,6 @@ class TexturesVertex(TexturesBase): new_tex._num_verts_per_mesh = new_props["_num_verts_per_mesh"] return new_tex - # pyre-fixme[14]: `sample_textures` overrides method defined in `TexturesBase` - # inconsistently. def sample_textures(self, fragments, faces_packed=None) -> torch.Tensor: """ Determine the color for each rasterized face. Interpolate the colors for @@ -1524,8 +1518,6 @@ class TexturesVertex(TexturesBase): return self.__class__(sub_features) - # pyre-fixme[14]: `faces_verts_textures_packed` overrides method defined in - # `TexturesBase` inconsistently. def faces_verts_textures_packed(self, faces_packed=None) -> torch.Tensor: """ Samples texture from each vertex and for each face in the mesh.