apply import merging for fbcode/vision/fair (2 of 2)

Summary:
Applies new import merging and sorting from µsort v1.0.

When merging imports, µsort will make a best-effort to move associated
comments to match merged elements, but there are known limitations due to
the diynamic nature of Python and developer tooling. These changes should
not produce any dangerous runtime changes, but may require touch-ups to
satisfy linters and other tooling.

Note that µsort uses case-insensitive, lexicographical sorting, which
results in a different ordering compared to isort. This provides a more
consistent sorting order, matching the case-insensitive order used when
sorting import statements by module name, and ensures that "frog", "FROG",
and "Frog" always sort next to each other.

For details on µsort's sorting and merging semantics, see the user guide:
https://usort.readthedocs.io/en/stable/guide.html#sorting

Reviewed By: bottler

Differential Revision: D35553814

fbshipit-source-id: be49bdb6a4c25264ff8d4db3a601f18736d17be1

Author: thatch

docs/tutorials/utils/generate_cow_renders.py

@@ -12,13 +12,13 @@
 from pytorch3d.renderer import (
     BlendParams,
     FoVPerspectiveCameras,
+    look_at_view_transform,
     MeshRasterizer,
     MeshRenderer,
     PointLights,
     RasterizationSettings,
     SoftPhongShader,
     SoftSilhouetteShader,
-    look_at_view_transform,
 )
 
 

projects/nerf/nerf/eval_video_utils.py

@@ -8,7 +8,7 @@
 from typing import Tuple
 
 import torch
-from pytorch3d.renderer import PerspectiveCameras, look_at_view_transform
+from pytorch3d.renderer import look_at_view_transform, PerspectiveCameras
 from torch.utils.data.dataset import Dataset
 
 

projects/nerf/nerf/implicit_function.py

@@ -8,7 +8,7 @@
 
 import torch
 from pytorch3d.common.linear_with_repeat import LinearWithRepeat
-from pytorch3d.renderer import HarmonicEmbedding, RayBundle, ray_bundle_to_ray_points
+from pytorch3d.renderer import HarmonicEmbedding, ray_bundle_to_ray_points, RayBundle
 
 
 def _xavier_init(linear):

pytorch3d/common/linear_with_repeat.py

@@ -9,7 +9,7 @@
 
 import torch
 import torch.nn.functional as F
-from torch.nn import Parameter, init
+from torch.nn import init, Parameter
 
 
 class LinearWithRepeat(torch.nn.Module):

pytorch3d/datasets/__init__.py

@@ -4,7 +4,7 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-from .r2n2 import R2N2, BlenderCamera, collate_batched_R2N2, render_cubified_voxels
+from .r2n2 import BlenderCamera, collate_batched_R2N2, R2N2, render_cubified_voxels
 from .shapenet import ShapeNetCore
 from .utils import collate_batched_meshes
 

pytorch3d/datasets/r2n2/r2n2.py

@@ -19,8 +19,8 @@
 from tabulate import tabulate
 
 from .utils import (
-    BlenderCamera,
     align_bbox,
+    BlenderCamera,
     compute_extrinsic_matrix,
     read_binvox_coords,
     voxelize,

pytorch3d/implicitron/dataset/implicitron_dataset.py

@@ -39,7 +39,7 @@
 from pytorch3d.io import IO
 from pytorch3d.renderer.camera_utils import join_cameras_as_batch
 from pytorch3d.renderer.cameras import CamerasBase, PerspectiveCameras
-from pytorch3d.structures.pointclouds import Pointclouds, join_pointclouds_as_batch
+from pytorch3d.structures.pointclouds import join_pointclouds_as_batch, Pointclouds
 
 from . import types
 

pytorch3d/implicitron/dataset/visualize.py

@@ -4,7 +4,7 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-from typing import Optional, Tuple, cast
+from typing import cast, Optional, Tuple
 
 import torch
 from pytorch3d.implicitron.tools.point_cloud_utils import get_rgbd_point_cloud

pytorch3d/implicitron/eval_demo.py

@@ -8,7 +8,7 @@
 import copy
 import dataclasses
 import os
-from typing import Optional, cast
+from typing import cast, Optional
 
 import lpips
 import torch

pytorch3d/implicitron/models/implicit_function/neural_radiance_field.py

@@ -11,7 +11,7 @@
 import torch
 from pytorch3d.common.linear_with_repeat import LinearWithRepeat
 from pytorch3d.implicitron.tools.config import registry
-from pytorch3d.renderer import RayBundle, ray_bundle_to_ray_points
+from pytorch3d.renderer import ray_bundle_to_ray_points, RayBundle
 from pytorch3d.renderer.cameras import CamerasBase
 from pytorch3d.renderer.implicit import HarmonicEmbedding