Remove convert and verify from -proto.js

src/cntk-proto.js

@@ -26,10 +26,6 @@
     
                 NDShape.prototype.shape_dim = $util.emptyArray;
     
-                NDShape.create = function create(properties) {
-                    return new NDShape(properties);
-                };
-    
                 NDShape.decode = function decode(reader, length) {
                     if (!(reader instanceof $Reader))
                         reader = $Reader.create(reader);
@@ -55,61 +51,6 @@
                     return message;
                 };
     
-                NDShape.verify = function verify(message) {
-                    if (typeof message !== "object" || message === null)
-                        return "object expected";
-                    if (message.shape_dim != null && message.hasOwnProperty("shape_dim")) {
-                        if (!Array.isArray(message.shape_dim))
-                            return "shape_dim: array expected";
-                        for (var i = 0; i < message.shape_dim.length; ++i)
-                            if (!$util.isInteger(message.shape_dim[i]) && !(message.shape_dim[i] && $util.isInteger(message.shape_dim[i].low) && $util.isInteger(message.shape_dim[i].high)))
-                                return "shape_dim: integer|Long[] expected";
-                    }
-                    return null;
-                };
-    
-                NDShape.fromObject = function fromObject(object) {
-                    if (object instanceof $root.CNTK.proto.NDShape)
-                        return object;
-                    var message = new $root.CNTK.proto.NDShape();
-                    if (object.shape_dim) {
-                        if (!Array.isArray(object.shape_dim))
-                            throw TypeError(".CNTK.proto.NDShape.shape_dim: array expected");
-                        message.shape_dim = [];
-                        for (var i = 0; i < object.shape_dim.length; ++i)
-                            if ($util.Long)
-                                (message.shape_dim[i] = $util.Long.fromValue(object.shape_dim[i])).unsigned = true;
-                            else if (typeof object.shape_dim[i] === "string")
-                                message.shape_dim[i] = parseInt(object.shape_dim[i], 10);
-                            else if (typeof object.shape_dim[i] === "number")
-                                message.shape_dim[i] = object.shape_dim[i];
-                            else if (typeof object.shape_dim[i] === "object")
-                                message.shape_dim[i] = new $util.LongBits(object.shape_dim[i].low >>> 0, object.shape_dim[i].high >>> 0).toNumber(true);
-                    }
-                    return message;
-                };
-    
-                NDShape.toObject = function toObject(message, options) {
-                    if (!options)
-                        options = {};
-                    var object = {};
-                    if (options.arrays || options.defaults)
-                        object.shape_dim = [];
-                    if (message.shape_dim && message.shape_dim.length) {
-                        object.shape_dim = [];
-                        for (var j = 0; j < message.shape_dim.length; ++j)
-                            if (typeof message.shape_dim[j] === "number")
-                                object.shape_dim[j] = options.longs === String ? String(message.shape_dim[j]) : message.shape_dim[j];
-                            else
-                                object.shape_dim[j] = options.longs === String ? $util.Long.prototype.toString.call(message.shape_dim[j]) : options.longs === Number ? new $util.LongBits(message.shape_dim[j].low >>> 0, message.shape_dim[j].high >>> 0).toNumber(true) : message.shape_dim[j];
-                    }
-                    return object;
-                };
-    
-                NDShape.prototype.toJSON = function toJSON() {
-                    return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
-                };
-    
                 return NDShape;
             })();
     
@@ -126,10 +67,6 @@
                 Axis.prototype.name = "";
                 Axis.prototype.is_ordered_dynamic_axis = false;
     
-                Axis.create = function create(properties) {
-                    return new Axis(properties);
-                };
-    
                 Axis.decode = function decode(reader, length) {
                     if (!(reader instanceof $Reader))
                         reader = $Reader.create(reader);
@@ -154,56 +91,6 @@
                     return message;
                 };
     
-                Axis.verify = function verify(message) {
-                    if (typeof message !== "object" || message === null)
-                        return "object expected";
-                    if (message.static_axis_idx != null && message.hasOwnProperty("static_axis_idx"))
-                        if (!$util.isInteger(message.static_axis_idx))
-                            return "static_axis_idx: integer expected";
-                    if (message.name != null && message.hasOwnProperty("name"))
-                        if (!$util.isString(message.name))
-                            return "name: string expected";
-                    if (message.is_ordered_dynamic_axis != null && message.hasOwnProperty("is_ordered_dynamic_axis"))
-                        if (typeof message.is_ordered_dynamic_axis !== "boolean")
-                            return "is_ordered_dynamic_axis: boolean expected";
-                    return null;
-                };
-    
-                Axis.fromObject = function fromObject(object) {
-                    if (object instanceof $root.CNTK.proto.Axis)
-                        return object;
-                    var message = new $root.CNTK.proto.Axis();
-                    if (object.static_axis_idx != null)
-                        message.static_axis_idx = object.static_axis_idx | 0;
-                    if (object.name != null)
-                        message.name = String(object.name);
-                    if (object.is_ordered_dynamic_axis != null)
-                        message.is_ordered_dynamic_axis = Boolean(object.is_ordered_dynamic_axis);
-                    return message;
-                };
-    
-                Axis.toObject = function toObject(message, options) {
-                    if (!options)
-                        options = {};
-                    var object = {};
-                    if (options.defaults) {
-                        object.static_axis_idx = 0;
-                        object.name = "";
-                        object.is_ordered_dynamic_axis = false;
-                    }
-                    if (message.static_axis_idx != null && message.hasOwnProperty("static_axis_idx"))
-                        object.static_axis_idx = message.static_axis_idx;
-                    if (message.name != null && message.hasOwnProperty("name"))
-                        object.name = message.name;
-                    if (message.is_ordered_dynamic_axis != null && message.hasOwnProperty("is_ordered_dynamic_axis"))
-                        object.is_ordered_dynamic_axis = message.is_ordered_dynamic_axis;
-                    return object;
-                };
-    
-                Axis.prototype.toJSON = function toJSON() {
-                    return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
-                };
-    
                 return Axis;
             })();
     
