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

pytorch3d/ops/utils.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 TYPE_CHECKING, Optional, Tuple, Union
+from typing import Optional, Tuple, TYPE_CHECKING, Union
 
 import torch
 

pytorch3d/renderer/__init__.py

@@ -11,19 +11,19 @@ from .blending import (
     softmax_rgb_blend,
 )
 from .camera_utils import join_cameras_as_batch, rotate_on_spot
-from .cameras import OpenGLOrthographicCameras  # deprecated
-from .cameras import OpenGLPerspectiveCameras  # deprecated
-from .cameras import SfMOrthographicCameras  # deprecated
-from .cameras import SfMPerspectiveCameras  # deprecated
-from .cameras import (
+from .cameras import (  # deprecated  # deprecated  # deprecated  # deprecated
+    camera_position_from_spherical_angles,
     FoVOrthographicCameras,
     FoVPerspectiveCameras,
-    OrthographicCameras,
-    PerspectiveCameras,
-    camera_position_from_spherical_angles,
     get_world_to_view_transform,
     look_at_rotation,
     look_at_view_transform,
+    OpenGLOrthographicCameras,
+    OpenGLPerspectiveCameras,
+    OrthographicCameras,
+    PerspectiveCameras,
+    SfMOrthographicCameras,
+    SfMPerspectiveCameras,
 )
 from .implicit import (
     AbsorptionOnlyRaymarcher,
@@ -35,22 +35,25 @@ from .implicit import (
     MultinomialRaysampler,
     NDCGridRaysampler,
     NDCMultinomialRaysampler,
+    ray_bundle_to_ray_points,
+    ray_bundle_variables_to_ray_points,
     RayBundle,
     VolumeRenderer,
     VolumeSampler,
-    ray_bundle_to_ray_points,
-    ray_bundle_variables_to_ray_points,
 )
-from .lighting import AmbientLights, DirectionalLights, PointLights, diffuse, specular
+from .lighting import AmbientLights, diffuse, DirectionalLights, PointLights, specular
 from .materials import Materials
 from .mesh import (
+    gouraud_shading,
     HardFlatShader,
     HardGouraudShader,
     HardPhongShader,
     MeshRasterizer,
     MeshRenderer,
     MeshRendererWithFragments,
+    phong_shading,
     RasterizationSettings,
+    rasterize_meshes,
     SoftGouraudShader,
     SoftPhongShader,
     SoftSilhouetteShader,
@@ -58,9 +61,6 @@ from .mesh import (
     TexturesAtlas,
     TexturesUV,
     TexturesVertex,
-    gouraud_shading,
-    phong_shading,
-    rasterize_meshes,
 )
 from .points import (
     AlphaCompositor,
@@ -72,10 +72,10 @@ from .points import (
     rasterize_points,
 )
 from .utils import (
-    TensorProperties,
     convert_to_tensors_and_broadcast,
     ndc_grid_sample,
     ndc_to_grid_sample_coords,
+    TensorProperties,
 )
 
 

pytorch3d/renderer/implicit/__init__.py

@@ -15,9 +15,9 @@ from .raysampling import (
 )
 from .renderer import ImplicitRenderer, VolumeRenderer, VolumeSampler
 from .utils import (
-    RayBundle,
     ray_bundle_to_ray_points,
     ray_bundle_variables_to_ray_points,
+    RayBundle,
 )
 
 

pytorch3d/renderer/lighting.py

@@ -9,7 +9,7 @@ import torch
 import torch.nn.functional as F
 
 from ..common.datatypes import Device
-from .utils import TensorProperties, convert_to_tensors_and_broadcast
+from .utils import convert_to_tensors_and_broadcast, TensorProperties
 
 
 def diffuse(normals, color, direction) -> torch.Tensor:

pytorch3d/renderer/mesh/__init__.py

@@ -6,16 +6,15 @@
 
 
 from .clip import (
+    clip_faces,
     ClipFrustum,
     ClippedFaces,
-    clip_faces,
     convert_clipped_rasterization_to_original_faces,
 )
 from .rasterize_meshes import rasterize_meshes
 from .rasterizer import MeshRasterizer, RasterizationSettings
 from .renderer import MeshRenderer, MeshRendererWithFragments
-from .shader import TexturedSoftPhongShader  # DEPRECATED
-from .shader import (
+from .shader import (  # DEPRECATED
     BlendParams,
     HardFlatShader,
     HardGouraudShader,
@@ -23,10 +22,16 @@ from .shader import (
     SoftGouraudShader,
     SoftPhongShader,
     SoftSilhouetteShader,
+    TexturedSoftPhongShader,
 )
 from .shading import gouraud_shading, phong_shading
-from .textures import Textures  # DEPRECATED
-from .textures import TexturesAtlas, TexturesBase, TexturesUV, TexturesVertex
+from .textures import (  # DEPRECATED
+    Textures,
+    TexturesAtlas,
+    TexturesBase,
+    TexturesUV,
+    TexturesVertex,
+)
 
 
 __all__ = [k for k in globals().keys() if not k.startswith("_")]

pytorch3d/renderer/mesh/rasterize_meshes.py

@@ -12,8 +12,8 @@ import torch
 from pytorch3d import _C
 
 from .clip import (
-    ClipFrustum,
     clip_faces,
+    ClipFrustum,
     convert_clipped_rasterization_to_original_faces,
 )
 

pytorch3d/structures/__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 .meshes import Meshes, join_meshes_as_batch, join_meshes_as_scene
+from .meshes import join_meshes_as_batch, join_meshes_as_scene, Meshes
 from .pointclouds import Pointclouds
 from .utils import list_to_packed, list_to_padded, packed_to_list, padded_to_list
 from .volumes import Volumes

pytorch3d/vis/plotly_vis.py

@@ -11,14 +11,14 @@ import plotly.graph_objects as go
 import torch
 from plotly.subplots import make_subplots
 from pytorch3d.renderer import (
+    ray_bundle_to_ray_points,
     RayBundle,
     TexturesAtlas,
     TexturesVertex,
-    ray_bundle_to_ray_points,
 )
 from pytorch3d.renderer.camera_utils import camera_to_eye_at_up
 from pytorch3d.renderer.cameras import CamerasBase
-from pytorch3d.structures import Meshes, Pointclouds, join_meshes_as_scene
+from pytorch3d.structures import join_meshes_as_scene, Meshes, Pointclouds
 
 
 Struct = Union[CamerasBase, Meshes, Pointclouds, RayBundle]

setup.py

@@ -13,7 +13,7 @@ from typing import List, Optional
 
 import torch
 from setuptools import find_packages, setup
-from torch.utils.cpp_extension import CUDA_HOME, CppExtension, CUDAExtension
+from torch.utils.cpp_extension import CppExtension, CUDA_HOME, CUDAExtension
 
 
 def get_existing_ccbin(nvcc_args: List[str]) -> Optional[str]:

tests/implicitron/test_config.py

@@ -13,18 +13,18 @@ from typing import Any, List, Optional, Set, Tuple
 
 from omegaconf import DictConfig, ListConfig, OmegaConf, ValidationError
 from pytorch3d.implicitron.tools.config import (
-    Configurable,
-    ReplaceableBase,
     _get_type_to_process,
     _is_actually_dataclass,
     _ProcessType,
     _Registry,
+    Configurable,
     enable_get_default_args,
     expand_args_fields,
     get_default_args,
     get_default_args_field,
     registry,
     remove_unused_components,
+    ReplaceableBase,
     run_auto_creation,
 )
 

tests/implicitron/test_eval_cameras.py

@@ -11,7 +11,7 @@ import torch
 from pytorch3d.implicitron.tools.eval_video_trajectory import (
     generate_eval_video_cameras,
 )
-from pytorch3d.renderer.cameras import PerspectiveCameras, look_at_view_transform
+from pytorch3d.renderer.cameras import look_at_view_transform, PerspectiveCameras
 from pytorch3d.transforms import axis_angle_to_matrix
 
 

tests/implicitron/test_forward_pass.py

@@ -10,7 +10,7 @@ import torch
 from pytorch3d.implicitron.models.base import GenericModel
 from pytorch3d.implicitron.models.renderer.base import EvaluationMode
 from pytorch3d.implicitron.tools.config import expand_args_fields
-from pytorch3d.renderer.cameras import PerspectiveCameras, look_at_view_transform
+from pytorch3d.renderer.cameras import look_at_view_transform, PerspectiveCameras
 
 
 class TestGenericModel(unittest.TestCase):

tests/test_ball_query.py

@@ -8,7 +8,7 @@ import unittest
 from itertools import product
 
 import torch
-from common_testing import TestCaseMixin, get_random_cuda_device
+from common_testing import get_random_cuda_device, TestCaseMixin
 from pytorch3d.ops import sample_points_from_meshes
 from pytorch3d.ops.ball_query import ball_query
 from pytorch3d.ops.knn import _KNN

tests/test_camera_conversions.py

@@ -10,7 +10,7 @@ import unittest
 
 import numpy as np
 import torch
-from common_testing import TestCaseMixin, get_tests_dir
+from common_testing import get_tests_dir, TestCaseMixin
 from pytorch3d.ops import eyes
 from pytorch3d.renderer.points.pulsar import Renderer as PulsarRenderer
 from pytorch3d.transforms import so3_exp_map, so3_log_map

tests/test_camera_utils.py

@@ -11,9 +11,9 @@ import torch
 from common_testing import TestCaseMixin
 from pytorch3d.renderer.camera_utils import camera_to_eye_at_up, rotate_on_spot
 from pytorch3d.renderer.cameras import (
-    PerspectiveCameras,
     get_world_to_view_transform,
     look_at_view_transform,
+    PerspectiveCameras,
 )
 from pytorch3d.transforms import axis_angle_to_matrix
 from torch.nn.functional import normalize

tests/test_cameras.py

@@ -39,19 +39,19 @@ import torch
 from common_testing import TestCaseMixin
 from pytorch3d.renderer.camera_utils import join_cameras_as_batch
 from pytorch3d.renderer.cameras import (
+    camera_position_from_spherical_angles,
     CamerasBase,
     FoVOrthographicCameras,
     FoVPerspectiveCameras,
+    get_world_to_view_transform,
+    look_at_rotation,
+    look_at_view_transform,
     OpenGLOrthographicCameras,
     OpenGLPerspectiveCameras,
     OrthographicCameras,
     PerspectiveCameras,
     SfMOrthographicCameras,
     SfMPerspectiveCameras,
-    camera_position_from_spherical_angles,
-    get_world_to_view_transform,
-    look_at_rotation,
-    look_at_view_transform,
 )
 from pytorch3d.transforms import Transform3d
 from pytorch3d.transforms.rotation_conversions import random_rotations

tests/test_chamfer.py

@@ -10,7 +10,7 @@ from collections import namedtuple
 import numpy as np
 import torch
 import torch.nn.functional as F
-from common_testing import TestCaseMixin, get_random_cuda_device
+from common_testing import get_random_cuda_device, TestCaseMixin
 from pytorch3d.loss import chamfer_distance
 from pytorch3d.structures.pointclouds import Pointclouds
 

tests/test_compositing.py

@@ -7,7 +7,7 @@
 import unittest
 
 import torch
-from common_testing import TestCaseMixin, get_random_cuda_device
+from common_testing import get_random_cuda_device, TestCaseMixin
 from pytorch3d.renderer.compositing import (
     alpha_composite,
     norm_weighted_sum,

tests/test_face_areas_normals.py

@@ -8,7 +8,7 @@
 import unittest
 
 import torch
-from common_testing import TestCaseMixin, get_random_cuda_device
+from common_testing import get_random_cuda_device, TestCaseMixin
 from pytorch3d.ops import mesh_face_areas_normals
 from pytorch3d.structures.meshes import Meshes
 

tests/test_graph_conv.py

@@ -8,9 +8,9 @@ import unittest
 
 import torch
 import torch.nn as nn
-from common_testing import TestCaseMixin, get_random_cuda_device
+from common_testing import get_random_cuda_device, TestCaseMixin
 from pytorch3d import _C
-from pytorch3d.ops.graph_conv import GraphConv, gather_scatter, gather_scatter_python
+from pytorch3d.ops.graph_conv import gather_scatter, gather_scatter_python, GraphConv
 from pytorch3d.structures.meshes import Meshes
 from pytorch3d.utils import ico_sphere