Remove cambricon.js (#917)

lutzroeder · Sep 25, 2024 · 14d7d7e · 14d7d7e
1 parent 97bcd98
commit 14d7d7e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 35 deletions.
diff --git a/source/cambricon.js b/source/cambricon.js
diff --git a/source/view.js b/source/view.js
@@ -5777,9 +5777,9 @@ view.ModelFactoryService = class {
         this.register('./tvm', ['.json', '.params']);
         this.register('./modular', ['.maxviz']);
         this.register('./catboost', ['.cbm']);
-        this.register('./cambricon', ['.cambricon']);
         this.register('./weka', ['.model']);
         this.register('./qnn', ['.json', '.bin', '.serialized']);
+        this.register('', ['.cambricon']);
     }
 
     register(module, factories, containers) {
@@ -6289,7 +6289,9 @@ view.ModelFactoryService = class {
                 { name: 'BCNN model', value: /^BCNN/ },
                 { name: 'base64 data', value: /^gAAAAAB/ },
                 { name: 'Mathematica Notebook data', value: /^\(\*\sContent-type:\sapplication\/vnd\.wolfram\.mathematica\s\*\)/ },
-                { name: 'llama2.c checkpoint', value: /^..\x00\x00..\x00\x00..\x00\x00..\x00\x00..\x00\x00..\x00\x00..\x00\x00/, identifier: /^stories\d+[KM]\.bin/ }
+                { name: 'llama2.c checkpoint', value: /^..\x00\x00..\x00\x00..\x00\x00..\x00\x00..\x00\x00..\x00\x00..\x00\x00/, identifier: /^stories\d+[KM]\.bin/ },
+                { name: 'Cambricon model', value: /^\x7fMEF/ },
+                { name: 'Cambricon model', value: /^cambricon_offline/ }
             ];
             /* eslint-enable no-control-regex */
             const buffer = stream.peek(Math.min(4096, stream.length));

diff --git a/test/models.json b/test/models.json
@@ -888,15 +888,15 @@
     "target":   "deepsort_4c4b_bgr_270_v140.cambricon",
     "source":   "https://github.com/lutzroeder/netron/files/8783170/deepsort_4c4b_bgr_270_v140.cambricon.zip[deepsort_4c4b_bgr_270_v140.cambricon]",
     "format":   "Cambricon",
-    "error":    "File contains undocumented Cambricon data.",
+    "error":    "Invalid file content. File contains Cambricon model.",
     "link":     "https://github.com/lutzroeder/netron/issues/917"
   },
   {
     "type":     "cambricon",
     "target":   "SR_face_x3_530x530.cambricon",
     "source":   "https://github.com/lutzroeder/netron/files/8783172/SR_face_x3_530x530.cambricon.zip[SR_face_x3_530x530.cambricon]",
     "format":   "Cambricon",
-    "error":    "File contains undocumented Cambricon data.",
+    "error":    "Invalid file content. File contains Cambricon model.",
     "link":     "https://github.com/lutzroeder/netron/issues/917"
   },
   {