Merge pull request #636 from Trusted-AI/development_issue_632

beat-buesser · web-flow · commit 39f54308ad50 · 2020-10-02T12:44:06.000+01:00
Revert module name
diff --git a/art/defences/detector/__init__.py b/art/defences/detector/__init__.py
@@ -2,4 +2,4 @@
 Module implementing detector-based defences against adversarial attacks.
 """
 from art.defences.detector import evasion
-from art.defences.detector import poisoning
+from art.defences.detector import poison
diff --git a/art/defences/detector/poison/__init__.py b/art/defences/detector/poison/__init__.py
@@ -0,0 +1,10 @@
+"""
+Module implementing detector-based defences against poisoning attacks.
+"""
+from art.defences.detector.poison.poison_filtering_defence import PoisonFilteringDefence
+from art.defences.detector.poison.ground_truth_evaluator import GroundTruthEvaluator
+from art.defences.detector.poison.activation_defence import ActivationDefence
+from art.defences.detector.poison.clustering_analyzer import ClusteringAnalyzer
+from art.defences.detector.poison.provenance_defense import ProvenanceDefense
+from art.defences.detector.poison.roni import RONIDefense
+from art.defences.detector.poison.spectral_signature_defense import SpectralSignatureDefense
diff --git a/art/defences/detector/poison/activation_defence.py b/art/defences/detector/poison/activation_defence.py
@@ -38,9 +38,9 @@
 
 from art.config import ART_DATA_PATH
 from art.data_generators import DataGenerator
-from art.defences.detector.poisoning.clustering_analyzer import ClusteringAnalyzer
-from art.defences.detector.poisoning.ground_truth_evaluator import GroundTruthEvaluator
-from art.defences.detector.poisoning.poison_filtering_defence import PoisonFilteringDefence
+from art.defences.detector.poison.clustering_analyzer import ClusteringAnalyzer
+from art.defences.detector.poison.ground_truth_evaluator import GroundTruthEvaluator
+from art.defences.detector.poison.poison_filtering_defence import PoisonFilteringDefence
 from art.utils import segment_by_class
 from art.visualization import create_sprite, save_image, plot_3d
 
diff --git a/art/defences/detector/poison/clustering_analyzer.py b/art/defences/detector/poison/clustering_analyzer.py
diff --git a/art/defences/detector/poison/ground_truth_evaluator.py b/art/defences/detector/poison/ground_truth_evaluator.py
diff --git a/art/defences/detector/poison/poison_filtering_defence.py b/art/defences/detector/poison/poison_filtering_defence.py
diff --git a/art/defences/detector/poison/provenance_defense.py b/art/defences/detector/poison/provenance_defense.py
@@ -29,8 +29,8 @@
 import numpy as np
 from sklearn.model_selection import train_test_split
 
-from art.defences.detector.poisoning.ground_truth_evaluator import GroundTruthEvaluator
-from art.defences.detector.poisoning.poison_filtering_defence import PoisonFilteringDefence
+from art.defences.detector.poison.ground_truth_evaluator import GroundTruthEvaluator
+from art.defences.detector.poison.poison_filtering_defence import PoisonFilteringDefence
 from art.utils import segment_by_class, performance_diff
 
 if TYPE_CHECKING:
diff --git a/art/defences/detector/poison/roni.py b/art/defences/detector/poison/roni.py
@@ -30,8 +30,8 @@
 import numpy as np
 from sklearn.model_selection import train_test_split
 
-from art.defences.detector.poisoning.ground_truth_evaluator import GroundTruthEvaluator
-from art.defences.detector.poisoning.poison_filtering_defence import PoisonFilteringDefence
+from art.defences.detector.poison.ground_truth_evaluator import GroundTruthEvaluator
+from art.defences.detector.poison.poison_filtering_defence import PoisonFilteringDefence
 from art.utils import performance_diff
 
 if TYPE_CHECKING:
diff --git a/art/defences/detector/poison/spectral_signature_defense.py b/art/defences/detector/poison/spectral_signature_defense.py
@@ -29,8 +29,8 @@
 
 import numpy as np
 
-from art.defences.detector.poisoning.ground_truth_evaluator import GroundTruthEvaluator
-from art.defences.detector.poisoning.poison_filtering_defence import PoisonFilteringDefence
+from art.defences.detector.poison.ground_truth_evaluator import GroundTruthEvaluator
+from art.defences.detector.poison.poison_filtering_defence import PoisonFilteringDefence
 
 if TYPE_CHECKING:
     from art.utils import CLASSIFIER_NEURALNETWORK_TYPE
diff --git a/art/defences/detector/poisoning/__init__.py b/art/defences/detector/poisoning/__init__.py
diff --git a/examples/mnist_poison_detection.py b/examples/mnist_poison_detection.py
@@ -13,7 +13,7 @@
 from art.attacks.poisoning.perturbations.image_perturbations import add_pattern_bd, add_single_bd
 from art.estimators.classification import KerasClassifier
 from art.utils import load_mnist, preprocess
-from art.defences.detector.poisoning import ActivationDefence
+from art.defences.detector.poison import ActivationDefence
 
 
 def main():
diff --git a/notebooks/poisoning_attack_embedding.ipynb b/notebooks/poisoning_attack_embedding.ipynb
@@ -44,7 +44,7 @@
     "from art.attacks.poisoning import PoisoningAttackBackdoor, PoisoningAttackAdversarialEmbedding\n",
     "from art.attacks.poisoning.perturbations import add_pattern_bd\n",
     "from art.utils import load_mnist, preprocess, to_categorical\n",
-    "from art.defences.detector.poisoning import ActivationDefence\n"
+    "from art.defences.detector.poison import ActivationDefence\n"
    ]
   },
   {
diff --git a/notebooks/poisoning_dataset_mnist.ipynb b/notebooks/poisoning_dataset_mnist.ipynb
@@ -49,7 +49,7 @@
     "from art.attacks.poisoning import PoisoningAttackBackdoor\n",
     "from art.attacks.poisoning.perturbations import add_pattern_bd, add_single_bd, insert_image\n",
     "from art.utils import load_mnist, preprocess\n",
-    "from art.defences.detector.poisoning import ActivationDefence\n"
+    "from art.defences.detector.poison import ActivationDefence\n"
    ]
   },
   {
diff --git a/notebooks/poisoning_defense_neural_cleanse.ipynb b/notebooks/poisoning_defense_neural_cleanse.ipynb
@@ -53,7 +53,7 @@
     "from art.attacks.poisoning import PoisoningAttackBackdoor\n",
     "from art.attacks.poisoning.perturbations import add_pattern_bd, add_single_bd, insert_image\n",
     "from art.utils import load_mnist, preprocess\n",
-    "from art.defences.detector.poisoning import ActivationDefence\n",
+    "from art.defences.detector.poison import ActivationDefence\n",
     "from art.defences.transformer.poisoning import NeuralCleanse\n",
     "from art.estimators.certification.neural_cleanse import KerasNeuralCleanse\n"
    ]
diff --git a/notebooks/provenance_defence.ipynb b/notebooks/provenance_defence.ipynb
@@ -28,7 +28,7 @@
     "\n",
     "from art.attacks.poisoning.poisoning_attack_svm import PoisoningAttackSVM\n",
     "from art.estimators.classification.scikitlearn import ScikitlearnSVC\n",
-    "from art.defences.detector.poisoning import ProvenanceDefense, RONIDefense\n",
+    "from art.defences.detector.poison import ProvenanceDefense, RONIDefense\n",
     "from art.utils import load_mnist\n",
     "from sklearn.svm import SVC\n",
     "import numpy as np\n",
diff --git a/tests/defences/detector/poison/test_activation_defence.py b/tests/defences/detector/poison/test_activation_defence.py
@@ -24,7 +24,7 @@
 import numpy as np
 
 from art.data_generators import KerasDataGenerator
-from art.defences.detector.poisoning import ActivationDefence
+from art.defences.detector.poison import ActivationDefence
 from art.utils import load_mnist
 from art.visualization import convert_to_rgb
 
diff --git a/tests/defences/detector/poison/test_clustering_analyzer.py b/tests/defences/detector/poison/test_clustering_analyzer.py
@@ -22,7 +22,7 @@
 
 import numpy as np
 
-from art.defences.detector.poisoning import ClusteringAnalyzer
+from art.defences.detector.poison import ClusteringAnalyzer
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/defences/detector/poison/test_ground_truth_evaluator.py b/tests/defences/detector/poison/test_ground_truth_evaluator.py
@@ -22,7 +22,7 @@
 import pprint
 import unittest
 
-from art.defences.detector.poisoning import GroundTruthEvaluator
+from art.defences.detector.poison import GroundTruthEvaluator
 
 from tests.utils import master_seed
 
diff --git a/tests/defences/detector/poison/test_provenance_defence.py b/tests/defences/detector/poison/test_provenance_defence.py
@@ -25,7 +25,7 @@
 
 from art.attacks.poisoning.poisoning_attack_svm import PoisoningAttackSVM
 from art.estimators.classification.scikitlearn import SklearnClassifier, ScikitlearnSVC
-from art.defences.detector.poisoning.provenance_defense import ProvenanceDefense
+from art.defences.detector.poison.provenance_defense import ProvenanceDefense
 from art.utils import load_mnist
 
 from tests.utils import master_seed
diff --git a/tests/defences/detector/poison/test_roni.py b/tests/defences/detector/poison/test_roni.py
@@ -25,7 +25,7 @@
 
 from art.attacks.poisoning.poisoning_attack_svm import PoisoningAttackSVM
 from art.estimators.classification.scikitlearn import SklearnClassifier, ScikitlearnSVC
-from art.defences.detector.poisoning.roni import RONIDefense
+from art.defences.detector.poison.roni import RONIDefense
 from art.utils import load_mnist
 
 from tests.utils import master_seed
diff --git a/tests/defences/detector/poison/test_spectral_signature_defense.py b/tests/defences/detector/poison/test_spectral_signature_defense.py
@@ -22,7 +22,7 @@
 
 import numpy as np
 
-from art.defences.detector.poisoning import SpectralSignatureDefense
+from art.defences.detector.poison import SpectralSignatureDefense
 from art.utils import load_mnist
 
 from tests.utils import master_seed
