Merge pull request #1716 from roboflow/fix-exp-tests

Fix exp integration tests / re-enable clip baseline tests

Author: hansent

inference_experimental/tests/integration_tests/e2e/test_clip_e2e.py

@@ -18,9 +18,6 @@ def clip_model_name() -> str:
     return "RN50"
 
 
-@pytest.mark.skip(
-    reason="Skipping clip reference model test because openai weights hosted on azure are not available"
-)
 @pytest.fixture(scope="module")
 def baseline_clip_model(clip_model_name: str):
     original_clip_dir = os.path.join(ASSETS_DIR, "original_clip")
@@ -81,9 +78,6 @@ def clip_onnx_wrapper_small_batch(clip_model_name: str) -> AutoModel:
     return _get_clip_onnx_wrapper(clip_model_name=clip_model_name, max_batch_size=2)
 
 
-@pytest.mark.skip(
-    reason="Skipping clip reference model test because openai weights hosted on azure are not available"
-)
 def _test_clip_wrapper_vs_baseline_for_image_embeddings(
     clip_wrapper,
     baseline_clip_model,
@@ -110,9 +104,6 @@ def _test_clip_wrapper_vs_baseline_for_image_embeddings(
     assert similarity.item() > 0.99
 
 
-@pytest.mark.skip(
-    reason="Skipping clip reference model test because openai weights hosted on azure are not available"
-)
 @pytest.mark.e2e_model_inference
 @pytest.mark.parametrize("image_shape", [(224, 224), (320, 240), (448, 448)])
 def test_torch_clip_wrapper_vs_baseline_for_image_embeddings(
@@ -127,9 +118,6 @@ def test_torch_clip_wrapper_vs_baseline_for_image_embeddings(
     )
 
 
-@pytest.mark.skip(
-    reason="Skipping clip reference model test because openai weights hosted on azure are not available"
-)
 @pytest.mark.onnx_extras
 @pytest.mark.e2e_model_inference
 @pytest.mark.parametrize("image_shape", [(224, 224), (320, 240), (448, 448)])
@@ -145,9 +133,6 @@ def test_onnx_clip_wrapper_vs_baseline_for_image_embeddings(
     )
 
 
-@pytest.mark.skip(
-    reason="Skipping clip reference model test because openai weights hosted on azure are not available"
-)
 def _test_clip_wrapper_vs_baseline_for_text_embeddings(
     clip_wrapper,
     baseline_clip_model,
@@ -168,9 +153,6 @@ def _test_clip_wrapper_vs_baseline_for_text_embeddings(
     assert similarity.item() > 0.999
 
 
-@pytest.mark.skip(
-    reason="Skipping clip reference model test because openai weights hosted on azure are not available"
-)
 @pytest.mark.e2e_model_inference
 def test_torch_clip_wrapper_vs_baseline_for_text_embeddings(
     clip_torch_wrapper: AutoModel,
@@ -181,9 +163,6 @@ def test_torch_clip_wrapper_vs_baseline_for_text_embeddings(
     )
 
 
-@pytest.mark.skip(
-    reason="Skipping clip reference model test because openai weights hosted on azure are not available"
-)
 @pytest.mark.onnx_extras
 @pytest.mark.e2e_model_inference
 def test_onnx_clip_wrapper_vs_baseline_for_text_embeddings(

inference_experimental/tests/integration_tests/models/test_clip_predictions.py

@@ -1058,9 +1058,6 @@ def reference_clip_model(
         yield original_model, preprocess
 
 
-@pytest.mark.skip(
-    reason="Skipping clip reference model test because openai weights hosted on azure are not available"
-)
 @pytest.mark.slow
 @pytest.mark.torch_models
 def test_clip_torch_image_prediction_for_numpy(
@@ -1103,9 +1100,6 @@ def test_clip_torch_image_prediction_for_torch_tensor(
     )
 
 
-@pytest.mark.skip(
-    reason="Skipping clip reference model test because openai weights hosted on azure are not available"
-)
 @pytest.mark.slow
 @pytest.mark.torch_models
 def test_clip_predictions_for_image_are_comparable_with_reference_implementation(
@@ -1157,9 +1151,6 @@ def test_clip_torch_image_text_embeddings(
     assert tuple(embeddings.shape) == (4, 1024)
 
 
-@pytest.mark.skip(
-    reason="Skipping clip reference model test because openai weights hosted on azure are not available"
-)
 @pytest.mark.slow
 @pytest.mark.torch_models
 def test_clip_torch_image_text_embeddings_on_pair_with_reference_implementation(
@@ -1226,9 +1217,6 @@ def test_clip_onnx_image_prediction_for_torch_tensor(
     assert torch.allclose(embeddings, EXPECTED_DOG_IMAGE_EMBEDDING, atol=1e-3)
 
 
-@pytest.mark.skip(
-    reason="Skipping clip reference model test because openai weights hosted on azure are not available"
-)
 @pytest.mark.slow
 @pytest.mark.onnx_extras
 @pytest.mark.cpu_only
@@ -1287,9 +1275,6 @@ def test_clip_onnx_image_prediction_for_text(
     assert tuple(embeddings.shape) == (1, 1024)
 
 
-@pytest.mark.skip(
-    reason="Skipping clip reference model test because openai weights hosted on azure are not available"
-)
 @pytest.mark.slow
 @pytest.mark.onnx_extras
 @pytest.mark.cpu_only