chore: remove clip_hg (#786)

* chore: remove clip_hg * fix: add dependency for m-clip * fix: transformers version * fix: modify dependency key * fix: update requirements Co-authored-by: felix-wang <[email protected]> * fix: update requirements Co-authored-by: felix-wang <[email protected]> * fix: update requirements Co-authored-by: felix-wang <[email protected]> * fix: tmp set grpcio version Co-authored-by: felix-wang <[email protected]>
jina-ai · Jul 29, 2022 · c458dd6 · c458dd6
1 parent 1db43b4
commit c458dd6
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 307 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -42,7 +42,7 @@ jobs:
           python -m pip install wheel
           pip install --no-cache-dir "client/[test]"
           pip install --no-cache-dir "server/[onnx]"
-          pip install --no-cache-dir "server/[huggingface]"
+          pip install --no-cache-dir "server/[transformers]"
       - name: Test
         id: test
         run: |

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -114,7 +114,7 @@ jobs:
           python -m pip install wheel pytest pytest-cov
           pip install --no-cache-dir "client/[test]"
           pip install --no-cache-dir "server/[onnx]"
-          pip install --no-cache-dir "server/[huggingface]"
+          pip install --no-cache-dir "server/[transformers]"
       - name: Test
         id: test
         run: |

diff --git a/server/clip_server/executors/clip_hg.py b/server/clip_server/executors/clip_hg.py
diff --git a/server/clip_server/hg-flow.yml b/server/clip_server/hg-flow.yml
diff --git a/server/setup.py b/server/setup.py
@@ -50,6 +50,9 @@
         'jina>=3.6.0',
         'prometheus-client',
         'open_clip_torch>=1.3.0',
+        'grpcio>=1.46.0,<1.48.0',  # tmp requires
+        'grpcio-reflection>=1.46.0,<1.48.0',  # tmp requires
+        'grpcio-health-checking>=1.46.0,<1.48.0',  # tmp requires
     ],
     extras_require={
         'onnx': [
@@ -58,7 +61,7 @@
         ]
         + (['onnxruntime-gpu>=1.8.0'] if sys.platform != 'darwin' else []),
         'tensorrt': ['nvidia-tensorrt'],
-        'huggingface': ['transformers>=4.16.2'],
+        'transformers': ['transformers>=4.16.2'],
     },
     classifiers=[
         'Development Status :: 5 - Production/Stable',

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -16,15 +16,13 @@ def random_port():
     return random_port
 
 
-@pytest.fixture(scope='session', params=['onnx', 'torch', 'hg', 'onnx_custom'])
+@pytest.fixture(scope='session', params=['onnx', 'torch', 'onnx_custom'])
 def make_flow(port_generator, request):
     if request.param != 'onnx_custom':
         if request.param == 'onnx':
             from clip_server.executors.clip_onnx import CLIPEncoder
-        elif request.param == 'torch':
-            from clip_server.executors.clip_torch import CLIPEncoder
         else:
-            from clip_server.executors.clip_hg import CLIPEncoder
+            from clip_server.executors.clip_torch import CLIPEncoder
 
         f = Flow(port=port_generator()).add(name=request.param, uses=CLIPEncoder)
     else:
@@ -56,25 +54,3 @@ def make_trt_flow(port_generator, request):
     f = Flow(port=port_generator()).add(name=request.param, uses=CLIPEncoder)
     with f:
         yield f
-
-
-@pytest.fixture(scope='session', params=['hg'])
-def make_hg_flow(port_generator, request):
-    from clip_server.executors.clip_hg import CLIPEncoder
-
-    f = Flow(port=port_generator()).add(name=request.param, uses=CLIPEncoder)
-    with f:
-        yield f
-
-
-@pytest.fixture(scope='session', params=['hg'])
-def make_hg_flow_no_default(port_generator, request):
-    from clip_server.executors.clip_hg import CLIPEncoder
-
-    f = Flow(port=port_generator()).add(
-        name=request.param,
-        uses=CLIPEncoder,
-        uses_with={'preprocessing': False},
-    )
-    with f:
-        yield f
diff --git a/tests/test_hg.py b/tests/test_hg.py