@@ -231,10 +118,6 @@
                     set: $util.oneOfSetter($oneOfFields)
                 });
     
-                NDArrayView.create = function create(properties) {
-                    return new NDArrayView(properties);
-                };
-    
                 NDArrayView.decode = function decode(reader, length) {
                     if (!(reader instanceof $Reader))
                         reader = $Reader.create(reader);
@@ -271,191 +154,6 @@
                     return message;
                 };
     
-                NDArrayView.verify = function verify(message) {
-                    if (typeof message !== "object" || message === null)
-                        return "object expected";
-                    var properties = {};
-                    if (message.data_type != null && message.hasOwnProperty("data_type"))
-                        switch (message.data_type) {
-                        default:
-                            return "data_type: enum value expected";
-                        case 0:
-                        case 1:
-                        case 2:
-                        case 4:
-                        case 5:
-                        case 6:
-                            break;
-                        }
-                    if (message.storage_format != null && message.hasOwnProperty("storage_format"))
-                        switch (message.storage_format) {
-                        default:
-                            return "storage_format: enum value expected";
-                        case 0:
-                        case 1:
-                        case 2:
-                            break;
-                        }
-                    if (message.shape != null && message.hasOwnProperty("shape")) {
-                        var error = $root.CNTK.proto.NDShape.verify(message.shape);
-                        if (error)
-                            return "shape." + error;
-                    }
-                    if (message.float_values != null && message.hasOwnProperty("float_values")) {
-                        properties.values = 1;
-                        {
-                            var error = $root.CNTK.proto.NDArrayView.FloatValues.verify(message.float_values);
-                            if (error)
-                                return "float_values." + error;
-                        }
-                    }
-                    if (message.double_values != null && message.hasOwnProperty("double_values")) {
-                        if (properties.values === 1)
-                            return "values: multiple values";
-                        properties.values = 1;
-                        {
-                            var error = $root.CNTK.proto.NDArrayView.DoubleValues.verify(message.double_values);
-                            if (error)
-                                return "double_values." + error;
-                        }
-                    }
-                    if (message.bytes_value != null && message.hasOwnProperty("bytes_value")) {
-                        if (properties.values === 1)
-                            return "values: multiple values";
-                        properties.values = 1;
-                        {
-                            var error = $root.CNTK.proto.NDArrayView.BytesValue.verify(message.bytes_value);
-                            if (error)
-                                return "bytes_value." + error;
-                        }
-                    }
-                    if (message.sint32_values != null && message.hasOwnProperty("sint32_values")) {
-                        if (properties.values === 1)
-                            return "values: multiple values";
-                        properties.values = 1;
-                        {
-                            var error = $root.CNTK.proto.NDArrayView.IntValues.verify(message.sint32_values);
-                            if (error)
-                                return "sint32_values." + error;
-                        }
-                    }
-                    return null;
-                };
-    
-                NDArrayView.fromObject = function fromObject(object) {
-                    if (object instanceof $root.CNTK.proto.NDArrayView)
-                        return object;
-                    var message = new $root.CNTK.proto.NDArrayView();
-                    switch (object.data_type) {
-                    case "Unknown":
-                    case 0:
-                        message.data_type = 0;
-                        break;
-                    case "Float":
-                    case 1:
-                        message.data_type = 1;
-                        break;
-                    case "Double":
-                    case 2:
-                        message.data_type = 2;
-                        break;
-                    case "Float16":
-                    case 4:
-                        message.data_type = 4;
-                        break;
-                    case "Int8":
-                    case 5:
-                        message.data_type = 5;
-                        break;
-                    case "Int16":
-                    case 6:
-                        message.data_type = 6;
-                        break;
-                    }
-                    switch (object.storage_format) {
-                    case "Dense":
-                    case 0:
-                        message.storage_format = 0;
-                        break;
-                    case "SparseCSC":
-                    case 1:
-                        message.storage_format = 1;
-                        break;
-                    case "SparseBlockCol":
-                    case 2:
-                        message.storage_format = 2;
-                        break;
-                    }
-                    if (object.shape != null) {
-                        if (typeof object.shape !== "object")
-                            throw TypeError(".CNTK.proto.NDArrayView.shape: object expected");
-                        message.shape = $root.CNTK.proto.NDShape.fromObject(object.shape);
-                    }
-                    if (object.float_values != null) {
-                        if (typeof object.float_values !== "object")
-                            throw TypeError(".CNTK.proto.NDArrayView.float_values: object expected");
-                        message.float_values = $root.CNTK.proto.NDArrayView.FloatValues.fromObject(object.float_values);
-                    }
-                    if (object.double_values != null) {
-                        if (typeof object.double_values !== "object")
-                            throw TypeError(".CNTK.proto.NDArrayView.double_values: object expected");
-                        message.double_values = $root.CNTK.proto.NDArrayView.DoubleValues.fromObject(object.double_values);
-                    }
-                    if (object.bytes_value != null) {
-                        if (typeof object.bytes_value !== "object")
-                            throw TypeError(".CNTK.proto.NDArrayView.bytes_value: object expected");
-                        message.bytes_value = $root.CNTK.proto.NDArrayView.BytesValue.fromObject(object.bytes_value);
-                    }
-                    if (object.sint32_values != null) {
-                        if (typeof object.sint32_values !== "object")
-                            throw TypeError(".CNTK.proto.NDArrayView.sint32_values: object expected");
-                        message.sint32_values = $root.CNTK.proto.NDArrayView.IntValues.fromObject(object.sint32_values);
-                    }
-                    return message;
-                };
-    
-                NDArrayView.toObject = function toObject(message, options) {
-                    if (!options)
-                        options = {};
-                    var object = {};
-                    if (options.defaults) {
-                        object.data_type = options.enums === String ? "Unknown" : 0;
-                        object.storage_format = options.enums === String ? "Dense" : 0;
-                        object.shape = null;
-                    }
-                    if (message.data_type != null && message.hasOwnProperty("data_type"))
-                        object.data_type = options.enums === String ? $root.CNTK.proto.NDArrayView.DataType[message.data_type] : message.data_type;
-                    if (message.storage_format != null && message.hasOwnProperty("storage_format"))
-                        object.storage_format = options.enums === String ? $root.CNTK.proto.NDArrayView.StorageFormat[message.storage_format] : message.storage_format;
-                    if (message.shape != null && message.hasOwnProperty("shape"))
-                        object.shape = $root.CNTK.proto.NDShape.toObject(message.shape, options);
-                    if (message.float_values != null && message.hasOwnProperty("float_values")) {
-                        object.float_values = $root.CNTK.proto.NDArrayView.FloatValues.toObject(message.float_values, options);
-                        if (options.oneofs)
-                            object.values = "float_values";
-                    }
-                    if (message.double_values != null && message.hasOwnProperty("double_values")) {
-                        object.double_values = $root.CNTK.proto.NDArrayView.DoubleValues.toObject(message.double_values, options);
-                        if (options.oneofs)
-                            object.values = "double_values";
-                    }
-                    if (message.bytes_value != null && message.hasOwnProperty("bytes_value")) {
-                        object.bytes_value = $root.CNTK.proto.NDArrayView.BytesValue.toObject(message.bytes_value, options);
-                        if (options.oneofs)
-                            object.values = "bytes_value";
-                    }
-                    if (message.sint32_values != null && message.hasOwnProperty("sint32_values")) {
-                        object.sint32_values = $root.CNTK.proto.NDArrayView.IntValues.toObject(message.sint32_values, options);
-                        if (options.oneofs)
-                            object.values = "sint32_values";
-                    }
-                    return object;
-                };
-    
-                NDArrayView.prototype.toJSON = function toJSON() {
-                    return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
-                };
-    
                 NDArrayView.DataType = (function() {
                     var valuesById = {}, values = Object.create(valuesById);
                     values[valuesById[0] = "Unknown"] = 0;
@@ -487,10 +185,6 @@
     
                     FloatValues.prototype.value = $util.emptyArray;
     
-                    FloatValues.create = function create(properties) {
-                        return new FloatValues(properties);
-                    };
-    
                     FloatValues.decode = function decode(reader, length) {
                         if (!(reader instanceof $Reader))
                             reader = $Reader.create(reader);
@@ -529,51 +223,6 @@
                         return message;
                     };
     
-                    FloatValues.verify = function verify(message) {
-                        if (typeof message !== "object" || message === null)
-                            return "object expected";
-                        if (message.value != null && message.hasOwnProperty("value")) {
-                            if (!Array.isArray(message.value))
-                                return "value: array expected";
-                            for (var i = 0; i < message.value.length; ++i)
-                                if (typeof message.value[i] !== "number")
-                                    return "value: number[] expected";
-                        }
-                        return null;
-                    };
-    
-                    FloatValues.fromObject = function fromObject(object) {
-                        if (object instanceof $root.CNTK.proto.NDArrayView.FloatValues)
-                            return object;
-                        var message = new $root.CNTK.proto.NDArrayView.FloatValues();
-                        if (object.value) {
-                            if (!Array.isArray(object.value))
-                                throw TypeError(".CNTK.proto.NDArrayView.FloatValues.value: array expected");
-                            message.value = [];
-                            for (var i = 0; i < object.value.length; ++i)
-                                message.value[i] = Number(object.value[i]);
-                        }
-                        return message;
-                    };
-    
-                    FloatValues.toObject = function toObject(message, options) {
-                        if (!options)
-                            options = {};
-                        var object = {};
-                        if (options.arrays || options.defaults)
-                            object.value = [];
-                        if (message.value && message.value.length) {
-                            object.value = [];
-                            for (var j = 0; j < message.value.length; ++j)
-                                object.value[j] = options.json && !isFinite(message.value[j]) ? String(message.value[j]) : message.value[j];
-                        }
-                        return object;
-                    };
-    
-                    FloatValues.prototype.toJSON = function toJSON() {
-                        return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
-                    };
-    
                     return FloatValues;
                 })();
     
