rebase fix

neuralmagic · Aug 2, 2023 · d583fde · d583fde
1 parent 74a6e5b
commit d583fde
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/setup.py b/setup.py
@@ -171,7 +171,6 @@ def _parse_requirements_file(file_path):
 _torch_deps = ["torch>=1.7.0,<=2.0"]
 
 
-
 def _check_supported_system():
     if sys.platform.startswith("linux"):
         # linux is supported, allow install to go through

diff --git a/tests/deepsparse/pipelines/test_clip.py b/tests/deepsparse/pipelines/test_clip.py
@@ -72,16 +72,10 @@ def test_text_clip(engine, text_input):
 def test_zero_shot(engine, visual_input, text_input):
     model_path_text = text_input[-1]
     model_path_visual = visual_input[-1]
-<<<<<<< HEAD
     kwargs = {
         "visual_model_path": model_path_visual,
         "text_model_path": model_path_text,
     }
-=======
-    visual_args = {"model_path": model_path_visual}
-    text_args = {"model_path": model_path_text}
-    kwargs = {"visual_args": visual_args, "text_args": text_args}
->>>>>>> move paths to fixtures
     pipeline = BasePipeline.create(task="clip_zeroshot", **kwargs)
     assert isinstance(pipeline, CLIPZeroShotPipeline)
     pipeline_input = CLIPZeroShotInput(