remove patch in prod code (#1244)

cicichen01 · facebook-github-bot · commit e9f43bdc267a · 2024-03-15T13:25:45.000-07:00
Summary: Pull Request resolved: #1244 As titled. Reviewed By: vivekmig Differential Revision: D54878651 fbshipit-source-id: 78c87a6264cf9ee89322289cd7fc83a7f41d59b4
diff --git a/tests/attr/layer/test_grad_cam.py b/tests/attr/layer/test_grad_cam.py
@@ -6,7 +6,8 @@
 import torch
 from captum._utils.typing import TensorLikeList
 from captum.attr._core.layer.grad_cam import LayerGradCam
-from tests.helpers.basic import assertTensorTuplesAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorTuplesAlmostEqual
 from tests.helpers.basic_models import (
     BasicModel_ConvNet_One_Conv,
     BasicModel_MultiLayer,
diff --git a/tests/attr/layer/test_layer_lrp.py b/tests/attr/layer/test_layer_lrp.py
@@ -8,7 +8,8 @@
 from captum.attr import LayerLRP
 from captum.attr._utils.lrp_rules import Alpha1_Beta0_Rule, EpsilonRule, GammaRule
 
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.helpers.basic_models import BasicModel_ConvNet_One_Conv, SimpleLRPModel
 from torch import Tensor
 
diff --git a/tests/attr/neuron/test_neuron_ablation.py b/tests/attr/neuron/test_neuron_ablation.py
@@ -10,7 +10,8 @@
     TensorOrTupleOfTensorsGeneric,
 )
 from captum.attr._core.neuron.neuron_feature_ablation import NeuronFeatureAblation
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.helpers.basic_models import (
     BasicModel_ConvNet_One_Conv,
     BasicModel_MultiLayer,
diff --git a/tests/attr/neuron/test_neuron_conductance.py b/tests/attr/neuron/test_neuron_conductance.py
@@ -7,7 +7,8 @@
 from captum._utils.typing import BaselineType, TensorOrTupleOfTensorsGeneric
 from captum.attr._core.layer.layer_conductance import LayerConductance
 from captum.attr._core.neuron.neuron_conductance import NeuronConductance
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.helpers.basic_models import (
     BasicModel_ConvNet,
     BasicModel_MultiLayer,
diff --git a/tests/attr/neuron/test_neuron_deeplift.py b/tests/attr/neuron/test_neuron_deeplift.py
@@ -11,7 +11,8 @@
     _create_inps_and_base_for_deeplift_neuron_layer_testing,
     _create_inps_and_base_for_deepliftshap_neuron_layer_testing,
 )
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.helpers.basic_models import (
     BasicModel_ConvNet,
     BasicModel_ConvNet_MaxPool3d,
diff --git a/tests/attr/neuron/test_neuron_gradient_shap.py b/tests/attr/neuron/test_neuron_gradient_shap.py
@@ -6,7 +6,8 @@
 from captum.attr._core.neuron.neuron_integrated_gradients import (
     NeuronIntegratedGradients,
 )
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.helpers.basic_models import BasicModel_MultiLayer
 from tests.helpers.classification_models import SoftmaxModel
 from torch import Tensor
diff --git a/tests/attr/test_baselines.py b/tests/attr/test_baselines.py
@@ -3,7 +3,7 @@
 from captum.attr._utils.baselines import ProductBaselines
 
 # from parameterized import parameterized
-from tests.helpers.basic import BaseTest
+from tests.helpers import BaseTest
 
 
 class TestProductBaselines(BaseTest):
diff --git a/tests/attr/test_class_summarizer.py b/tests/attr/test_class_summarizer.py
@@ -3,7 +3,7 @@
 
 import torch
 from captum.attr import ClassSummarizer, CommonStats
-from tests.helpers.basic import BaseTest
+from tests.helpers import BaseTest
 
 
 class Test(BaseTest):
diff --git a/tests/attr/test_common.py b/tests/attr/test_common.py
@@ -3,7 +3,7 @@
 import torch
 from captum.attr._core.noise_tunnel import SUPPORTED_NOISE_TUNNEL_TYPES
 from captum.attr._utils.common import _validate_input, _validate_noise_tunnel_type
-from tests.helpers.basic import BaseTest
+from tests.helpers import BaseTest
 
 
 class Test(BaseTest):
diff --git a/tests/attr/test_deconvolution.py b/tests/attr/test_deconvolution.py
@@ -11,7 +11,8 @@
 from captum.attr._core.neuron.neuron_guided_backprop_deconvnet import (
     NeuronDeconvolution,
 )
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.helpers.basic_models import BasicModel_ConvNet_One_Conv
 from torch.nn import Module
 
diff --git a/tests/attr/test_feature_ablation.py b/tests/attr/test_feature_ablation.py
@@ -10,7 +10,8 @@
 from captum.attr._core.feature_ablation import FeatureAblation
 from captum.attr._core.noise_tunnel import NoiseTunnel
 from captum.attr._utils.attribution import Attribution
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.helpers.basic_models import (
     BasicModel,
     BasicModel_ConvNet_One_Conv,
diff --git a/tests/attr/test_feature_permutation.py b/tests/attr/test_feature_permutation.py
@@ -3,7 +3,8 @@
 
 import torch
 from captum.attr._core.feature_permutation import _permute_feature, FeaturePermutation
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.helpers.basic_models import BasicModelWithSparseInputs
 from torch import Tensor
 
diff --git a/tests/attr/test_gradient_shap.py b/tests/attr/test_gradient_shap.py
@@ -8,7 +8,8 @@
 from captum.attr._core.gradient_shap import GradientShap
 from captum.attr._core.integrated_gradients import IntegratedGradients
 from numpy import ndarray
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.helpers.basic_models import BasicLinearModel, BasicModel2
 from tests.helpers.classification_models import SoftmaxModel
 
diff --git a/tests/attr/test_guided_backprop.py b/tests/attr/test_guided_backprop.py
@@ -9,7 +9,8 @@
 from captum.attr._core.neuron.neuron_guided_backprop_deconvnet import (
     NeuronGuidedBackprop,
 )
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.helpers.basic_models import BasicModel_ConvNet_One_Conv
 from torch.nn import Module
 
diff --git a/tests/attr/test_guided_grad_cam.py b/tests/attr/test_guided_grad_cam.py
@@ -6,7 +6,8 @@
 import torch
 from captum._utils.typing import TensorOrTupleOfTensorsGeneric
 from captum.attr._core.guided_grad_cam import GuidedGradCam
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.helpers.basic_models import BasicModel_ConvNet_One_Conv
 from torch import Tensor
 from torch.nn import Module
diff --git a/tests/attr/test_hook_removal.py b/tests/attr/test_hook_removal.py
@@ -14,7 +14,8 @@
     should_create_generated_test,
 )
 from tests.attr.helpers.test_config import config
-from tests.helpers.basic import BaseTest, deep_copy_args
+from tests.helpers import BaseTest
+from tests.helpers.basic import deep_copy_args
 from torch.nn import Module
 
 """
diff --git a/tests/attr/test_input_x_gradient.py b/tests/attr/test_input_x_gradient.py
@@ -6,7 +6,8 @@
 from captum.attr._core.input_x_gradient import InputXGradient
 from captum.attr._core.noise_tunnel import NoiseTunnel
 from tests.attr.test_saliency import _get_basic_config, _get_multiargs_basic_config
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.helpers.classification_models import SoftmaxModel
 from torch import Tensor
 from torch.nn import Module
diff --git a/tests/attr/test_integrated_gradients_basic.py b/tests/attr/test_integrated_gradients_basic.py
@@ -9,7 +9,8 @@
 from captum.attr._core.integrated_gradients import IntegratedGradients
 from captum.attr._core.noise_tunnel import NoiseTunnel
 from captum.attr._utils.common import _tensorize_baseline
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.helpers.basic_models import (
     BasicModel,
     BasicModel2,
diff --git a/tests/attr/test_integrated_gradients_classification.py b/tests/attr/test_integrated_gradients_classification.py
@@ -6,7 +6,8 @@
 from captum._utils.typing import BaselineType, Tensor
 from captum.attr._core.integrated_gradients import IntegratedGradients
 from captum.attr._core.noise_tunnel import NoiseTunnel
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.helpers.classification_models import SigmoidModel, SoftmaxModel
 from torch.nn import Module
 
diff --git a/tests/attr/test_interpretable_input.py b/tests/attr/test_interpretable_input.py
@@ -3,7 +3,8 @@
 import torch
 from captum.attr._utils.interpretable_input import TextTemplateInput, TextTokenInput
 from parameterized import parameterized
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from torch import Tensor
 
 
diff --git a/tests/attr/test_llm_attr.py b/tests/attr/test_llm_attr.py
@@ -13,7 +13,8 @@
 from captum.attr._core.shapley_value import ShapleyValueSampling
 from captum.attr._utils.interpretable_input import TextTemplateInput, TextTokenInput
 from parameterized import parameterized, parameterized_class
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from torch import nn, Tensor
 
 
diff --git a/tests/attr/test_lrp.py b/tests/attr/test_lrp.py
@@ -10,7 +10,8 @@
     GammaRule,
     IdentityRule,
 )
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.helpers.basic_models import (
     BasicModel_ConvNet_One_Conv,
     BasicModel_MultiLayer,
diff --git a/tests/attr/test_occlusion.py b/tests/attr/test_occlusion.py
@@ -12,7 +12,8 @@
     TensorOrTupleOfTensorsGeneric,
 )
 from captum.attr._core.occlusion import Occlusion
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.helpers.basic_models import (
     BasicModel3,
     BasicModel_ConvNet_One_Conv,
diff --git a/tests/attr/test_stat.py b/tests/attr/test_stat.py
@@ -4,7 +4,8 @@
 
 import torch
 from captum.attr import Max, Mean, Min, MSE, StdDev, Sum, Summarizer, Var
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 
 
 def get_values(n: int = 100, lo=None, hi=None, integers: bool = False):
diff --git a/tests/attr/test_summarizer.py b/tests/attr/test_summarizer.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import torch
 from captum.attr import CommonStats, Summarizer
-from tests.helpers.basic import BaseTest
+from tests.helpers import BaseTest
 
 
 class Test(BaseTest):
diff --git a/tests/attr/test_utils_batching.py b/tests/attr/test_utils_batching.py
@@ -6,7 +6,8 @@
     _batched_operator,
     _tuple_splice_range,
 )
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 
 
 class Test(BaseTest):
diff --git a/tests/concept/test_concept.py b/tests/concept/test_concept.py
@@ -5,7 +5,7 @@
 import torch
 from captum.concept._core.concept import Concept
 from captum.concept._utils.data_iterator import dataset_to_dataloader
-from tests.helpers.basic import BaseTest
+from tests.helpers import BaseTest
 from torch.utils.data import IterableDataset
 
 
diff --git a/tests/concept/test_tcav.py b/tests/concept/test_tcav.py
@@ -26,7 +26,8 @@
 from captum.concept._utils.classifier import Classifier
 from captum.concept._utils.common import concepts_to_str
 from captum.concept._utils.data_iterator import dataset_to_dataloader
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.helpers.basic_models import BasicModel_ConvNet
 from torch import Tensor
 from torch.utils.data import DataLoader, IterableDataset
diff --git a/tests/helpers/__init__.py b/tests/helpers/__init__.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python3
+
+try:
+    from tests.helpers.fb.internal_base import FbBaseTest as BaseTest
+
+    __all__ = [
+        "BaseTest",
+    ]
+
+except ImportError:
+    from tests.helpers.basic import BaseTest
diff --git a/tests/helpers/basic.py b/tests/helpers/basic.py
@@ -2,6 +2,7 @@
 import copy
 import random
 import unittest
+
 from typing import Callable
 
 import numpy as np
diff --git a/tests/influence/_core/test_arnoldi_influence.py b/tests/influence/_core/test_arnoldi_influence.py
@@ -17,7 +17,8 @@
     _unflatten_params_factory,
 )
 from parameterized import parameterized
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.influence._utils.common import (
     _format_batch_into_tuple,
     build_test_name_func,
diff --git a/tests/influence/_core/test_dataloader.py b/tests/influence/_core/test_dataloader.py
@@ -8,7 +8,8 @@
     TracInCPFastRandProj,
 )
 from parameterized import parameterized
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.influence._utils.common import (
     _format_batch_into_tuple,
     build_test_name_func,
diff --git a/tests/influence/_core/test_naive_influence.py b/tests/influence/_core/test_naive_influence.py
@@ -13,11 +13,8 @@
     _unflatten_params_factory,
 )
 from parameterized import parameterized
-from tests.helpers.basic import (
-    assertTensorAlmostEqual,
-    assertTensorTuplesAlmostEqual,
-    BaseTest,
-)
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual, assertTensorTuplesAlmostEqual
 from tests.influence._utils.common import (
     _format_batch_into_tuple,
     build_test_name_func,
diff --git a/tests/influence/_core/test_similarity_influence.py b/tests/influence/_core/test_similarity_influence.py
@@ -8,7 +8,8 @@
     euclidean_distance,
     SimilarityInfluence,
 )
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from torch.utils.data import Dataset
 
 
diff --git a/tests/influence/_core/test_tracin_intermediate_quantities.py b/tests/influence/_core/test_tracin_intermediate_quantities.py
@@ -12,7 +12,8 @@
     TracInCPFastRandProj,
 )
 from parameterized import parameterized
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.influence._utils.common import (
     _format_batch_into_tuple,
     build_test_name_func,
diff --git a/tests/influence/_core/test_tracin_k_most_influential.py b/tests/influence/_core/test_tracin_k_most_influential.py
@@ -6,7 +6,8 @@
 from captum.influence._core.tracincp import TracInCP
 
 from parameterized import parameterized
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.influence._utils.common import (
     _format_batch_into_tuple,
     build_test_name_func,
diff --git a/tests/influence/_core/test_tracin_regression.py b/tests/influence/_core/test_tracin_regression.py
@@ -12,7 +12,8 @@
     TracInCPFastRandProj,
 )
 from parameterized import parameterized
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.influence._utils.common import (
     _isSorted,
     _wrap_model_in_dataparallel,
diff --git a/tests/influence/_core/test_tracin_self_influence.py b/tests/influence/_core/test_tracin_self_influence.py
@@ -8,7 +8,8 @@
 from captum.influence._core.tracincp import TracInCP, TracInCPBase
 from captum.influence._core.tracincp_fast_rand_proj import TracInCPFast
 from parameterized import parameterized
-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
+from tests.helpers import BaseTest
+from tests.helpers.basic import assertTensorAlmostEqual
 from tests.influence._utils.common import (
     _format_batch_into_tuple,
     build_test_name_func,
diff --git a/tests/influence/_core/test_tracin_show_progress.py b/tests/influence/_core/test_tracin_show_progress.py
@@ -7,7 +7,7 @@
 from captum.influence._core.tracincp import TracInCP
 from captum.influence._core.tracincp_fast_rand_proj import TracInCPFast
 from parameterized import parameterized
-from tests.helpers.basic import BaseTest
+from tests.helpers import BaseTest
 from tests.influence._utils.common import (
     build_test_name_func,
     DataInfluenceConstructor,
diff --git a/tests/influence/_core/test_tracin_validation.py b/tests/influence/_core/test_tracin_validation.py
@@ -6,7 +6,7 @@
 from captum.influence._core.tracincp_fast_rand_proj import TracInCPFast
 
 from parameterized import parameterized
-from tests.helpers.basic import BaseTest
+from tests.helpers import BaseTest
 from tests.influence._utils.common import (
     build_test_name_func,
     DataInfluenceConstructor,
diff --git a/tests/influence/_core/test_tracin_xor.py b/tests/influence/_core/test_tracin_xor.py
diff --git a/tests/insights/test_contribution.py b/tests/insights/test_contribution.py
diff --git a/tests/insights/test_features.py b/tests/insights/test_features.py
diff --git a/tests/metrics/test_infidelity.py b/tests/metrics/test_infidelity.py
diff --git a/tests/metrics/test_sensitivity.py b/tests/metrics/test_sensitivity.py
diff --git a/tests/module/test_binary_concrete_stochastic_gates.py b/tests/module/test_binary_concrete_stochastic_gates.py
diff --git a/tests/module/test_gaussian_stochastic_gates.py b/tests/module/test_gaussian_stochastic_gates.py
diff --git a/tests/robust/test_FGSM.py b/tests/robust/test_FGSM.py
diff --git a/tests/robust/test_PGD.py b/tests/robust/test_PGD.py
diff --git a/tests/robust/test_attack_comparator.py b/tests/robust/test_attack_comparator.py
diff --git a/tests/robust/test_min_param_perturbation.py b/tests/robust/test_min_param_perturbation.py
diff --git a/tests/utils/test_av.py b/tests/utils/test_av.py
diff --git a/tests/utils/test_gradient.py b/tests/utils/test_gradient.py
diff --git a/tests/utils/test_helpers.py b/tests/utils/test_helpers.py
diff --git a/tests/utils/test_jacobian.py b/tests/utils/test_jacobian.py
diff --git a/tests/utils/test_linear_model.py b/tests/utils/test_linear_model.py
diff --git a/tests/utils/test_progress.py b/tests/utils/test_progress.py
diff --git a/tests/utils/test_sample_gradient.py b/tests/utils/test_sample_gradient.py

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@`
`11`	`11`	`from captum.attr._core.neuron.neuron_guided_backprop_deconvnet import (`
`12`	`12`	`NeuronDeconvolution,`
`13`	`13`	`)`
`14`		`-from tests.helpers.basic import assertTensorAlmostEqual, BaseTest`
	`14`	`+from tests.helpers import BaseTest`
	`15`	`+from tests.helpers.basic import assertTensorAlmostEqual`
`15`	`16`	`from tests.helpers.basic_models import BasicModel_ConvNet_One_Conv`
`16`	`17`	`from torch.nn import Module`
`17`	`18`