From ea4f3260e4ea2b1c9a90086dc80e43d8d31f8bc5 Mon Sep 17 00:00:00 2001 From: John Reese Date: Fri, 10 Jun 2022 16:04:56 -0700 Subject: [PATCH] apply new formatting config Summary: pyfmt now specifies a target Python version of 3.8 when formatting with black. With this new config, black adds trailing commas to all multiline function calls. This applies the new formatting as part of rolling out the linttool-integration for pyfmt. paintitblack Reviewed By: zertosh, lisroach Differential Revision: D37084377 fbshipit-source-id: 781a1b883a381a172e54d6e447137657977876b4 --- pytorch3d/datasets/r2n2/r2n2.py | 2 +- pytorch3d/datasets/shapenet_base.py | 2 +- .../implicitron/models/feature_extractor/feature_extractor.py | 2 +- pytorch3d/implicitron/models/renderer/multipass_ea.py | 2 +- pytorch3d/implicitron/tools/point_cloud_utils.py | 2 +- pytorch3d/renderer/implicit/renderer.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pytorch3d/datasets/r2n2/r2n2.py b/pytorch3d/datasets/r2n2/r2n2.py index e94d85a8..6f93ad76 100644 --- a/pytorch3d/datasets/r2n2/r2n2.py +++ b/pytorch3d/datasets/r2n2/r2n2.py @@ -377,7 +377,7 @@ class R2N2(ShapeNetBase): # pragma: no cover view_idxs: Optional[List[int]] = None, shader_type=HardPhongShader, device: Device = "cpu", - **kwargs + **kwargs, ) -> torch.Tensor: """ Render models with BlenderCamera by default to achieve the same orientations as the diff --git a/pytorch3d/datasets/shapenet_base.py b/pytorch3d/datasets/shapenet_base.py index f1d21208..eca26e90 100644 --- a/pytorch3d/datasets/shapenet_base.py +++ b/pytorch3d/datasets/shapenet_base.py @@ -113,7 +113,7 @@ class ShapeNetBase(torch.utils.data.Dataset): # pragma: no cover idxs: Optional[List[int]] = None, shader_type=HardPhongShader, device: Device = "cpu", - **kwargs + **kwargs, ) -> torch.Tensor: """ If a list of model_ids are supplied, render all the objects by the given model_ids. diff --git a/pytorch3d/implicitron/models/feature_extractor/feature_extractor.py b/pytorch3d/implicitron/models/feature_extractor/feature_extractor.py index 2d8206c4..32d3d483 100644 --- a/pytorch3d/implicitron/models/feature_extractor/feature_extractor.py +++ b/pytorch3d/implicitron/models/feature_extractor/feature_extractor.py @@ -30,7 +30,7 @@ class FeatureExtractorBase(ReplaceableBase, torch.nn.Module): self, imgs: Optional[torch.Tensor], masks: Optional[torch.Tensor] = None, - **kwargs + **kwargs, ) -> Dict[Any, torch.Tensor]: """ Args: diff --git a/pytorch3d/implicitron/models/renderer/multipass_ea.py b/pytorch3d/implicitron/models/renderer/multipass_ea.py index eddd736e..8fa59b5f 100644 --- a/pytorch3d/implicitron/models/renderer/multipass_ea.py +++ b/pytorch3d/implicitron/models/renderer/multipass_ea.py @@ -109,7 +109,7 @@ class MultiPassEmissionAbsorptionRenderer( # pyre-ignore: 13 ray_bundle: RayBundle, implicit_functions: List[ImplicitFunctionWrapper] = [], evaluation_mode: EvaluationMode = EvaluationMode.EVALUATION, - **kwargs + **kwargs, ) -> RendererOutput: """ Args: diff --git a/pytorch3d/implicitron/tools/point_cloud_utils.py b/pytorch3d/implicitron/tools/point_cloud_utils.py index c1b68374..9af23e30 100644 --- a/pytorch3d/implicitron/tools/point_cloud_utils.py +++ b/pytorch3d/implicitron/tools/point_cloud_utils.py @@ -75,7 +75,7 @@ def render_point_cloud_pytorch3d( eps: float = 1e-2, bg_color=None, bin_size: Optional[int] = None, - **kwargs + **kwargs, ): # feature dimension diff --git a/pytorch3d/renderer/implicit/renderer.py b/pytorch3d/renderer/implicit/renderer.py index 92d5aed6..49d30b54 100644 --- a/pytorch3d/renderer/implicit/renderer.py +++ b/pytorch3d/renderer/implicit/renderer.py @@ -176,7 +176,7 @@ class ImplicitRenderer(torch.nn.Module): rays_densities=rays_densities, rays_features=rays_features, ray_bundle=ray_bundle, - **kwargs + **kwargs, ) # images - minibatch x ... x (feature_dim + opacity_dim)