From 87928a7b8be9e8a4fce4d2352e82975252db162b Mon Sep 17 00:00:00 2001
From: Ziniu Yu <ziniuyu@gmail.com>
Date: Tue, 26 Jul 2022 17:08:04 +0800
Subject: [PATCH] feat: update onnx models and md5 (#785)

* fix: get correct model name

* fix: typo

* feat: new onnx models and md5

* fix: conflict

* fix: revert openai md5

* fix: remove unused size
---
 server/clip_server/model/clip_onnx.py | 70 +++++++++++++++++++++++----
 1 file changed, 60 insertions(+), 10 deletions(-)

diff --git a/server/clip_server/model/clip_onnx.py b/server/clip_server/model/clip_onnx.py
index b54d3192b..b01b19827 100644
--- a/server/clip_server/model/clip_onnx.py
+++ b/server/clip_server/model/clip_onnx.py
@@ -17,13 +17,22 @@
         ('RN50/textual.onnx', '722418bfe47a1f5c79d1f44884bb3103'),
         ('RN50/visual.onnx', '5761475db01c3abb68a5a805662dcd10'),
     ),
-    'RN50::yfcc15m': (),
-    'RN50::cc12m': (),
+    'RN50::yfcc15m': (
+        ('RN50-yfcc15m/textual.onnx', '4ff2ea7228b9d2337b5440d1955c2108'),
+        ('RN50-yfcc15m/visual.onnx', '87daa9b4a67449b5390a9a73b8c15772'),
+    ),
+    'RN50::cc12m': (
+        ('RN50-cc12m/textual.onnx', '78fa0ae0ea47aca4b8864f709c48dcec'),
+        ('RN50-cc12m/visual.onnx', '0e04bf92f3c181deea2944e322ebee77'),
+    ),
     'RN101::openai': (
         ('RN101/textual.onnx', '2d9efb7d184c0d68a369024cedfa97af'),
         ('RN101/visual.onnx', '0297ebc773af312faab54f8b5a622d71'),
     ),
-    'RN101::yfcc15m': (),
+    'RN101::yfcc15m': (
+        ('RN101-yfcc15m/textual.onnx', '7aa2a4e3d5b960998a397a6712389f08'),
+        ('RN101-yfcc15m/visual.onnx', '681a72dd91c9c79464947bf29b623cb4'),
+    ),
     'RN50x4::openai': (
         ('RN50x4/textual.onnx', 'd9d63d3fe35fb14d4affaa2c4e284005'),
         ('RN50x4/visual.onnx', '16afe1e35b85ad862e8bbdb12265c9cb'),
@@ -40,21 +49,62 @@
         ('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::laion2b_e16': (
+        ('ViT-B-32-laion2b_e16/textual.onnx', 'aa6eac88fe77d21f337e806417957497'),
+        ('ViT-B-32-laion2b_e16/visual.onnx', '0cdc00a9dfad560153d40aced9df0c8f'),
+    ),
+    'ViT-B-32::laion400m_e31': (
+        ('ViT-B-32-laion400m_e31/textual.onnx', '832f417bf1b3f1ced8f9958eda71665c'),
+        ('ViT-B-32-laion400m_e31/visual.onnx', '62326b925ae342313d4cc99c2741b313'),
+    ),
+    'ViT-B-32::laion400m_e32': (
+        ('ViT-B-32-laion400m_e32/textual.onnx', '93284915937ba42a2b52ae8d3e5283a0'),
+        ('ViT-B-32-laion400m_e32/visual.onnx', 'db220821a31fe9795fd8c2ba419078c5'),
+    ),
     '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-B-16::laion400m_e31': (
+        ('ViT-B-16-laion400m_e31/textual.onnx', '5db27763c06c06c727c90240264bf4f7'),
+        ('ViT-B-16-laion400m_e31/visual.onnx', '04a6a780d855a36eee03abca64cd5361'),
+    ),
+    'ViT-B-16::laion400m_e32': (
+        ('ViT-B-16-laion400m_e32/textual.onnx', '9abe000a51b6f1cbaac8fde601b16725'),
+        ('ViT-B-16-laion400m_e32/visual.onnx', 'd38c144ac3ad7fbc1966f88ff8fa522f'),
+    ),
+    'ViT-B-16-plus-240::laion400m_e31': (
+        (
+            'ViT-B-16-plus-240-laion400m_e31/textual.onnx',
+            '2b524e7a530a98010cc7e57756937c5c',
+        ),
+        (
+            'ViT-B-16-plus-240-laion400m_e31/visual.onnx',
+            'a78989da3300fd0c398a9877dd26a9f1',
+        ),
+    ),
+    'ViT-B-16-plus-240::laion400m_e32': (
+        (
+            'ViT-B-16-plus-240-laion400m_e32/textual.onnx',
+            '53c8d26726b386ca0749207876482907',
+        ),
+        (
+            'ViT-B-16-plus-240-laion400m_e32/visual.onnx',
+            '7a32c4272c1ee46f734486570d81584b',
+        ),
+    ),
     'ViT-L-14::openai': (
         ('ViT-L-14/textual.onnx', '325380b31af4837c2e0d9aba2fad8e1b'),
         ('ViT-L-14/visual.onnx', '53f5b319d3dc5d42572adea884e31056'),
     ),
+    'ViT-L-14::laion400m_e31': (
+        ('ViT-L-14-laion400m_e31/textual.onnx', '36216b85e32668ea849730a54e1e09a4'),
+        ('ViT-L-14-laion400m_e31/visual.onnx', '15fa5a24916e2a58325c5cf70350c300'),
+    ),
+    'ViT-L-14::laion400m_e32': (
+        ('ViT-L-14-laion400m_e32/textual.onnx', '8ba5b76ba71992923470c0261b10a67c'),
+        ('ViT-L-14-laion400m_e32/visual.onnx', '49db3ba92bd816001e932530ad92d76c'),
+    ),
     'ViT-L-14-336::openai': (
         ('ViT-L-14@336px/textual.onnx', '78fab479f136403eed0db46f3e9e7ed2'),
         ('ViT-L-14@336px/visual.onnx', 'f3b1f5d55ca08d43d749e11f7e4ba27e'),