Rename -operator.json to -metadata.json

setup.py

@@ -81,14 +81,14 @@ setuptools.setup(
         'netron': [ 
             'netron', 'netron.py',
             'logo.svg', 'favicon.ico', 'icon.png',
-            'onnx-model.js', 'onnx.js', 'onnx-operator.json',
-            'tf-model.js', 'tf.js', 'tf-operator.json',
-            'tflite-model.js', 'tflite.js', 'tflite-operator.json',
-            'keras-model.js', 'keras-operator.json', 'hdf5.js',
-            'coreml-model.js', 'coreml-operator.json', 'coreml.js',
-            'caffe-model.js', 'caffe-operator.json', 'caffe.js',
-            'caffe2-model.js', 'caffe2-operator.json', 'caffe2.js',
-            'mxnet-model.js', 'mxnet-operator.json',
+            'onnx-model.js', 'onnx.js', 'onnx-metadata.json',
+            'tf-model.js', 'tf.js', 'tf-metadata.json',
+            'tflite-model.js', 'tflite.js', 'tflite-metadata.json',
+            'keras-model.js', 'keras-metadata.json', 'hdf5.js',
+            'coreml-model.js', 'coreml-metadata.json', 'coreml.js',
+            'caffe-model.js', 'caffe-metadata.json', 'caffe.js',
+            'caffe2-model.js', 'caffe2-metadata.json', 'caffe2.js',
+            'mxnet-model.js', 'mxnet-metadata.json',
             'view-browser.html', 'view-browser.js',
             'view-render.css', 'view-render.js',
             'view-node.css', 'view-node.js',

src/caffe-model.js

@@ -473,7 +473,7 @@ class CaffeOperatorMetadata
             callback(null, CaffeOperatorMetadata.operatorMetadata);
         }
         else {
-            host.request('/caffe-operator.json', (err, data) => {
+            host.request('/caffe-metadata.json', (err, data) => {
                 CaffeOperatorMetadata.operatorMetadata = new CaffeOperatorMetadata(data);
                 callback(null, CaffeOperatorMetadata.operatorMetadata);
             });

src/caffe2-model.js

@@ -264,7 +264,7 @@ class Caffe2OperatorMetadata
             callback(null, Caffe2OperatorMetadata.operatorMetadata);
         }
         else {
-            host.request('/caffe2-operator.json', (err, data) => {
+            host.request('/caffe2-metadata.json', (err, data) => {
                 Caffe2OperatorMetadata.operatorMetadata = new Caffe2OperatorMetadata(data);
                 callback(null, Caffe2OperatorMetadata.operatorMetadata);
             });

src/coreml-model.js

@@ -704,7 +704,7 @@ class CoreMLOperatorMetadata
             callback(null, CoreMLOperatorMetadata.operatorMetadata);
         }
         else {
-            host.request('/coreml-operator.json', (err, data) => {
+            host.request('/coreml-metadata.json', (err, data) => {
                 CoreMLOperatorMetadata.operatorMetadata = new CoreMLOperatorMetadata(data);
                 callback(null, CoreMLOperatorMetadata.operatorMetadata);
             });

src/keras-model.js

@@ -654,7 +654,7 @@ class KerasOperatorMetadata {
             callback(null, KerasOperatorMetadata.operatorMetadata);
         }
         else {
-            host.request('/keras-operator.json', (err, data) => {
+            host.request('/keras-metadata.json', (err, data) => {
                 KerasOperatorMetadata.operatorMetadata = new KerasOperatorMetadata(data);
                 callback(null, KerasOperatorMetadata.operatorMetadata);
             });    

src/mxnet-model.js

@@ -305,7 +305,7 @@ class MXNetOperatorMetadata {
             callback(null, MXNetOperatorMetadata.operatorMetadata);
         }
         else {
-            host.request('/mxnet-operator.json', (err, data) => {
+            host.request('/mxnet-metadata.json', (err, data) => {
                 MXNetOperatorMetadata.operatorMetadata = new MXNetOperatorMetadata(data);
                 callback(null, MXNetOperatorMetadata.operatorMetadata);
             });

src/onnx-model.js

@@ -883,7 +883,7 @@ class OnnxOperatorMetadata {
             callback(null, OnnxOperatorMetadata.operatorMetadata);
         }
         else {
-            host.request('/onnx-operator.json', (err, data) => {
+            host.request('/onnx-metadata.json', (err, data) => {
                 OnnxOperatorMetadata.operatorMetadata = new OnnxOperatorMetadata(data);
                 callback(null, OnnxOperatorMetadata.operatorMetadata);
             });

src/tf-model.js

@@ -1067,7 +1067,7 @@ class TensorFlowOperatorMetadata {
             callback(null, TensorFlowOperatorMetadata.operatorMetadata);
         }
         else {
-            host.request('/tf-operator.json', (err, data) => {
+            host.request('/tf-metadata.json', (err, data) => {
                 TensorFlowOperatorMetadata.operatorMetadata = new TensorFlowOperatorMetadata(data);
                 callback(null, TensorFlowOperatorMetadata.operatorMetadata);
             });

src/tflite-model.js

@@ -572,7 +572,7 @@ class TensorFlowLiteOperatorMetadata {
             callback(null, TensorFlowLiteOperatorMetadata.operatorMetadata);
         }
         else {
-            host.request('/tflite-operator.json', (err, data) => {
+            host.request('/tflite-metadata.json', (err, data) => {
                 TensorFlowLiteOperatorMetadata.operatorMetadata = new TensorFlowLiteOperatorMetadata(data);
                 callback(null, TensorFlowLiteOperatorMetadata.operatorMetadata);
             });    

tools/caffe2-operator-json.py → tools/caffe2-metadata.py

@@ -11,7 +11,7 @@ import re
 import sys
 import caffe2.python.core
 
-json_file = '../src/caffe2-operator.json'
+json_file = '../src/caffe2-metadata.json'
 json_data = open(json_file).read()
 json_root = json.loads(json_data)
 

tools/caffe2-generate → tools/caffe2-update

@@ -33,5 +33,5 @@ cmake -DUSE_CUDA=OFF ..
 sudo make install
 popd > /dev/null
 
-echo "Generate '../src/caffe2-operator.json'"
-python caffe2-operator-json.py
+echo "Generate '../src/caffe2-metadata.json'"
+python caffe2-metadata.py

tools/keras-operator-json.py → tools/keras-metadata.py

@@ -210,7 +210,7 @@ def update_output(schema, description):
     if entry:
         entry['description'] = description
 
-json_file = '../src/keras-operator.json'
+json_file = '../src/keras-metadata.json'
 json_data = open(json_file).read()
 json_root = json.loads(json_data)
 

tools/keras-generate → tools/keras-update

@@ -18,5 +18,5 @@ else
     popd > /dev/null
 fi
 
-echo "Update '../src/keras-operator.json'"
-python keras-operator-json.py
+echo "Update '../src/keras-metadata.json'"
+python keras-metadata.py

tools/mxnet-operator-json.py → tools/mxnet-metadata.py

@@ -9,7 +9,7 @@ import pydoc
 import re
 import sys
 
-json_file = '../src/mxnet-operator.json'
+json_file = '../src/mxnet-metadata.json'
 json_data = open(json_file).read()
 json_root = json.loads(json_data)
 

tools/mxnet-generate → tools/mxnet-update

@@ -18,5 +18,5 @@ else
     popd > /dev/null
 fi
 
-# echo "Update '../src/mxnet-operator.json'"
-# python mxnet-operator-json.py
+# echo "Update '../src/mxnet-metadata.json'"
+# python mxnet-metadata.py

tools/onnx-operator-json.py → tools/onnx-metadata.py

@@ -218,4 +218,4 @@ def generate_json(schemas, json_file):
 
 if __name__ == '__main__':
     schemas = sorted(defs.get_all_schemas_with_history(), key=lambda schema: schema.name)
-    generate_json(schemas, '../src/onnx-operator.json')
+    generate_json(schemas, '../src/onnx-metadata.json')

tools/onnx-generate → tools/onnx-update

@@ -25,8 +25,8 @@ pushd "../third_party/onnx" > /dev/null
 python ./setup.py build --build-lib ./build/lib
 popd > /dev/null
 
-echo "Generate '../src/onnx-operator.json'"
-PYTHONPATH=../third_party/onnx/build/lib python onnx-operator-json.py
+echo "Generate '../src/onnx-metadata.json'"
+PYTHONPATH=../third_party/onnx/build/lib python onnx-metadata.py
 
 echo "Generate '../src/onnx.js'"
 sed 's/package ONNX_NAMESPACE/package onnx/g' <../third_party/onnx/onnx/onnx-ml.proto >./onnx-ml.proto

tools/tf-operator-json.py → tools/tf-metadata.py

@@ -252,7 +252,7 @@ for op in ops_list.op:
         'schema': json_schema 
     })
 
-json_file = '../src/tf-operator.json'
+json_file = '../src/tf-metadata.json'
 with io.open(json_file, 'w', newline='') as fout:
     json_data = json.dumps(json_root, sort_keys=True, indent=2)
     for line in json_data.splitlines():

tools/tf-generate → tools/tf-update

@@ -35,7 +35,7 @@ echo "Generate '../src/tf.js'"
     ../third_party/tensorflow/tensorflow/core/framework/tensor.proto \
     ../third_party/tensorflow/tensorflow/core/framework/resource_handle.proto \
 
-echo "Generate '../src/tf-operator.json'"
+echo "Generate '../src/tf-metadata.json'"
 protoc --proto_path /Users/lutzroeder/Projects/Netron/third_party/tensorflow tensorflow/core/framework/attr_value.proto --python_out=.
 protoc --proto_path /Users/lutzroeder/Projects/Netron/third_party/tensorflow tensorflow/core/framework/tensor.proto --python_out=.
 protoc --proto_path /Users/lutzroeder/Projects/Netron/third_party/tensorflow tensorflow/core/framework/types.proto --python_out=.
@@ -46,5 +46,5 @@ protoc --proto_path /Users/lutzroeder/Projects/Netron/third_party/tensorflow ten
 touch tensorflow/__init__.py
 touch tensorflow/core/__init__.py
 touch tensorflow/core/framework/__init__.py
-python tf-operator-json.py
+python tf-metadata.py
 rm -rf ./tensorflow