@@ -589,10 +238,6 @@
     
                     DoubleValues.prototype.value = $util.emptyArray;
     
-                    DoubleValues.create = function create(properties) {
-                        return new DoubleValues(properties);
-                    };
-    
                     DoubleValues.decode = function decode(reader, length) {
                         if (!(reader instanceof $Reader))
                             reader = $Reader.create(reader);
@@ -618,51 +263,6 @@
                         return message;
                     };
     
-                    DoubleValues.verify = function verify(message) {
-                        if (typeof message !== "object" || message === null)
-                            return "object expected";
-                        if (message.value != null && message.hasOwnProperty("value")) {
-                            if (!Array.isArray(message.value))
-                                return "value: array expected";
-                            for (var i = 0; i < message.value.length; ++i)
-                                if (typeof message.value[i] !== "number")
-                                    return "value: number[] expected";
-                        }
-                        return null;
-                    };
-    
-                    DoubleValues.fromObject = function fromObject(object) {
-                        if (object instanceof $root.CNTK.proto.NDArrayView.DoubleValues)
-                            return object;
-                        var message = new $root.CNTK.proto.NDArrayView.DoubleValues();
-                        if (object.value) {
-                            if (!Array.isArray(object.value))
-                                throw TypeError(".CNTK.proto.NDArrayView.DoubleValues.value: array expected");
-                            message.value = [];
-                            for (var i = 0; i < object.value.length; ++i)
-                                message.value[i] = Number(object.value[i]);
-                        }
-                        return message;
-                    };
-    
-                    DoubleValues.toObject = function toObject(message, options) {
-                        if (!options)
-                            options = {};
-                        var object = {};
-                        if (options.arrays || options.defaults)
-                            object.value = [];
-                        if (message.value && message.value.length) {
-                            object.value = [];
-                            for (var j = 0; j < message.value.length; ++j)
-                                object.value[j] = options.json && !isFinite(message.value[j]) ? String(message.value[j]) : message.value[j];
-                        }
-                        return object;
-                    };
-    
-                    DoubleValues.prototype.toJSON = function toJSON() {
-                        return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
-                    };
-    
                     return DoubleValues;
                 })();
     
