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

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
 

tests/test_interpolate_face_attributes.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.ops.interp_face_attrs import (
     interpolate_face_attributes,
     interpolate_face_attributes_python,

tests/test_io_gltf.py

@@ -9,7 +9,7 @@ from math import radians
 
 import numpy as np
 import torch
-from common_testing import TestCaseMixin, get_pytorch3d_dir, get_tests_dir
+from common_testing import get_pytorch3d_dir, get_tests_dir, TestCaseMixin
 from PIL import Image
 from pytorch3d.io import IO
 from pytorch3d.io.experimental_gltf_io import MeshGlbFormat
@@ -17,9 +17,9 @@ from pytorch3d.renderer import (
     AmbientLights,
     BlendParams,
     FoVPerspectiveCameras,
+    look_at_view_transform,
     PointLights,
     RasterizationSettings,
-    look_at_view_transform,
     rotate_on_spot,
 )
 from pytorch3d.renderer.mesh import (

tests/test_io_obj.py

@@ -14,10 +14,10 @@ from tempfile import NamedTemporaryFile, TemporaryDirectory
 
 import torch
 from common_testing import (
-    TestCaseMixin,
     get_pytorch3d_dir,
     get_tests_dir,
     load_rgb_image,
+    TestCaseMixin,
 )
 from iopath.common.file_io import PathManager
 from pytorch3d.io import IO, load_obj, load_objs_as_meshes, save_obj
@@ -27,7 +27,7 @@ from pytorch3d.io.mtl_io import (
     _parse_mtl,
 )
 from pytorch3d.renderer import TexturesAtlas, TexturesUV, TexturesVertex
-from pytorch3d.structures import Meshes, join_meshes_as_batch
+from pytorch3d.structures import join_meshes_as_batch, Meshes
 from pytorch3d.utils import torus
 
 

tests/test_iou_box3d.py

@@ -11,7 +11,7 @@ from typing import List, Tuple, Union
 
 import torch
 import torch.nn.functional as F
-from common_testing import TestCaseMixin, get_random_cuda_device, get_tests_dir
+from common_testing import get_random_cuda_device, get_tests_dir, TestCaseMixin
 from pytorch3d.io import save_obj
 from pytorch3d.ops.iou_box3d import _box_planes, _box_triangles, box3d_overlap
 from pytorch3d.transforms.rotation_conversions import random_rotation

tests/test_knn.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.knn import _KNN, knn_gather, knn_points
 
 

tests/test_laplacian_matrices.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.ops import cot_laplacian, laplacian, norm_laplacian
 from pytorch3d.structures.meshes import Meshes
 

tests/test_marching_cubes.py

@@ -9,7 +9,7 @@ import pickle
 import unittest
 
 import torch
-from common_testing import TestCaseMixin, get_tests_dir
+from common_testing import get_tests_dir, TestCaseMixin
 from pytorch3d.ops.marching_cubes import marching_cubes_naive
 
 

tests/test_mesh_filtering.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 taubin_smoothing
 from pytorch3d.structures import Meshes
 from pytorch3d.utils import ico_sphere

tests/test_packed_to_padded.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.ops import packed_to_padded, padded_to_packed
 from pytorch3d.structures.meshes import Meshes
 

tests/test_point_mesh_distance.py

@@ -8,10 +8,10 @@ import unittest
 
 import numpy as np
 import torch
-from common_testing import TestCaseMixin, get_random_cuda_device
+from common_testing import get_random_cuda_device, TestCaseMixin
 from pytorch3d import _C
 from pytorch3d.loss import point_mesh_edge_distance, point_mesh_face_distance
-from pytorch3d.structures import Meshes, Pointclouds, packed_to_list
+from pytorch3d.structures import Meshes, packed_to_list, Pointclouds
 
 
 class TestPointMeshDistance(TestCaseMixin, unittest.TestCase):

tests/test_pointclouds.py

@@ -12,7 +12,7 @@ import numpy as np
 import torch
 from common_testing import TestCaseMixin
 from pytorch3d.structures import utils as struct_utils
-from pytorch3d.structures.pointclouds import Pointclouds, join_pointclouds_as_batch
+from pytorch3d.structures.pointclouds import join_pointclouds_as_batch, Pointclouds
 
 
 class TestPointclouds(TestCaseMixin, unittest.TestCase):

tests/test_points_alignment.py

@@ -8,7 +8,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 points_alignment
 from pytorch3d.structures.pointclouds import Pointclouds
 from pytorch3d.transforms import rotation_conversions

tests/test_r2n2.py

@@ -13,19 +13,19 @@ import unittest
 
 import numpy as np
 import torch
-from common_testing import TestCaseMixin, get_tests_dir, load_rgb_image
+from common_testing import get_tests_dir, load_rgb_image, TestCaseMixin
 from PIL import Image
 from pytorch3d.datasets import (
-    R2N2,
     BlenderCamera,
     collate_batched_R2N2,
+    R2N2,
     render_cubified_voxels,
 )
 from pytorch3d.renderer import (
     FoVPerspectiveCameras,
+    look_at_view_transform,
     PointLights,
     RasterizationSettings,
-    look_at_view_transform,
 )
 from pytorch3d.renderer.cameras import get_world_to_view_transform
 from pytorch3d.transforms import Transform3d

tests/test_rasterize_meshes.py

@@ -8,7 +8,7 @@ import functools
 import unittest
 
 import torch
-from common_testing import TestCaseMixin, get_random_cuda_device
+from common_testing import get_random_cuda_device, TestCaseMixin
 from pytorch3d import _C
 from pytorch3d.renderer import FoVPerspectiveCameras, look_at_view_transform
 from pytorch3d.renderer.mesh import MeshRasterizer, RasterizationSettings

tests/test_rasterize_points.py

@@ -9,7 +9,7 @@ import unittest
 
 import numpy as np
 import torch
-from common_testing import TestCaseMixin, get_random_cuda_device
+from common_testing import get_random_cuda_device, TestCaseMixin
 from pytorch3d import _C
 from pytorch3d.renderer.points.rasterize_points import (
     _format_radius,

tests/test_rasterize_rectangle_images.py

@@ -10,10 +10,10 @@ from itertools import product
 import numpy as np
 import torch
 from common_testing import (
-    TestCaseMixin,
     get_pytorch3d_dir,
     get_tests_dir,
     load_rgb_image,
+    TestCaseMixin,
 )
 from PIL import Image
 from pytorch3d.io import load_obj

tests/test_render_implicit.py

@@ -21,10 +21,10 @@ from pytorch3d.renderer import (
     NDCMultinomialRaysampler,
     PointLights,
     RasterizationSettings,
+    ray_bundle_to_ray_points,
     RayBundle,
     SoftPhongShader,
     TexturesVertex,
-    ray_bundle_to_ray_points,
 )
 from pytorch3d.structures import Meshes
 from pytorch3d.utils import ico_sphere

tests/test_render_meshes.py

@@ -15,19 +15,19 @@ from collections import namedtuple
 import numpy as np
 import torch
 from common_testing import (
-    TestCaseMixin,
     get_pytorch3d_dir,
     get_tests_dir,
     load_rgb_image,
+    TestCaseMixin,
 )
 from PIL import Image
 from pytorch3d.io import load_obj
 from pytorch3d.renderer.cameras import (
     FoVOrthographicCameras,
     FoVPerspectiveCameras,
+    look_at_view_transform,
     OrthographicCameras,
     PerspectiveCameras,
-    look_at_view_transform,
 )
 from pytorch3d.renderer.lighting import AmbientLights, PointLights
 from pytorch3d.renderer.materials import Materials
@@ -44,9 +44,9 @@ from pytorch3d.renderer.mesh.shader import (
     TexturedSoftPhongShader,
 )
 from pytorch3d.structures.meshes import (
-    Meshes,
     join_meshes_as_batch,
     join_meshes_as_scene,
+    Meshes,
 )
 from pytorch3d.utils.ico_sphere import ico_sphere
 from pytorch3d.utils.torus import torus

tests/test_render_meshes_clipped.py

@@ -17,19 +17,19 @@ import unittest
 import imageio
 import numpy as np
 import torch
-from common_testing import TestCaseMixin, get_tests_dir, load_rgb_image
+from common_testing import get_tests_dir, load_rgb_image, TestCaseMixin
 from pytorch3d.io import save_obj
 from pytorch3d.renderer.cameras import (
     FoVPerspectiveCameras,
-    PerspectiveCameras,
     look_at_view_transform,
+    PerspectiveCameras,
 )
 from pytorch3d.renderer.lighting import PointLights
 from pytorch3d.renderer.mesh import (
-    ClipFrustum,
-    TexturesUV,
     clip_faces,
+    ClipFrustum,
     convert_clipped_rasterization_to_original_faces,
+    TexturesUV,
 )
 from pytorch3d.renderer.mesh.rasterize_meshes import _RasterizeFaceVerts
 from pytorch3d.renderer.mesh.rasterizer import MeshRasterizer, RasterizationSettings

tests/test_render_multigpu.py

@@ -8,7 +8,7 @@ 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.renderer import (
     AlphaCompositor,
     BlendParams,

tests/test_render_points.py

@@ -15,18 +15,18 @@ from os import path
 import numpy as np
 import torch
 from common_testing import (
-    TestCaseMixin,
     get_pytorch3d_dir,
     get_tests_dir,
     load_rgb_image,
+    TestCaseMixin,
 )
 from PIL import Image
 from pytorch3d.renderer.cameras import (
     FoVOrthographicCameras,
     FoVPerspectiveCameras,
+    look_at_view_transform,
     OrthographicCameras,
     PerspectiveCameras,
-    look_at_view_transform,
 )
 from pytorch3d.renderer.compositing import alpha_composite, norm_weighted_sum
 from pytorch3d.renderer.points import (

tests/test_rendering_utils.py

@@ -20,9 +20,9 @@ from pytorch3d.renderer import (
     PointsRenderer,
 )
 from pytorch3d.renderer.utils import (
-    TensorProperties,
     ndc_grid_sample,
     ndc_to_grid_sample_coords,
+    TensorProperties,
 )
 from pytorch3d.structures import Pointclouds
 

tests/test_sample_farthest_points.py

@@ -9,10 +9,10 @@ import unittest
 import numpy as np
 import torch
 from common_testing import (
-    TestCaseMixin,
     get_pytorch3d_dir,
     get_random_cuda_device,
     get_tests_dir,
+    TestCaseMixin,
 )
 from pytorch3d.io import load_obj
 from pytorch3d.ops.sample_farthest_points import (

tests/test_sample_points_from_meshes.py

@@ -10,10 +10,10 @@ import unittest
 import numpy as np
 import torch
 from common_testing import (
-    TestCaseMixin,
     get_pytorch3d_dir,
     get_random_cuda_device,
     get_tests_dir,
+    TestCaseMixin,
 )
 from PIL import Image
 from pytorch3d.io import load_objs_as_meshes

tests/test_shader.py

@@ -8,7 +8,7 @@ import unittest
 
 import torch
 from common_testing import TestCaseMixin
-from pytorch3d.renderer.cameras import PerspectiveCameras, look_at_view_transform
+from pytorch3d.renderer.cameras import look_at_view_transform, PerspectiveCameras
 from pytorch3d.renderer.mesh.rasterizer import Fragments
 from pytorch3d.renderer.mesh.shader import (
     HardFlatShader,

tests/test_shapenet_core.py

@@ -12,14 +12,14 @@ import unittest
 
 import numpy as np
 import torch
-from common_testing import TestCaseMixin, get_tests_dir, load_rgb_image
+from common_testing import get_tests_dir, load_rgb_image, TestCaseMixin
 from PIL import Image
-from pytorch3d.datasets import ShapeNetCore, collate_batched_meshes
+from pytorch3d.datasets import collate_batched_meshes, ShapeNetCore
 from pytorch3d.renderer import (
     FoVPerspectiveCameras,
+    look_at_view_transform,
     PointLights,
     RasterizationSettings,
-    look_at_view_transform,
 )
 from torch.utils.data import DataLoader
 

tests/test_symeig3x3.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.common.workaround import symeig3x3
 from pytorch3d.transforms.rotation_conversions import random_rotations