test: remove unused test

jina-ai · Jul 25, 2022 · ff4bbb8 · ff4bbb8
1 parent 0365b0d
commit ff4bbb8
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 10 deletions.
diff --git a/server/clip_server/model/clip_onnx.py b/server/clip_server/model/clip_onnx.py
@@ -8,33 +8,60 @@
 )
 _S3_BUCKET_V2 = 'https://clip-as-service.s3.us-east-2.amazonaws.com/models-436c69702d61732d53657276696365/onnx/'
 _MODELS = {
-    'RN50::openai': ('RN50.pt', '9140964eaaf9f68c95aa8df6ca13777c'),
+    'RN50::openai': (
+        ('RN50/textual.onnx', '722418bfe47a1f5c79d1f44884bb3103'),
+        ('RN50/visual.onnx', '5761475db01c3abb68a5a805662dcd10'),
+    ),
     'RN50::yfcc15m': (),
     'RN50::cc12m': (),
     'RN50-quickgelu::openai': (),
     'RN50-quickgelu::yfcc15m': (),
     'RN50-quickgelu::cc12m': (),
-    'RN101::openai': ('RN101.pt', 'fa9d5f64ebf152bc56a18db245071014'),
+    'RN101::openai': (
+        ('RN101/textual.onnx', '2d9efb7d184c0d68a369024cedfa97af'),
+        ('RN101/visual.onnx', '0297ebc773af312faab54f8b5a622d71'),
+    ),
     'RN101::yfcc15m': (),
     'RN101-quickgelu::openai': (),
     'RN101-quickgelu::yfcc15m': (),
-    'RN50x4::openai': ('RN50x4.pt', '03830990bc768e82f7fb684cde7e5654'),
-    'RN50x16::openai': ('RN50x16.pt', '83d63878a818c65d0fb417e5fab1e8fe'),
-    'RN50x64::openai': ('RN50x64.pt', 'a6631a0de003c4075d286140fc6dd637'),
-    'ViT-B-32::openai': ('ViT-B-32.pt', '3ba34e387b24dfe590eeb1ae6a8a122b'),
+    'RN50x4::openai': (
+        ('RN50x4/textual.onnx', 'd9d63d3fe35fb14d4affaa2c4e284005'),
+        ('RN50x4/visual.onnx', '16afe1e35b85ad862e8bbdb12265c9cb'),
+    ),
+    'RN50x16::openai': (
+        ('RN50x16/textual.onnx', '1525785494ff5307cadc6bfa56db6274'),
+        ('RN50x16/visual.onnx', '2a293d9c3582f8abe29c9999e47d1091'),
+    ),
+    'RN50x64::openai': (
+        ('RN50x64/textual.onnx', '3ae8ade74578eb7a77506c11bfbfaf2c'),
+        ('RN50x64/visual.onnx', '1341f10b50b3aca6d2d5d13982cabcfc'),
+    ),
+    'ViT-B-32::openai': (
+        ('ViT-B-32/textual.onnx', 'bd6d7871e8bb95f3cc83aff3398d7390'),
+        ('ViT-B-32/visual.onnx', '88c6f38e522269d6c04a85df18e6370c'),
+    ),
     'ViT-B-32::laion2b_e16': (),
     'ViT-B-32::laion400m_e31': (),
     'ViT-B-32::laion400m_e32': (),
     'ViT-B-32-quickgelu::openai': (),
     'ViT-B-32-quickgelu::laion400m_e31': (),
     'ViT-B-32-quickgelu::laion400m_e32': (),
-    'ViT-B-16::openai': ('ViT-B-16.pt', '44c3d804ecac03d9545ac1a3adbca3a6'),
+    'ViT-B-16::openai': (
+        ('ViT-B-16/textual.onnx', '6f0976629a446f95c0c8767658f12ebe'),
+        ('ViT-B-16/visual.onnx', 'd5c03bfeef1abbd9bede54a8f6e1eaad'),
+    ),
     'ViT-B-16::laion400m_e31': (),
     'ViT-B-16::laion400m_e32': (),
     'ViT-B-16-plus-240::laion400m_e31': (),
     'ViT-B-16-plus-240::laion400m_e32': (),
-    'ViT-L-14::openai': ('ViT-L-14.pt', '096db1af569b284eb76b3881534822d9'),
-    'ViT-L-14-336::openai': ('ViT-L-14-336px.pt', 'b311058cae50cb10fbfa2a44231c9473'),
+    'ViT-L-14::openai': (
+        ('ViT-L-14/textual.onnx', '325380b31af4837c2e0d9aba2fad8e1b'),
+        ('ViT-L-14/visual.onnx', '53f5b319d3dc5d42572adea884e31056'),
+    ),
+    'ViT-L-14-336::openai': (
+        ('ViT-L-14@336px/textual.onnx', '78fab479f136403eed0db46f3e9e7ed2'),
+        ('ViT-L-14@336px/visual.onnx', 'f3b1f5d55ca08d43d749e11f7e4ba27e'),
+    ),
     # older version name format
     'RN50': (
         ('RN50/textual.onnx', '722418bfe47a1f5c79d1f44884bb3103'),

diff --git a/tests/test_model.py b/tests/test_model.py
@@ -8,7 +8,6 @@
     'name, model_cls',
     [
         ('ViT-L/14@336px', OpenCLIPModel),
-        ('RN101-quickgelu::openai', OpenCLIPModel),
         ('M-CLIP/XLM-Roberta-Large-Vit-B-32', MultilingualCLIPModel),
     ],
 )