@@ -677,10 +277,6 @@
     
                     BytesValue.prototype.value = $util.newBuffer([]);
     
-                    BytesValue.create = function create(properties) {
-                        return new BytesValue(properties);
-                    };
-    
                     BytesValue.decode = function decode(reader, length) {
                         if (!(reader instanceof $Reader))
                             reader = $Reader.create(reader);
@@ -699,48 +295,6 @@
                         return message;
                     };
     
-                    BytesValue.verify = function verify(message) {
-                        if (typeof message !== "object" || message === null)
-                            return "object expected";
-                        if (message.value != null && message.hasOwnProperty("value"))
-                            if (!(message.value && typeof message.value.length === "number" || $util.isString(message.value)))
-                                return "value: buffer expected";
-                        return null;
-                    };
-    
-                    BytesValue.fromObject = function fromObject(object) {
-                        if (object instanceof $root.CNTK.proto.NDArrayView.BytesValue)
-                            return object;
-                        var message = new $root.CNTK.proto.NDArrayView.BytesValue();
-                        if (object.value != null)
-                            if (typeof object.value === "string")
-                                $util.base64.decode(object.value, message.value = $util.newBuffer($util.base64.length(object.value)), 0);
-                            else if (object.value.length)
-                                message.value = object.value;
-                        return message;
-                    };
-    
-                    BytesValue.toObject = function toObject(message, options) {
-                        if (!options)
-                            options = {};
-                        var object = {};
-                        if (options.defaults)
-                            if (options.bytes === String)
-                                object.value = "";
-                            else {
-                                object.value = [];
-                                if (options.bytes !== Array)
-                                    object.value = $util.newBuffer(object.value);
-                            }
-                        if (message.value != null && message.hasOwnProperty("value"))
-                            object.value = options.bytes === String ? $util.base64.encode(message.value, 0, message.value.length) : options.bytes === Array ? Array.prototype.slice.call(message.value) : message.value;
-                        return object;
-                    };
-    
-                    BytesValue.prototype.toJSON = function toJSON() {
-                        return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
-                    };
-    
                     return BytesValue;
                 })();
     
@@ -756,10 +310,6 @@
     
                     IntValues.prototype.value = $util.emptyArray;
     
-                    IntValues.create = function create(properties) {
-                        return new IntValues(properties);
-                    };
-    
                     IntValues.decode = function decode(reader, length) {
                         if (!(reader instanceof $Reader))
                             reader = $Reader.create(reader);
@@ -785,51 +335,6 @@
                         return message;
                     };
     
-                    IntValues.verify = function verify(message) {
-                        if (typeof message !== "object" || message === null)
-                            return "object expected";
-                        if (message.value != null && message.hasOwnProperty("value")) {
-                            if (!Array.isArray(message.value))
-                                return "value: array expected";
-                            for (var i = 0; i < message.value.length; ++i)
-                                if (!$util.isInteger(message.value[i]))
-                                    return "value: integer[] expected";
-                        }
-                        return null;
-                    };
-    
-                    IntValues.fromObject = function fromObject(object) {
-                        if (object instanceof $root.CNTK.proto.NDArrayView.IntValues)
-                            return object;
-                        var message = new $root.CNTK.proto.NDArrayView.IntValues();
-                        if (object.value) {
-                            if (!Array.isArray(object.value))
-                                throw TypeError(".CNTK.proto.NDArrayView.IntValues.value: array expected");
-                            message.value = [];
-                            for (var i = 0; i < object.value.length; ++i)
-                                message.value[i] = object.value[i] | 0;
-                        }
-                        return message;
-                    };
-    
-                    IntValues.toObject = function toObject(message, options) {
-                        if (!options)
-                            options = {};
-                        var object = {};
-                        if (options.arrays || options.defaults)
-                            object.value = [];
-                        if (message.value && message.value.length) {
-                            object.value = [];
-                            for (var j = 0; j < message.value.length; ++j)
-                                object.value[j] = message.value[j];
-                        }
-                        return object;
-                    };
-    
-                    IntValues.prototype.toJSON = function toJSON() {
-                        return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
-                    };
-    
                     return IntValues;
                 })();
     
@@ -848,10 +353,6 @@
     
                 Vector.prototype.value = $util.emptyArray;
     
-                Vector.create = function create(properties) {
-                    return new Vector(properties);
-                };
-    
                 Vector.decode = function decode(reader, length) {
                     if (!(reader instanceof $Reader))
                         reader = $Reader.create(reader);
@@ -872,56 +373,6 @@
                     return message;
                 };
     
-                Vector.verify = function verify(message) {
-                    if (typeof message !== "object" || message === null)
-                        return "object expected";
-                    if (message.value != null && message.hasOwnProperty("value")) {
-                        if (!Array.isArray(message.value))
-                            return "value: array expected";
-                        for (var i = 0; i < message.value.length; ++i) {
-                            var error = $root.CNTK.proto.DictionaryValue.verify(message.value[i]);
-                            if (error)
-                                return "value." + error;
-                        }
-                    }
-                    return null;
-                };
-    
-                Vector.fromObject = function fromObject(object) {
-                    if (object instanceof $root.CNTK.proto.Vector)
-                        return object;
-                    var message = new $root.CNTK.proto.Vector();
-                    if (object.value) {
-                        if (!Array.isArray(object.value))
-                            throw TypeError(".CNTK.proto.Vector.value: array expected");
-                        message.value = [];
-                        for (var i = 0; i < object.value.length; ++i) {
-                            if (typeof object.value[i] !== "object")
-                                throw TypeError(".CNTK.proto.Vector.value: object expected");
-                            message.value[i] = $root.CNTK.proto.DictionaryValue.fromObject(object.value[i]);
-                        }
-                    }
-                    return message;
-                };
-    
-                Vector.toObject = function toObject(message, options) {
-                    if (!options)
-                        options = {};
-                    var object = {};
-                    if (options.arrays || options.defaults)
-                        object.value = [];
-                    if (message.value && message.value.length) {
-                        object.value = [];
-                        for (var j = 0; j < message.value.length; ++j)
-                            object.value[j] = $root.CNTK.proto.DictionaryValue.toObject(message.value[j], options);
-                    }
-                    return object;
-                };
-    
-                Vector.prototype.toJSON = function toJSON() {
-                    return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
-                };
-    
                 return Vector;
             })();
     
