Change sklearn testing classifier to models

Signed-off-by: Beat Buesser <beat.buesser@ie.ibm.com>
Trusted-AI · Oct 1, 2020 · 20a5fec · 20a5fec
1 parent 06aaa2f
commit 20a5fec
Show file tree

Hide file tree

Showing 39 changed files with 37 additions and 23 deletions.
diff --git a/tests/utils.py b/tests/utils.py
@@ -1236,47 +1236,61 @@ def train_step(model, images, labels):
 
 
 def get_tabular_classifier_scikit_list(clipped=False):
-    model_list_names = [
-        "decisionTreeClassifier",
-        "extraTreeClassifier",
-        "adaBoostClassifier",
-        "baggingClassifier",
-        "extraTreesClassifier",
-        "gradientBoostingClassifier",
-        "randomForestClassifier",
-        "logisticRegression",
-        "svc",
-        "linearSVC",
-    ]
+
+    from art.estimators.classification.scikitlearn import (
+        ScikitlearnDecisionTreeClassifier,
+        ScikitlearnExtraTreeClassifier,
+        ScikitlearnAdaBoostClassifier,
+        ScikitlearnBaggingClassifier,
+        ScikitlearnExtraTreesClassifier,
+        ScikitlearnGradientBoostingClassifier,
+        ScikitlearnRandomForestClassifier,
+        ScikitlearnLogisticRegression,
+        ScikitlearnSVC,
+        ScikitlearnSVC,
+    )
+
+    model_list_names = {
+        "decisionTreeClassifier": ScikitlearnDecisionTreeClassifier,
+        # "extraTreeClassifier": ScikitlearnExtraTreeClassifier,
+        "adaBoostClassifier": ScikitlearnAdaBoostClassifier,
+        "baggingClassifier": ScikitlearnBaggingClassifier,
+        "extraTreesClassifier": ScikitlearnExtraTreesClassifier,
+        "gradientBoostingClassifier": ScikitlearnGradientBoostingClassifier,
+        "randomForestClassifier": ScikitlearnRandomForestClassifier,
+        "logisticRegression": ScikitlearnLogisticRegression,
+        "svc": ScikitlearnSVC,
+        "linearSVC": ScikitlearnSVC,
+    }
+
+    classifier_list = list()
+
     if clipped:
