run on CI pipeline

GiulioZizzo · GiulioZizzo · commit a32d798a4d7c · 2023-11-21T14:18:32.000Z
Signed-off-by: GiulioZizzo &lt;giulio.zizzo@yahoo.co.uk&gt;
diff --git a/.github/workflows/ci-huggingface.yml b/.github/workflows/ci-huggingface.yml
@@ -16,7 +16,7 @@ on:
     branches:
       - main
       - dev*
-
+      - simple_pb_inclusion
   # Run scheduled CI flow daily
   schedule:
     - cron: '0 8 * * 0'
diff --git a/.github/workflows/ci-keras.yml b/.github/workflows/ci-keras.yml
@@ -16,6 +16,7 @@ on:
     branches:
       - main
       - dev*
+      - simple_pb_inclusion
 
   # Run scheduled CI flow daily
   schedule:
diff --git a/.github/workflows/ci-legacy.yml b/.github/workflows/ci-legacy.yml
@@ -16,6 +16,7 @@ on:
     branches:
       - main
       - dev*
+      - simple_pb_inclusion
 
   # Run scheduled CI flow daily
   schedule:
diff --git a/.github/workflows/ci-mxnet.yml b/.github/workflows/ci-mxnet.yml
@@ -16,6 +16,7 @@ on:
     branches:
       - main
       - dev*
+      - simple_pb_inclusion
 
   # Run scheduled CI flow daily
   schedule:
diff --git a/.github/workflows/ci-pytorch.yml b/.github/workflows/ci-pytorch.yml
@@ -16,7 +16,7 @@ on:
     branches:
       - main
       - dev*
-      - hf_notebook_updates
+      - simple_pb_inclusion
 
   # Run scheduled CI flow daily
   schedule:
diff --git a/.github/workflows/ci-scikit-learn.yml b/.github/workflows/ci-scikit-learn.yml
@@ -16,6 +16,7 @@ on:
     branches:
       - main
       - dev*
+      - simple_pb_inclusion
 
   # Run scheduled CI flow daily
   schedule:
diff --git a/.github/workflows/ci-style-checks.yml b/.github/workflows/ci-style-checks.yml
@@ -16,7 +16,7 @@ on:
     branches:
       - main
       - dev*
-      - hf_notebook_updates
+      - simple_pb_inclusion
 
   # Run scheduled CI flow daily
   schedule:
diff --git a/.github/workflows/ci-tensorflow-v1.yml b/.github/workflows/ci-tensorflow-v1.yml
@@ -16,7 +16,7 @@ on:
     branches:
       - main
       - dev*
-
+      - simple_pb_inclusion
   # Run scheduled CI flow daily
   schedule:
     - cron: '0 8 * * 0'
diff --git a/.github/workflows/ci-tensorflow-v2.yml b/.github/workflows/ci-tensorflow-v2.yml
@@ -16,7 +16,7 @@ on:
     branches:
       - main
       - dev*
-
+      - simple_pb_inclusion
   # Run scheduled CI flow daily
   schedule:
     - cron: '0 8 * * 0'
diff --git a/.github/workflows/ci-tf-faster-rcnn.yml b/.github/workflows/ci-tf-faster-rcnn.yml
@@ -16,6 +16,7 @@ on:
     branches:
       - main
       - dev*
+      - simple_pb_inclusion
 
   # Run scheduled CI flow daily
   schedule:
diff --git a/.github/workflows/ci-yolo.yml b/.github/workflows/ci-yolo.yml
@@ -16,6 +16,7 @@ on:
     branches:
       - main
       - dev*
+      - simple_pb_inclusion
 
   # Run scheduled CI flow daily
   schedule:
diff --git a/tests/estimators/classification/test_deeplearning_common.py b/tests/estimators/classification/test_deeplearning_common.py
@@ -192,7 +192,7 @@ def test_functional_model(art_warning, image_dl_estimator):
 
 
 @pytest.mark.skip_framework("mxnet", "non_dl_frameworks")
-def test_fit_kwargs(art_warning, image_dl_estimator, get_default_mnist_subset, default_batch_size):
+def test_fit_kwargs(art_warning, image_dl_estimator, get_default_mnist_subset, default_batch_size, framework):
     try:
         (x_train_mnist, y_train_mnist), (_, _) = get_default_mnist_subset
 
@@ -201,16 +201,27 @@ def get_lr(_):
 
         # Test a valid callback
         classifier, _ = image_dl_estimator(from_logits=True)
-        kwargs = {"callbacks": [LearningRateScheduler(get_lr)],
-                  "display_progress_bar": True}
-        classifier.fit(x_train_mnist, y_train_mnist, batch_size=default_batch_size, nb_epochs=1, **kwargs)
 
-        # Test failure for invalid parameters
-        kwargs = {"epochs": 1}
-        with pytest.raises(TypeError) as exception:
-            classifier.fit(x_train_mnist, y_train_mnist, batch_size=default_batch_size, nb_epochs=1, **kwargs)
+        # Keras fit has its own kwarg arguments
+        if framework in ["kerastf", "keras"]:
+            kwargs = {"callbacks": [LearningRateScheduler(get_lr)]}
+        else:
+            kwargs = {"callbacks": [LearningRateScheduler(get_lr)], "display_progress_bar": True}
+        classifier.fit(x_train_mnist, y_train_mnist, batch_size=default_batch_size, nb_epochs=1, **kwargs)
 
-        assert "multiple values for keyword argument" in str(exception)
+        # Test failure for invalid parameters: does not apply to many frameworks which allow arbitrary kwargs
+        if framework not in [
+            "tensorflow1",
+            "tensorflow2",
+            "tensorflow2v1",
+            "huggingface",
+            "pytorch",
+        ]:
+            kwargs = {"epochs": 1}
+            with pytest.raises(TypeError) as exception:
+                classifier.fit(x_train_mnist, y_train_mnist, batch_size=default_batch_size, nb_epochs=1, **kwargs)
+
+            assert "multiple values for keyword argument" in str(exception)
 
     except ARTTestException as e:
         art_warning(e)