@@ -938,10 +389,6 @@
                 Dictionary.prototype.version = $util.Long ? $util.Long.fromBits(0,0,true) : 0;
                 Dictionary.prototype.data = $util.emptyObject;
     
-                Dictionary.create = function create(properties) {
-                    return new Dictionary(properties);
-                };
-    
                 Dictionary.decode = function decode(reader, length) {
                     if (!(reader instanceof $Reader))
                         reader = $Reader.create(reader);
@@ -968,81 +415,6 @@
                     return message;
                 };
     
-                Dictionary.verify = function verify(message) {
-                    if (typeof message !== "object" || message === null)
-                        return "object expected";
-                    if (message.version != null && message.hasOwnProperty("version"))
-                        if (!$util.isInteger(message.version) && !(message.version && $util.isInteger(message.version.low) && $util.isInteger(message.version.high)))
-                            return "version: integer|Long expected";
-                    if (message.data != null && message.hasOwnProperty("data")) {
-                        if (!$util.isObject(message.data))
-                            return "data: object expected";
-                        var key = Object.keys(message.data);
-                        for (var i = 0; i < key.length; ++i) {
-                            var error = $root.CNTK.proto.DictionaryValue.verify(message.data[key[i]]);
-                            if (error)
-                                return "data." + error;
-                        }
-                    }
-                    return null;
-                };
-    
-                Dictionary.fromObject = function fromObject(object) {
-                    if (object instanceof $root.CNTK.proto.Dictionary)
-                        return object;
-                    var message = new $root.CNTK.proto.Dictionary();
-                    if (object.version != null)
-                        if ($util.Long)
-                            (message.version = $util.Long.fromValue(object.version)).unsigned = true;
-                        else if (typeof object.version === "string")
-                            message.version = parseInt(object.version, 10);
-                        else if (typeof object.version === "number")
-                            message.version = object.version;
-                        else if (typeof object.version === "object")
-                            message.version = new $util.LongBits(object.version.low >>> 0, object.version.high >>> 0).toNumber(true);
-                    if (object.data) {
-                        if (typeof object.data !== "object")
-                            throw TypeError(".CNTK.proto.Dictionary.data: object expected");
-                        message.data = {};
-                        for (var keys = Object.keys(object.data), i = 0; i < keys.length; ++i) {
-                            if (typeof object.data[keys[i]] !== "object")
-                                throw TypeError(".CNTK.proto.Dictionary.data: object expected");
-                            message.data[keys[i]] = $root.CNTK.proto.DictionaryValue.fromObject(object.data[keys[i]]);
-                        }
-                    }
-                    return message;
-                };
-    
-                Dictionary.toObject = function toObject(message, options) {
-                    if (!options)
-                        options = {};
-                    var object = {};
-                    if (options.objects || options.defaults)
-                        object.data = {};
-                    if (options.defaults)
-                        if ($util.Long) {
-                            var long = new $util.Long(0, 0, true);
-                            object.version = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long;
-                        } else
-                            object.version = options.longs === String ? "0" : 0;
-                    if (message.version != null && message.hasOwnProperty("version"))
-                        if (typeof message.version === "number")
-                            object.version = options.longs === String ? String(message.version) : message.version;
-                        else
-                            object.version = options.longs === String ? $util.Long.prototype.toString.call(message.version) : options.longs === Number ? new $util.LongBits(message.version.low >>> 0, message.version.high >>> 0).toNumber(true) : message.version;
-                    var keys2;
-                    if (message.data && (keys2 = Object.keys(message.data)).length) {
-                        object.data = {};
-                        for (var j = 0; j < keys2.length; ++j)
-                            object.data[keys2[j]] = $root.CNTK.proto.DictionaryValue.toObject(message.data[keys2[j]], options);
-                    }
-                    return object;
-                };
-    
-                Dictionary.prototype.toJSON = function toJSON() {
-                    return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
-                };
-    
                 return Dictionary;
             })();
     
@@ -1076,10 +448,6 @@
                     set: $util.oneOfSetter($oneOfFields)
                 });
     
-                DictionaryValue.create = function create(properties) {
-                    return new DictionaryValue(properties);
-                };
-    
                 DictionaryValue.decode = function decode(reader, length) {
                     if (!(reader instanceof $Reader))
                         reader = $Reader.create(reader);
@@ -1134,318 +502,6 @@
                     return message;
                 };
     
