Skip to content

Commit f3b5d3b

Browse files
cicichen01facebook-github-bot
authored andcommitted
remove patch in prod code (#1244)
Summary: Pull Request resolved: #1244 As titled. Differential Revision: D54878651
1 parent 5eb5498 commit f3b5d3b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+114
-60
lines changed

tests/attr/layer/test_grad_cam.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
import torch
77
from captum._utils.typing import TensorLikeList
88
from captum.attr._core.layer.grad_cam import LayerGradCam
9-
from tests.helpers.basic import assertTensorTuplesAlmostEqual, BaseTest
9+
from tests.helpers import BaseTest
10+
from tests.helpers.basic import assertTensorTuplesAlmostEqual
1011
from tests.helpers.basic_models import (
1112
BasicModel_ConvNet_One_Conv,
1213
BasicModel_MultiLayer,

tests/attr/layer/test_layer_lrp.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
from captum.attr import LayerLRP
99
from captum.attr._utils.lrp_rules import Alpha1_Beta0_Rule, EpsilonRule, GammaRule
1010

11-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
11+
from tests.helpers import BaseTest
12+
from tests.helpers.basic import assertTensorAlmostEqual
1213
from tests.helpers.basic_models import BasicModel_ConvNet_One_Conv, SimpleLRPModel
1314
from torch import Tensor
1415

tests/attr/neuron/test_neuron_ablation.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
TensorOrTupleOfTensorsGeneric,
1111
)
1212
from captum.attr._core.neuron.neuron_feature_ablation import NeuronFeatureAblation
13-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
13+
from tests.helpers import BaseTest
14+
from tests.helpers.basic import assertTensorAlmostEqual
1415
from tests.helpers.basic_models import (
1516
BasicModel_ConvNet_One_Conv,
1617
BasicModel_MultiLayer,

tests/attr/neuron/test_neuron_conductance.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
from captum._utils.typing import BaselineType, TensorOrTupleOfTensorsGeneric
88
from captum.attr._core.layer.layer_conductance import LayerConductance
99
from captum.attr._core.neuron.neuron_conductance import NeuronConductance
10-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
10+
from tests.helpers import BaseTest
11+
from tests.helpers.basic import assertTensorAlmostEqual
1112
from tests.helpers.basic_models import (
1213
BasicModel_ConvNet,
1314
BasicModel_MultiLayer,

tests/attr/neuron/test_neuron_deeplift.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
_create_inps_and_base_for_deeplift_neuron_layer_testing,
1212
_create_inps_and_base_for_deepliftshap_neuron_layer_testing,
1313
)
14-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
14+
from tests.helpers import BaseTest
15+
from tests.helpers.basic import assertTensorAlmostEqual
1516
from tests.helpers.basic_models import (
1617
BasicModel_ConvNet,
1718
BasicModel_ConvNet_MaxPool3d,

tests/attr/neuron/test_neuron_gradient_shap.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
from captum.attr._core.neuron.neuron_integrated_gradients import (
77
NeuronIntegratedGradients,
88
)
9-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
9+
from tests.helpers import BaseTest
10+
from tests.helpers.basic import assertTensorAlmostEqual
1011
from tests.helpers.basic_models import BasicModel_MultiLayer
1112
from tests.helpers.classification_models import SoftmaxModel
1213
from torch import Tensor

tests/attr/test_baselines.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from captum.attr._utils.baselines import ProductBaselines
44

55
# from parameterized import parameterized
6-
from tests.helpers.basic import BaseTest
6+
from tests.helpers import BaseTest
77

88

99
class TestProductBaselines(BaseTest):

tests/attr/test_class_summarizer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import torch
55
from captum.attr import ClassSummarizer, CommonStats
6-
from tests.helpers.basic import BaseTest
6+
from tests.helpers import BaseTest
77

88

99
class Test(BaseTest):

tests/attr/test_common.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import torch
44
from captum.attr._core.noise_tunnel import SUPPORTED_NOISE_TUNNEL_TYPES
55
from captum.attr._utils.common import _validate_input, _validate_noise_tunnel_type
6-
from tests.helpers.basic import BaseTest
6+
from tests.helpers import BaseTest
77

88

99
class Test(BaseTest):

tests/attr/test_deconvolution.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
from captum.attr._core.neuron.neuron_guided_backprop_deconvnet import (
1212
NeuronDeconvolution,
1313
)
14-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
14+
from tests.helpers import BaseTest
15+
from tests.helpers.basic import assertTensorAlmostEqual
1516
from tests.helpers.basic_models import BasicModel_ConvNet_One_Conv
1617
from torch.nn import Module
1718

tests/attr/test_feature_ablation.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
from captum.attr._core.feature_ablation import FeatureAblation
1111
from captum.attr._core.noise_tunnel import NoiseTunnel
1212
from captum.attr._utils.attribution import Attribution
13-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
13+
from tests.helpers import BaseTest
14+
from tests.helpers.basic import assertTensorAlmostEqual
1415
from tests.helpers.basic_models import (
1516
BasicModel,
1617
BasicModel_ConvNet_One_Conv,

tests/attr/test_feature_permutation.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33

44
import torch
55
from captum.attr._core.feature_permutation import _permute_feature, FeaturePermutation
6-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
6+
from tests.helpers import BaseTest
7+
from tests.helpers.basic import assertTensorAlmostEqual
78
from tests.helpers.basic_models import BasicModelWithSparseInputs
89
from torch import Tensor
910

tests/attr/test_gradient_shap.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
from captum.attr._core.gradient_shap import GradientShap
99
from captum.attr._core.integrated_gradients import IntegratedGradients
1010
from numpy import ndarray
11-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
11+
from tests.helpers import BaseTest
12+
from tests.helpers.basic import assertTensorAlmostEqual
1213
from tests.helpers.basic_models import BasicLinearModel, BasicModel2
1314
from tests.helpers.classification_models import SoftmaxModel
1415

tests/attr/test_guided_backprop.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
from captum.attr._core.neuron.neuron_guided_backprop_deconvnet import (
1010
NeuronGuidedBackprop,
1111
)
12-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
12+
from tests.helpers import BaseTest
13+
from tests.helpers.basic import assertTensorAlmostEqual
1314
from tests.helpers.basic_models import BasicModel_ConvNet_One_Conv
1415
from torch.nn import Module
1516

tests/attr/test_guided_grad_cam.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
import torch
77
from captum._utils.typing import TensorOrTupleOfTensorsGeneric
88
from captum.attr._core.guided_grad_cam import GuidedGradCam
9-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
9+
from tests.helpers import BaseTest
10+
from tests.helpers.basic import assertTensorAlmostEqual
1011
from tests.helpers.basic_models import BasicModel_ConvNet_One_Conv
1112
from torch import Tensor
1213
from torch.nn import Module

tests/attr/test_hook_removal.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
should_create_generated_test,
1515
)
1616
from tests.attr.helpers.test_config import config
17-
from tests.helpers.basic import BaseTest, deep_copy_args
17+
from tests.helpers import BaseTest
18+
from tests.helpers.basic import deep_copy_args
1819
from torch.nn import Module
1920

2021
"""

tests/attr/test_input_x_gradient.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
from captum.attr._core.input_x_gradient import InputXGradient
77
from captum.attr._core.noise_tunnel import NoiseTunnel
88
from tests.attr.test_saliency import _get_basic_config, _get_multiargs_basic_config
9-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
9+
from tests.helpers import BaseTest
10+
from tests.helpers.basic import assertTensorAlmostEqual
1011
from tests.helpers.classification_models import SoftmaxModel
1112
from torch import Tensor
1213
from torch.nn import Module

tests/attr/test_integrated_gradients_basic.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
from captum.attr._core.integrated_gradients import IntegratedGradients
1010
from captum.attr._core.noise_tunnel import NoiseTunnel
1111
from captum.attr._utils.common import _tensorize_baseline
12-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
12+
from tests.helpers import BaseTest
13+
from tests.helpers.basic import assertTensorAlmostEqual
1314
from tests.helpers.basic_models import (
1415
BasicModel,
1516
BasicModel2,

tests/attr/test_integrated_gradients_classification.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
from captum._utils.typing import BaselineType, Tensor
77
from captum.attr._core.integrated_gradients import IntegratedGradients
88
from captum.attr._core.noise_tunnel import NoiseTunnel
9-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
9+
from tests.helpers import BaseTest
10+
from tests.helpers.basic import assertTensorAlmostEqual
1011
from tests.helpers.classification_models import SigmoidModel, SoftmaxModel
1112
from torch.nn import Module
1213

tests/attr/test_interpretable_input.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import torch
44
from captum.attr._utils.interpretable_input import TextTemplateInput, TextTokenInput
55
from parameterized import parameterized
6-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
6+
from tests.helpers import BaseTest
7+
from tests.helpers.basic import assertTensorAlmostEqual
78
from torch import Tensor
89

910

tests/attr/test_llm_attr.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
from captum.attr._core.shapley_value import ShapleyValueSampling
1414
from captum.attr._utils.interpretable_input import TextTemplateInput, TextTokenInput
1515
from parameterized import parameterized, parameterized_class
16-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
16+
from tests.helpers import BaseTest
17+
from tests.helpers.basic import assertTensorAlmostEqual
1718
from torch import nn, Tensor
1819

1920

tests/attr/test_lrp.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
GammaRule,
1111
IdentityRule,
1212
)
13-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
13+
from tests.helpers import BaseTest
14+
from tests.helpers.basic import assertTensorAlmostEqual
1415
from tests.helpers.basic_models import (
1516
BasicModel_ConvNet_One_Conv,
1617
BasicModel_MultiLayer,

tests/attr/test_occlusion.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
TensorOrTupleOfTensorsGeneric,
1313
)
1414
from captum.attr._core.occlusion import Occlusion
15-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
15+
from tests.helpers import BaseTest
16+
from tests.helpers.basic import assertTensorAlmostEqual
1617
from tests.helpers.basic_models import (
1718
BasicModel3,
1819
BasicModel_ConvNet_One_Conv,

tests/attr/test_stat.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
import torch
66
from captum.attr import Max, Mean, Min, MSE, StdDev, Sum, Summarizer, Var
7-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
7+
from tests.helpers import BaseTest
8+
from tests.helpers.basic import assertTensorAlmostEqual
89

910

1011
def get_values(n: int = 100, lo=None, hi=None, integers: bool = False):

tests/attr/test_summarizer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python3
22
import torch
33
from captum.attr import CommonStats, Summarizer
4-
from tests.helpers.basic import BaseTest
4+
from tests.helpers import BaseTest
55

66

77
class Test(BaseTest):

tests/attr/test_utils_batching.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
_batched_operator,
77
_tuple_splice_range,
88
)
9-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
9+
from tests.helpers import BaseTest
10+
from tests.helpers.basic import assertTensorAlmostEqual
1011

1112

1213
class Test(BaseTest):

tests/concept/test_concept.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import torch
66
from captum.concept._core.concept import Concept
77
from captum.concept._utils.data_iterator import dataset_to_dataloader
8-
from tests.helpers.basic import BaseTest
8+
from tests.helpers import BaseTest
99
from torch.utils.data import IterableDataset
1010

1111

tests/concept/test_tcav.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
from captum.concept._utils.classifier import Classifier
2727
from captum.concept._utils.common import concepts_to_str
2828
from captum.concept._utils.data_iterator import dataset_to_dataloader
29-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
29+
from tests.helpers import BaseTest
30+
from tests.helpers.basic import assertTensorAlmostEqual
3031
from tests.helpers.basic_models import BasicModel_ConvNet
3132
from torch import Tensor
3233
from torch.utils.data import DataLoader, IterableDataset

tests/helpers/__init__.py

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/usr/bin/env python3
2+
3+
try:
4+
from tests.helpers.fb.internal_base import FbBaseTest as BaseTest
5+
6+
__all__ = [
7+
"BaseTest",
8+
]
9+
10+
except ImportError:
11+
from tests.helpers.basic import BaseTest

tests/helpers/basic.py

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import copy
33
import random
44
import unittest
5+
56
from typing import Callable
67

78
import numpy as np

tests/influence/_core/test_arnoldi_influence.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
_unflatten_params_factory,
1818
)
1919
from parameterized import parameterized
20-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
20+
from tests.helpers import BaseTest
21+
from tests.helpers.basic import assertTensorAlmostEqual
2122
from tests.influence._utils.common import (
2223
_format_batch_into_tuple,
2324
build_test_name_func,

tests/influence/_core/test_dataloader.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
TracInCPFastRandProj,
99
)
1010
from parameterized import parameterized
11-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
11+
from tests.helpers import BaseTest
12+
from tests.helpers.basic import assertTensorAlmostEqual
1213
from tests.influence._utils.common import (
1314
_format_batch_into_tuple,
1415
build_test_name_func,

tests/influence/_core/test_naive_influence.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@
1313
_unflatten_params_factory,
1414
)
1515
from parameterized import parameterized
16-
from tests.helpers.basic import (
17-
assertTensorAlmostEqual,
18-
assertTensorTuplesAlmostEqual,
19-
BaseTest,
20-
)
16+
from tests.helpers import BaseTest
17+
from tests.helpers.basic import assertTensorAlmostEqual, assertTensorTuplesAlmostEqual
2118
from tests.influence._utils.common import (
2219
_format_batch_into_tuple,
2320
build_test_name_func,

tests/influence/_core/test_similarity_influence.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
euclidean_distance,
99
SimilarityInfluence,
1010
)
11-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
11+
from tests.helpers import BaseTest
12+
from tests.helpers.basic import assertTensorAlmostEqual
1213
from torch.utils.data import Dataset
1314

1415

tests/influence/_core/test_tracin_intermediate_quantities.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
TracInCPFastRandProj,
1313
)
1414
from parameterized import parameterized
15-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
15+
from tests.helpers import BaseTest
16+
from tests.helpers.basic import assertTensorAlmostEqual
1617
from tests.influence._utils.common import (
1718
_format_batch_into_tuple,
1819
build_test_name_func,

tests/influence/_core/test_tracin_k_most_influential.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
from captum.influence._core.tracincp import TracInCP
77

88
from parameterized import parameterized
9-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
9+
from tests.helpers import BaseTest
10+
from tests.helpers.basic import assertTensorAlmostEqual
1011
from tests.influence._utils.common import (
1112
_format_batch_into_tuple,
1213
build_test_name_func,

tests/influence/_core/test_tracin_regression.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
TracInCPFastRandProj,
1313
)
1414
from parameterized import parameterized
15-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
15+
from tests.helpers import BaseTest
16+
from tests.helpers.basic import assertTensorAlmostEqual
1617
from tests.influence._utils.common import (
1718
_isSorted,
1819
_wrap_model_in_dataparallel,

tests/influence/_core/test_tracin_self_influence.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
from captum.influence._core.tracincp import TracInCP, TracInCPBase
99
from captum.influence._core.tracincp_fast_rand_proj import TracInCPFast
1010
from parameterized import parameterized
11-
from tests.helpers.basic import assertTensorAlmostEqual, BaseTest
11+
from tests.helpers import BaseTest
12+
from tests.helpers.basic import assertTensorAlmostEqual
1213
from tests.influence._utils.common import (
1314
_format_batch_into_tuple,
1415
build_test_name_func,

tests/influence/_core/test_tracin_show_progress.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from captum.influence._core.tracincp import TracInCP
88
from captum.influence._core.tracincp_fast_rand_proj import TracInCPFast
99
from parameterized import parameterized
10-
from tests.helpers.basic import BaseTest
10+
from tests.helpers import BaseTest
1111
from tests.influence._utils.common import (
1212
build_test_name_func,
1313
DataInfluenceConstructor,

tests/influence/_core/test_tracin_validation.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from captum.influence._core.tracincp_fast_rand_proj import TracInCPFast
77

88
from parameterized import parameterized
9-
from tests.helpers.basic import BaseTest
9+
from tests.helpers import BaseTest
1010
from tests.influence._utils.common import (
1111
build_test_name_func,
1212
DataInfluenceConstructor,

0 commit comments

Comments
 (0)