fix parametrized model packages

Author: FynnBe

tests/build_spec/test_build_spec.py

@@ -68,16 +68,18 @@ def test_build_spec_torchscript(unet2d_nuclei_broad_model):
     _test_build_spec(unet2d_nuclei_broad_model, "pytorch_script")
 
 
-@pytest.mark.skipif(pytest.skip_frunet, reason="pending update to FruNet")
-def test_build_spec_keras(FruNet_model):
-    _test_build_spec(FruNet_model, "keras_hdf5", tensorflow_version="1.12")
+@pytest.mark.skipif(pytest.skip_tensorflow or pytest.tf_major_version != 1, reason="requires tensorflow 1")
+def test_build_spec_keras(any_keras_model):
+    _test_build_spec(any_keras_model, "keras_hdf5", tensorflow_version="1.12")  # todo: keras for tf 2??
 
 
-@pytest.mark.skipif(pytest.skip_frunet, reason="pending update to FruNet")
-def test_build_spec_tf(FruNet_model):
-    _test_build_spec(FruNet_model, "tensorflow_saved_model_bundle", tensorflow_version="1.12")
+@pytest.mark.skipif(pytest.skip_tensorflow, reason="requires tensorflow")
+def test_build_spec_tf(any_tensorflow_model):
+    _test_build_spec(
+        any_tensorflow_model, "tensorflow_saved_model_bundle", tensorflow_version="1.12"
+    )  # check tf version
 
 
-@pytest.mark.skipif(pytest.skip_frunet, reason="pending update to FruNet")
-def test_build_spec_tfjs(FruNet_model):
-    _test_build_spec(FruNet_model, "tensorflow_js", tensorflow_version="1.12")
+@pytest.mark.skipif(pytest.skip_tensorflow, reason="requires tensorflow")
+def test_build_spec_tfjs(any_tensorflow_js_model):
+    _test_build_spec(any_tensorflow_js_model, "tensorflow_js", tensorflow_version="1.12")

tests/conftest.py

@@ -8,6 +8,7 @@
 tensorflow1_models = ["FruNet_model"]
 tensorflow2_models = []
 keras_models = ["FruNet_model"]
+tensorflow_js_models = ["FruNet_model"]
 
 model_sources = {
     "unet2d_nuclei_broad_model": (
@@ -61,11 +62,13 @@ def pytest_configure():
     if not pytest.skip_onnx:
         load_packages |= set(onnx_models)
 
-    if not pytest.skip_tensorflow and pytest.tf_major_version == 1:
-        load_packages |= set(tensorflow1_models)
-
-    if not pytest.skip_tensorflow and pytest.tf_major_version == 2:
-        load_packages |= set(tensorflow2_models)
+    if not pytest.skip_tensorflow:
+        load_packages |= set(keras_models)
+        load_packages |= set(tensorflow_js_models)
+        if pytest.tf_major_version == 1:
+            load_packages |= set(tensorflow1_models)
+        elif pytest.tf_major_version == 2:
+            load_packages |= set(tensorflow2_models)
 
     pytest.model_packages = {name: export_resource_package(model_sources[name]) for name in load_packages}
 
@@ -105,18 +108,22 @@ def any_onnx_model(request):
     return pytest.model_packages[request.param]
 
 
-@pytest.fixture(params=tensorflow1_models)
-def any_tensorflow1_model(request):
-    return pytest.model_packages[request.param]
+@pytest.fixture(params=set(tensorflow1_models) | set(tensorflow2_models))
+def any_tensorflow_model(request):
+    name = request.param
+    if (pytest.tf_major_version == 1 and name in tensorflow1_models) or (
+        pytest.tf_major_version == 2 and name in tensorflow2_models
+    ):
+        return pytest.model_packages[name]
 
 
-@pytest.fixture(params=tensorflow2_models)
-def any_tensorflow2_model(request):
+@pytest.fixture(params=keras_models)
+def any_keras_model(request):
     return pytest.model_packages[request.param]
 
 
-@pytest.fixture(params=keras_models)
-def any_keras_model(request):
+@pytest.fixture(params=tensorflow_js_models)
+def any_tensorflow_js_model(request):
     return pytest.model_packages[request.param]