-                DictionaryValue.verify = function verify(message) {
-                    if (typeof message !== "object" || message === null)
-                        return "object expected";
-                    var properties = {};
-                    if (message.version != null && message.hasOwnProperty("version"))
-                        if (!$util.isInteger(message.version) && !(message.version && $util.isInteger(message.version.low) && $util.isInteger(message.version.high)))
-                            return "version: integer|Long expected";
-                    if (message.value_type != null && message.hasOwnProperty("value_type"))
-                        switch (message.value_type) {
-                        default:
-                            return "value_type: enum value expected";
-                        case 0:
-                        case 1:
-                        case 2:
-                        case 3:
-                        case 4:
-                        case 5:
-                        case 6:
-                        case 7:
-                        case 8:
-                        case 9:
-                        case 10:
-                        case 11:
-                            break;
-                        }
-                    if (message.bool_value != null && message.hasOwnProperty("bool_value")) {
-                        properties.value = 1;
-                        if (typeof message.bool_value !== "boolean")
-                            return "bool_value: boolean expected";
-                    }
-                    if (message.int_value != null && message.hasOwnProperty("int_value")) {
-                        if (properties.value === 1)
-                            return "value: multiple values";
-                        properties.value = 1;
-                        if (!$util.isInteger(message.int_value))
-                            return "int_value: integer expected";
-                    }
-                    if (message.size_t_value != null && message.hasOwnProperty("size_t_value")) {
-                        if (properties.value === 1)
-                            return "value: multiple values";
-                        properties.value = 1;
-                        if (!$util.isInteger(message.size_t_value) && !(message.size_t_value && $util.isInteger(message.size_t_value.low) && $util.isInteger(message.size_t_value.high)))
-                            return "size_t_value: integer|Long expected";
-                    }
-                    if (message.float_value != null && message.hasOwnProperty("float_value")) {
-                        if (properties.value === 1)
-                            return "value: multiple values";
-                        properties.value = 1;
-                        if (typeof message.float_value !== "number")
-                            return "float_value: number expected";
-                    }
-                    if (message.double_value != null && message.hasOwnProperty("double_value")) {
-                        if (properties.value === 1)
-                            return "value: multiple values";
-                        properties.value = 1;
-                        if (typeof message.double_value !== "number")
-                            return "double_value: number expected";
-                    }
-                    if (message.string_value != null && message.hasOwnProperty("string_value")) {
-                        if (properties.value === 1)
-                            return "value: multiple values";
-                        properties.value = 1;
-                        if (!$util.isString(message.string_value))
-                            return "string_value: string expected";
-                    }
-                    if (message.nd_shape_value != null && message.hasOwnProperty("nd_shape_value")) {
-                        if (properties.value === 1)
-                            return "value: multiple values";
-                        properties.value = 1;
-                        {
-                            var error = $root.CNTK.proto.NDShape.verify(message.nd_shape_value);
-                            if (error)
-                                return "nd_shape_value." + error;
-                        }
-                    }
-                    if (message.axis_value != null && message.hasOwnProperty("axis_value")) {
-                        if (properties.value === 1)
-                            return "value: multiple values";
-                        properties.value = 1;
-                        {
-                            var error = $root.CNTK.proto.Axis.verify(message.axis_value);
-                            if (error)
-                                return "axis_value." + error;
-                        }
-                    }
-                    if (message.vector_value != null && message.hasOwnProperty("vector_value")) {
-                        if (properties.value === 1)
-                            return "value: multiple values";
-                        properties.value = 1;
-                        {
-                            var error = $root.CNTK.proto.Vector.verify(message.vector_value);
-                            if (error)
-                                return "vector_value." + error;
-                        }
-                    }
-                    if (message.dictionary_value != null && message.hasOwnProperty("dictionary_value")) {
-                        if (properties.value === 1)
-                            return "value: multiple values";
-                        properties.value = 1;
-                        {
-                            var error = $root.CNTK.proto.Dictionary.verify(message.dictionary_value);
-                            if (error)
-                                return "dictionary_value." + error;
-                        }
-                    }
-                    if (message.nd_array_view_value != null && message.hasOwnProperty("nd_array_view_value")) {
-                        if (properties.value === 1)
-                            return "value: multiple values";
-                        properties.value = 1;
-                        {
-                            var error = $root.CNTK.proto.NDArrayView.verify(message.nd_array_view_value);
-                            if (error)
-                                return "nd_array_view_value." + error;
-                        }
-                    }
-                    return null;
-                };
-    
-                DictionaryValue.fromObject = function fromObject(object) {
-                    if (object instanceof $root.CNTK.proto.DictionaryValue)
-                        return object;
-                    var message = new $root.CNTK.proto.DictionaryValue();
-                    if (object.version != null)
-                        if ($util.Long)
-                            (message.version = $util.Long.fromValue(object.version)).unsigned = true;
-                        else if (typeof object.version === "string")
-                            message.version = parseInt(object.version, 10);
-                        else if (typeof object.version === "number")
-                            message.version = object.version;
-                        else if (typeof object.version === "object")
-                            message.version = new $util.LongBits(object.version.low >>> 0, object.version.high >>> 0).toNumber(true);
-                    switch (object.value_type) {
-                    case "None":
-                    case 0:
-                        message.value_type = 0;
-                        break;
-                    case "Bool":
-                    case 1:
-                        message.value_type = 1;
-                        break;
-                    case "Int":
-                    case 2:
-                        message.value_type = 2;
-                        break;
-                    case "SizeT":
-                    case 3:
-                        message.value_type = 3;
-                        break;
-                    case "Float":
-                    case 4:
-                        message.value_type = 4;
-                        break;
-                    case "Double":
-                    case 5:
-                        message.value_type = 5;
-                        break;
-                    case "String":
-                    case 6:
-                        message.value_type = 6;
-                        break;
-                    case "NDShape":
-                    case 7:
-                        message.value_type = 7;
-                        break;
-                    case "Axis":
-                    case 8:
-                        message.value_type = 8;
-                        break;
-                    case "Vector":
-                    case 9:
-                        message.value_type = 9;
-                        break;
-                    case "Dictionary":
-                    case 10:
-                        message.value_type = 10;
-                        break;
-                    case "NDArrayView":
-                    case 11:
-                        message.value_type = 11;
-                        break;
-                    }
-                    if (object.bool_value != null)
-                        message.bool_value = Boolean(object.bool_value);
-                    if (object.int_value != null)
-                        message.int_value = object.int_value | 0;
-                    if (object.size_t_value != null)
-                        if ($util.Long)
-                            (message.size_t_value = $util.Long.fromValue(object.size_t_value)).unsigned = true;
-                        else if (typeof object.size_t_value === "string")
-                            message.size_t_value = parseInt(object.size_t_value, 10);
-                        else if (typeof object.size_t_value === "number")
-                            message.size_t_value = object.size_t_value;
-                        else if (typeof object.size_t_value === "object")
-                            message.size_t_value = new $util.LongBits(object.size_t_value.low >>> 0, object.size_t_value.high >>> 0).toNumber(true);
-                    if (object.float_value != null)
-                        message.float_value = Number(object.float_value);
-                    if (object.double_value != null)
-                        message.double_value = Number(object.double_value);
-                    if (object.string_value != null)
-                        message.string_value = String(object.string_value);
-                    if (object.nd_shape_value != null) {
-                        if (typeof object.nd_shape_value !== "object")
-                            throw TypeError(".CNTK.proto.DictionaryValue.nd_shape_value: object expected");
-                        message.nd_shape_value = $root.CNTK.proto.NDShape.fromObject(object.nd_shape_value);
-                    }
-                    if (object.axis_value != null) {
-                        if (typeof object.axis_value !== "object")
-                            throw TypeError(".CNTK.proto.DictionaryValue.axis_value: object expected");
-                        message.axis_value = $root.CNTK.proto.Axis.fromObject(object.axis_value);
-                    }
-                    if (object.vector_value != null) {
-                        if (typeof object.vector_value !== "object")
-                            throw TypeError(".CNTK.proto.DictionaryValue.vector_value: object expected");
-                        message.vector_value = $root.CNTK.proto.Vector.fromObject(object.vector_value);
-                    }
-                    if (object.dictionary_value != null) {
-                        if (typeof object.dictionary_value !== "object")
-                            throw TypeError(".CNTK.proto.DictionaryValue.dictionary_value: object expected");
-                        message.dictionary_value = $root.CNTK.proto.Dictionary.fromObject(object.dictionary_value);
-                    }
-                    if (object.nd_array_view_value != null) {
-                        if (typeof object.nd_array_view_value !== "object")
-                            throw TypeError(".CNTK.proto.DictionaryValue.nd_array_view_value: object expected");
-                        message.nd_array_view_value = $root.CNTK.proto.NDArrayView.fromObject(object.nd_array_view_value);
-                    }
-                    return message;
-                };
-    
-                DictionaryValue.toObject = function toObject(message, options) {
-                    if (!options)
-                        options = {};
-                    var object = {};
-                    if (options.defaults) {
-                        if ($util.Long) {
-                            var long = new $util.Long(0, 0, true);
-                            object.version = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long;
-                        } else
-                            object.version = options.longs === String ? "0" : 0;
-                        object.value_type = options.enums === String ? "None" : 0;
-                    }
-                    if (message.version != null && message.hasOwnProperty("version"))
-                        if (typeof message.version === "number")
-                            object.version = options.longs === String ? String(message.version) : message.version;
-                        else
-                            object.version = options.longs === String ? $util.Long.prototype.toString.call(message.version) : options.longs === Number ? new $util.LongBits(message.version.low >>> 0, message.version.high >>> 0).toNumber(true) : message.version;
-                    if (message.value_type != null && message.hasOwnProperty("value_type"))
-                        object.value_type = options.enums === String ? $root.CNTK.proto.DictionaryValue.Type[message.value_type] : message.value_type;
-                    if (message.bool_value != null && message.hasOwnProperty("bool_value")) {
-                        object.bool_value = message.bool_value;
-                        if (options.oneofs)
-                            object.value = "bool_value";
-                    }
-                    if (message.int_value != null && message.hasOwnProperty("int_value")) {
-                        object.int_value = message.int_value;
-                        if (options.oneofs)
-                            object.value = "int_value";
-                    }
-                    if (message.size_t_value != null && message.hasOwnProperty("size_t_value")) {
-                        if (typeof message.size_t_value === "number")
-                            object.size_t_value = options.longs === String ? String(message.size_t_value) : message.size_t_value;
-                        else
-                            object.size_t_value = options.longs === String ? $util.Long.prototype.toString.call(message.size_t_value) : options.longs === Number ? new $util.LongBits(message.size_t_value.low >>> 0, message.size_t_value.high >>> 0).toNumber(true) : message.size_t_value;
-                        if (options.oneofs)
-                            object.value = "size_t_value";
-                    }
-                    if (message.float_value != null && message.hasOwnProperty("float_value")) {
-                        object.float_value = options.json && !isFinite(message.float_value) ? String(message.float_value) : message.float_value;
-                        if (options.oneofs)
-                            object.value = "float_value";
-                    }
-                    if (message.double_value != null && message.hasOwnProperty("double_value")) {
-                        object.double_value = options.json && !isFinite(message.double_value) ? String(message.double_value) : message.double_value;
-                        if (options.oneofs)
-                            object.value = "double_value";
-                    }
-                    if (message.string_value != null && message.hasOwnProperty("string_value")) {
-                        object.string_value = message.string_value;
-                        if (options.oneofs)
-                            object.value = "string_value";
-                    }
-                    if (message.nd_shape_value != null && message.hasOwnProperty("nd_shape_value")) {
-                        object.nd_shape_value = $root.CNTK.proto.NDShape.toObject(message.nd_shape_value, options);
-                        if (options.oneofs)
-                            object.value = "nd_shape_value";
-                    }
-                    if (message.axis_value != null && message.hasOwnProperty("axis_value")) {
-                        object.axis_value = $root.CNTK.proto.Axis.toObject(message.axis_value, options);
-                        if (options.oneofs)
-                            object.value = "axis_value";
-                    }
-                    if (message.vector_value != null && message.hasOwnProperty("vector_value")) {
-                        object.vector_value = $root.CNTK.proto.Vector.toObject(message.vector_value, options);
-                        if (options.oneofs)
-                            object.value = "vector_value";
-                    }
-                    if (message.dictionary_value != null && message.hasOwnProperty("dictionary_value")) {
-                        object.dictionary_value = $root.CNTK.proto.Dictionary.toObject(message.dictionary_value, options);
-                        if (options.oneofs)
-                            object.value = "dictionary_value";
-                    }
-                    if (message.nd_array_view_value != null && message.hasOwnProperty("nd_array_view_value")) {
-                        object.nd_array_view_value = $root.CNTK.proto.NDArrayView.toObject(message.nd_array_view_value, options);
-                        if (options.oneofs)
-                            object.value = "nd_array_view_value";
-                    }
-                    return object;
-                };
-    
-                DictionaryValue.prototype.toJSON = function toJSON() {
-                    return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
-                };
-    
                 DictionaryValue.Type = (function() {
                     var valuesById = {}, values = Object.create(valuesById);
                     values[valuesById[0] = "None"] = 0;

tools/caffe

@@ -38,7 +38,7 @@ sync() {
 schema() {
     bold "caffe schema"
     sed 's/required float min = 1;/optional float min = 1;/g;s/required float max = 2;/optional float max = 2;/g' <${third_party}/${identifier}/src/caffe/proto/caffe.proto >${tools}/caffe.proto
-    ${node_modules}/protobufjs/bin/pbjs -t static-module -w closure --no-encode --no-delimited --no-comments --keep-case --decode-text -r caffe -o ${src}/caffe-proto.js ${tools}/caffe.proto
+    ${node_modules}/protobufjs/bin/pbjs -t static-module -w closure --no-encode --no-delimited --no-comments --no-convert --no-verify --no-create --keep-case --decode-text -r caffe -o ${src}/caffe-proto.js ${tools}/caffe.proto
     rm ${tools}/caffe.proto
     node ${tools}/update_pbjs.js array ${src}/caffe-proto.js data float 1
 }

tools/cntk

@@ -37,7 +37,7 @@ sync() {
 
 schema() {
     bold "cntk schema"
-    ${node_modules}/protobufjs/bin/pbjs -t static-module -w closure --no-encode --no-delimited --no-comments --keep-case -r cntk -o ${src}/cntk-proto.js ${third_party}/${identifier}/Source/CNTKv2LibraryDll/proto/CNTK.proto
+    ${node_modules}/protobufjs/bin/pbjs -t static-module -w closure --no-encode --no-delimited --no-comments --no-convert --no-verify --no-create --keep-case -r cntk -o ${src}/cntk-proto.js ${third_party}/${identifier}/Source/CNTKv2LibraryDll/proto/CNTK.proto
     node ${tools}/update_pbjs.js array ${src}/cntk-proto.js value float 1
 }
 

tools/coreml

@@ -52,7 +52,7 @@ install() {
 
 schema() {
     bold "coreml schema"
-    ${node_modules}/protobufjs/bin/pbjs -t static-module -w closure --no-encode --no-delimited --no-comments --keep-case -r coreml -o ${src}/coreml-proto.js ${third_party}/${identifier}/mlmodel/format/Model.proto
+    ${node_modules}/protobufjs/bin/pbjs -t static-module -w closure --no-encode --no-delimited --no-comments --no-convert --no-verify --no-create --keep-case -r coreml -o ${src}/coreml-proto.js ${third_party}/${identifier}/mlmodel/format/Model.proto
     node ${tools}/update_pbjs.js array ${src}/coreml-proto.js floatValue float 2
 }
 

tools/onnx

@@ -71,7 +71,7 @@ install() {
 schema() {
     bold "onnx schema"
     source ${virtualenv}/bin/activate
-    ${node_modules}/protobufjs/bin/pbjs -t static-module -w closure --no-encode --no-delimited --no-comments --keep-case --decode-text -r onnx -o ${src}/onnx-proto.js ${third_party}/${identifier}/onnx/onnx-ml.proto ${third_party}/${identifier}/onnx/onnx-operators-ml.proto
+    ${node_modules}/protobufjs/bin/pbjs -t static-module -w closure --no-encode --no-delimited --no-comments --no-convert --no-verify --no-create --keep-case --decode-text -r onnx -o ${src}/onnx-proto.js ${third_party}/${identifier}/onnx/onnx-ml.proto ${third_party}/${identifier}/onnx/onnx-operators-ml.proto
     node ${tools}/update_pbjs.js array ${src}/onnx-proto.js float_data float 1
     node ${tools}/update_pbjs.js array ${src}/onnx-proto.js double_data double 1
     deactivate

tools/paddle

@@ -37,7 +37,7 @@ sync() {
 
 schema() {
     bold "paddle schema"
-    ${node_modules}/protobufjs/bin/pbjs -t static-module -w closure --no-encode --no-delimited --no-comments --keep-case -r paddle -o ${src}/paddle-proto.js ${third_party}/${identifier}/paddle/fluid/framework/framework.proto
+    ${node_modules}/protobufjs/bin/pbjs -t static-module -w closure --no-encode --no-delimited --no-comments --no-convert --no-verify --no-create --keep-case -r paddle -o ${src}/paddle-proto.js ${third_party}/${identifier}/paddle/fluid/framework/framework.proto
 }
 
 while [ "$#" != 0 ]; do

tools/pytorch

@@ -69,7 +69,7 @@ install() {
 
 schema() {
     bold "caffe2 schema"
-    ${node_modules}/protobufjs/bin/pbjs -t static-module -w closure --no-encode --no-delimited --no-comments --keep-case --decode-text -r caffe2 -o ${src}/caffe2-proto.js ${third_party}/pytorch/caffe2/proto/caffe2.proto
+    ${node_modules}/protobufjs/bin/pbjs -t static-module -w closure --no-encode --no-delimited --no-comments --no-convert --no-verify --no-create --keep-case --decode-text -r caffe2 -o ${src}/caffe2-proto.js ${third_party}/pytorch/caffe2/proto/caffe2.proto
     node ${tools}/update_pbjs.js enumeration ${src}/caffe2-proto.js floats float 1
 }
 

tools/tf

@@ -62,7 +62,7 @@ install() {
 
 schema() {
     bold "tf schema"
-    ${node_modules}/protobufjs/bin/pbjs -t static-module -w closure --no-encode --no-delimited --no-comments --keep-case --decode-text -r tf -o ${src}/tf-proto.js \
+    ${node_modules}/protobufjs/bin/pbjs -t static-module -w closure --no-encode --no-delimited --no-comments --no-convert --no-verify --no-create --keep-case --decode-text -r tf -o ${src}/tf-proto.js \
         ${third_party}/${identifier}/tensorflow/core/protobuf/saved_model.proto \
         ${third_party}/${identifier}/tensorflow/core/protobuf/meta_graph.proto \
         ${third_party}/${identifier}/tensorflow/core/protobuf/saver.proto \