-        classifier_list = [
-            # os.path.join(os.path.dirname(os.path.dirname(__file__)),'utils/resources/models', 'W_DENSE3_IRIS.npy')
-            pickle.load(
+        for model_name, model_class in model_list_names.items():
+            model = pickle.load(
                 open(
                     os.path.join(
                         os.path.dirname(os.path.dirname(__file__)),
                         "utils/resources/models/scikit/",
-                        model_name + "iris_clipped.sav",
+                        "scikit-" + model_name + "-iris-clipped.pickle",
                     ),
                     "rb",
                 )
             )
-            for model_name in model_list_names
-        ]
+            classifier_list.append(model_class(model=model, clip_values=(0, 1)))
     else:
-        classifier_list = [
-            pickle.load(
+        for model_name, model_class in model_list_names.items():
+            model = pickle.load(
                 open(
                     os.path.join(
                         os.path.dirname(os.path.dirname(__file__)),
                         "utils/resources/models/scikit/",
-                        model_name + "iris_unclipped.sav",
+                        "scikit-" + model_name + "-iris-unclipped.pickle",
                     ),
                     "rb",
                 )
             )
-            for model_name in model_list_names
-        ]
+            classifier_list.append(model_class(model=model, clip_values=None))
 
     return classifier_list
 

diff --git a/utils/resources/models/scikit/adaBoostClassifieriris_clipped.sav b/utils/resources/models/scikit/adaBoostClassifieriris_clipped.sav
diff --git a/utils/resources/models/scikit/adaBoostClassifieriris_unclipped.sav b/utils/resources/models/scikit/adaBoostClassifieriris_unclipped.sav
diff --git a/utils/resources/models/scikit/baggingClassifieriris_clipped.sav b/utils/resources/models/scikit/baggingClassifieriris_clipped.sav
diff --git a/utils/resources/models/scikit/baggingClassifieriris_unclipped.sav b/utils/resources/models/scikit/baggingClassifieriris_unclipped.sav
diff --git a/utils/resources/models/scikit/decisionTreeClassifieriris_clipped.sav b/utils/resources/models/scikit/decisionTreeClassifieriris_clipped.sav
diff --git a/utils/resources/models/scikit/decisionTreeClassifieriris_unclipped.sav b/utils/resources/models/scikit/decisionTreeClassifieriris_unclipped.sav
diff --git a/utils/resources/models/scikit/extraTreeClassifieriris_clipped.sav b/utils/resources/models/scikit/extraTreeClassifieriris_clipped.sav
diff --git a/utils/resources/models/scikit/extraTreeClassifieriris_unclipped.sav b/utils/resources/models/scikit/extraTreeClassifieriris_unclipped.sav
diff --git a/utils/resources/models/scikit/gradientBoostingClassifieriris_clipped.sav b/utils/resources/models/scikit/gradientBoostingClassifieriris_clipped.sav
diff --git a/utils/resources/models/scikit/gradientBoostingClassifieriris_unclipped.sav b/utils/resources/models/scikit/gradientBoostingClassifieriris_unclipped.sav
diff --git a/utils/resources/models/scikit/linearSVCiris_clipped.sav b/utils/resources/models/scikit/linearSVCiris_clipped.sav
diff --git a/utils/resources/models/scikit/linearSVCiris_unclipped.sav b/utils/resources/models/scikit/linearSVCiris_unclipped.sav
diff --git a/utils/resources/models/scikit/logisticRegressioniris_clipped.sav b/utils/resources/models/scikit/logisticRegressioniris_clipped.sav
diff --git a/utils/resources/models/scikit/logisticRegressioniris_unclipped.sav b/utils/resources/models/scikit/logisticRegressioniris_unclipped.sav
diff --git a/utils/resources/models/scikit/randomForestClassifieriris_clipped.sav b/utils/resources/models/scikit/randomForestClassifieriris_clipped.sav
diff --git a/utils/resources/models/scikit/randomForestClassifieriris_unclipped.sav b/utils/resources/models/scikit/randomForestClassifieriris_unclipped.sav
diff --git a/utils/resources/models/scikit/scikit-adaBoostClassifier-iris-clipped.pickle b/utils/resources/models/scikit/scikit-adaBoostClassifier-iris-clipped.pickle
diff --git a/utils/resources/models/scikit/scikit-adaBoostClassifier-iris-unclipped.pickle b/utils/resources/models/scikit/scikit-adaBoostClassifier-iris-unclipped.pickle
diff --git a/utils/resources/models/scikit/scikit-baggingClassifier-iris-clipped.pickle b/utils/resources/models/scikit/scikit-baggingClassifier-iris-clipped.pickle
diff --git a/utils/resources/models/scikit/scikit-baggingClassifier-iris-unclipped.pickle b/utils/resources/models/scikit/scikit-baggingClassifier-iris-unclipped.pickle
diff --git a/utils/resources/models/scikit/scikit-decisionTreeClassifier-iris-clipped.pickle b/utils/resources/models/scikit/scikit-decisionTreeClassifier-iris-clipped.pickle
diff --git a/utils/resources/models/scikit/scikit-decisionTreeClassifier-iris-unclipped.pickle b/utils/resources/models/scikit/scikit-decisionTreeClassifier-iris-unclipped.pickle
diff --git a/utils/resources/models/scikit/scikit-extraTreeClassifier-iris-clipped.pickle b/utils/resources/models/scikit/scikit-extraTreeClassifier-iris-clipped.pickle
diff --git a/utils/resources/models/scikit/scikit-extraTreeClassifier-iris-unclipped.pickle b/utils/resources/models/scikit/scikit-extraTreeClassifier-iris-unclipped.pickle
diff --git a/...ikit/extraTreesClassifieriris_clipped.sav → ...-extraTreesClassifier-iris-clipped.pickle b/...ikit/extraTreesClassifieriris_clipped.sav → ...-extraTreesClassifier-iris-clipped.pickle
diff --git a/...it/extraTreesClassifieriris_unclipped.sav → ...xtraTreesClassifier-iris-unclipped.pickle b/...it/extraTreesClassifieriris_unclipped.sav → ...xtraTreesClassifier-iris-unclipped.pickle
diff --git a/utils/resources/models/scikit/scikit-gradientBoostingClassifier-iris-clipped.pickle b/utils/resources/models/scikit/scikit-gradientBoostingClassifier-iris-clipped.pickle
diff --git a/utils/resources/models/scikit/scikit-gradientBoostingClassifier-iris-unclipped.pickle b/utils/resources/models/scikit/scikit-gradientBoostingClassifier-iris-unclipped.pickle
diff --git a/utils/resources/models/scikit/scikit-linearSVC-iris-clipped.pickle b/utils/resources/models/scikit/scikit-linearSVC-iris-clipped.pickle
diff --git a/utils/resources/models/scikit/scikit-linearSVC-iris-unclipped.pickle b/utils/resources/models/scikit/scikit-linearSVC-iris-unclipped.pickle
diff --git a/utils/resources/models/scikit/scikit-logisticRegression-iris-clipped.pickle b/utils/resources/models/scikit/scikit-logisticRegression-iris-clipped.pickle
diff --git a/utils/resources/models/scikit/scikit-logisticRegression-iris-unclipped.pickle b/utils/resources/models/scikit/scikit-logisticRegression-iris-unclipped.pickle
diff --git a/utils/resources/models/scikit/scikit-randomForestClassifier-iris-clipped.pickle b/utils/resources/models/scikit/scikit-randomForestClassifier-iris-clipped.pickle
diff --git a/utils/resources/models/scikit/scikit-randomForestClassifier-iris-unclipped.pickle b/utils/resources/models/scikit/scikit-randomForestClassifier-iris-unclipped.pickle
diff --git a/utils/resources/models/scikit/scikit-svc-iris-clipped.pickle b/utils/resources/models/scikit/scikit-svc-iris-clipped.pickle
diff --git a/utils/resources/models/scikit/scikit-svc-iris-unclipped.pickle b/utils/resources/models/scikit/scikit-svc-iris-unclipped.pickle
diff --git a/utils/resources/models/scikit/svciris_clipped.sav b/utils/resources/models/scikit/svciris_clipped.sav
diff --git a/utils/resources/models/scikit/svciris_unclipped.sav b/utils/resources/models/scikit/svciris_unclipped.sav