apply import merging for fbcode (8 of 11)

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: lisroach

Differential Revision: D36402214

fbshipit-source-id: b641bfa9d46242188524d4ae2c44998922a62b4c

Author: amyreese

captum/influence/_core/tracincp.py

@@ -9,11 +9,11 @@
     Callable,
     Iterator,
     List,
+    NamedTuple,
     Optional,
-    Union,
     Tuple,
-    NamedTuple,
     Type,
+    Union,
 )
 
 import torch

captum/influence/_core/tracincp_fast_rand_proj.py

@@ -1,26 +1,26 @@
 #!/usr/bin/env python3
 
 import warnings
-from typing import Any, Callable, Iterator, List, Optional, Union, Tuple
+from typing import Any, Callable, Iterator, List, Optional, Tuple, Union
 
 import torch
-from captum._utils.common import _get_module_from_name, _format_inputs
+from captum._utils.common import _format_inputs, _get_module_from_name
 from captum._utils.progress import progress
 from captum.influence._core.tracincp import (
-    TracInCPBase,
-    KMostInfluentialResults,
     _influence_route_to_helpers,
+    KMostInfluentialResults,
+    TracInCPBase,
 )
 from captum.influence._utils.common import (
+    _DatasetFromList,
+    _get_k_most_influential_helper,
     _jacobian_loss_wrt_inputs,
     _load_flexible_state_dict,
     _tensor_batch_dot,
-    _get_k_most_influential_helper,
-    _DatasetFromList,
 )
 from captum.influence._utils.nearest_neighbors import (
-    NearestNeighbors,
     AnnoyNearestNeighbors,
+    NearestNeighbors,
 )
 from captum.log import log_usage
 from torch import Tensor

captum/influence/_utils/common.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-from typing import Callable, Optional, Tuple, Union, Any, List
+from typing import Any, Callable, List, Optional, Tuple, Union
 
 import torch
 import torch.nn as nn

tests/influence/_core/test_tracin_show_progress.py

@@ -6,15 +6,13 @@
 
 import torch.nn as nn
 from captum.influence._core.tracincp import TracInCP
-from captum.influence._core.tracincp_fast_rand_proj import (
-    TracInCPFast,
-)
+from captum.influence._core.tracincp_fast_rand_proj import TracInCPFast
 from parameterized import parameterized
 from tests.helpers.basic import BaseTest
 from tests.influence._utils.common import (
-    get_random_model_and_data,
-    DataInfluenceConstructor,
     build_test_name_func,
+    DataInfluenceConstructor,
+    get_random_model_and_data,
 )