Skip to content

X
X2Paddle

PaddlePaddle / X2Paddle
大约 1 年 前同步成功

通知 328
Star 698
Fork 167
X
X2Paddle
提交 73830eb2 编写于 作者: J jiangjiajun
浏览文件
操作

modify code format

上级 0edcc783
显示空白变更内容
内联 并排
Showing with 9494 addition and 9323 deletion
tools/merge_params.py
浏览文件 @ 73830eb2
......@@ -5,10 +5,12 @@ model_dir = sys.argv[1]
new_model_dir = sys.argv[2]
exe = fluid.Executor(fluid.CPUPlace())
[inference_program, feed_target_names,
fetch_targets] = fluid.io.load_inference_model(dirname=model_dir, executor=exe)
fetch_targets] = fluid.io.load_inference_model(
dirname=model_dir, executor=exe)
print(feed_target_names)
fluid.io.save_inference_model(dirname=new_model_dir,
fluid.io.save_inference_model(
dirname=new_model_dir,
feeded_var_names=feed_target_names,
target_vars=fetch_targets,
executor=exe,
......
x2paddle/core/fluid_code.py
浏览文件 @ 73830eb2
......@@ -46,8 +46,8 @@ class Layer(object):
for input in self.inputs:
if isinstance(input, GraphNode):
if hasattr(input, "index"):
in_list += (input.layer_name +
"[{}]".format(input.index) + ", ")
in_list += (input.layer_name + "[{}]".format(
input.index) + ", ")
else:
in_list += (input.layer_name + ", ")
elif isinstance(input, six.string_types):
......@@ -71,8 +71,8 @@ class Layer(object):
layer_code = layer_code + key + "={}, ".format(input)
elif isinstance(self.inputs, GraphNode):
if hasattr(self.inputs, "index"):
layer_code += (self.inputs.layer_name +
"[{}]".format(self.inputs.index))
layer_code += (
self.inputs.layer_name + "[{}]".format(self.inputs.index))
else:
layer_code += (self.inputs.layer_name)
if self.op != "=":
......
x2paddle/core/op_mapper.py
浏览文件 @ 73830eb2
......@@ -64,10 +64,8 @@ def run_net(param_dir="./"):
b = os.path.exists(os.path.join(param_dir, var.name))
return b
fluid.io.load_vars(exe,
param_dir,
fluid.default_main_program(),
predicate=if_exist)
fluid.io.load_vars(
exe, param_dir, fluid.default_main_program(), predicate=if_exist)
class OpMapper(object):
......@@ -98,8 +96,8 @@ class OpMapper(object):
def add_codes(self, codes, indent=0):
if isinstance(codes, list):
for code in codes:
self.paddle_codes += (self.tab * indent + code.strip('\n') +
'\n')
self.paddle_codes += (
self.tab * indent + code.strip('\n') + '\n')
elif isinstance(codes, str):
self.paddle_codes += (self.tab * indent + codes.strip('\n') + '\n')
else:
......@@ -135,20 +133,21 @@ class OpMapper(object):
os.path.join(os.path.join(py_code_dir, var.name)))
return b
fluid.io.load_vars(exe,
fluid.io.load_vars(
exe,
py_code_dir,
fluid.default_main_program(),
predicate=if_exist)
if params_merge:
fluid.io.save_inference_model(dirname=os.path.join(
save_dir, "inference_model"),
fluid.io.save_inference_model(
dirname=os.path.join(save_dir, "inference_model"),
feeded_var_names=input_names,
target_vars=outputs,
executor=exe,
params_filename="__params__")
else:
fluid.io.save_inference_model(dirname=os.path.join(
save_dir, "inference_model"),
fluid.io.save_inference_model(
dirname=os.path.join(save_dir, "inference_model"),
feeded_var_names=input_names,
target_vars=outputs,
executor=exe,
......
x2paddle/decoder/caffe_decoder.py
浏览文件 @ 73830eb2
......@@ -34,8 +34,8 @@ class CaffeResolver(object):
if not os.path.isfile(self.caffe_proto):
raise Exception(
"The .py file compiled by caffe.proto is not exist.")
(filepath,
tempfilename) = os.path.split(os.path.abspath(self.caffe_proto))
(filepath, tempfilename) = os.path.split(
os.path.abspath(self.caffe_proto))
(filename, extension) = os.path.splitext(tempfilename)
sys.path.append(filepath)
out = __import__(filename)
......@@ -49,12 +49,12 @@ class CaffeResolver(object):
class CaffeGraphNode(GraphNode):
def __init__(self, layer, type_str, layer_name=None):
if layer_name is None:
super(CaffeGraphNode,
self).__init__(layer,
super(CaffeGraphNode, self).__init__(
layer,
layer.name.replace('/', '_').replace('-', '_'))
else:
super(CaffeGraphNode,
self).__init__(layer,
super(CaffeGraphNode, self).__init__(
layer,
layer_name.replace('/', '_').replace('-', '_'))
self.layer_type = type_str
self.fluid_code = FluidCode()
......@@ -268,8 +268,8 @@ class CaffeDecoder(object):
c_i = blob.channels
h = blob.height
w = blob.width
data = np.asarray(list(blob.data),
dtype=np.float32).reshape(c_o, c_i, h, w)
data = np.asarray(
list(blob.data), dtype=np.float32).reshape(c_o, c_i, h, w)
transformed.append(data)
return transformed
x2paddle/decoder/caffe_pb2.py
浏览文件 @ 73830eb2
......@@ -27,16 +27,11 @@ _PHASE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='TRAIN',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='TEST',
index=1,
number=1,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='TRAIN', index=0, number=0, serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='TEST', index=1, number=1, serialized_options=None, type=None),
],
containing_type=None,
serialized_options=None,
......@@ -55,12 +50,14 @@ _EMITCONSTRAINT_EMITTYPE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='CENTER',
_descriptor.EnumValueDescriptor(
name='CENTER',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='MIN_OVERLAP',
_descriptor.EnumValueDescriptor(
name='MIN_OVERLAP',
index=1,
number=1,
serialized_options=None,
......@@ -79,11 +76,8 @@ _ANNOTATEDDATUM_ANNOTATIONTYPE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='BBOX',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='BBOX', index=0, number=0, serialized_options=None, type=None),
],
containing_type=None,
serialized_options=None,
......@@ -98,17 +92,20 @@ _FILLERPARAMETER_VARIANCENORM = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='FAN_IN',
_descriptor.EnumValueDescriptor(
name='FAN_IN',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='FAN_OUT',
_descriptor.EnumValueDescriptor(
name='FAN_OUT',
index=1,
number=1,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='AVERAGE',
_descriptor.EnumValueDescriptor(
name='AVERAGE',
index=2,
number=2,
serialized_options=None,
......@@ -127,12 +124,10 @@ _SOLVERPARAMETER_SNAPSHOTFORMAT = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='HDF5',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='BINARYPROTO',
_descriptor.EnumValueDescriptor(
name='HDF5', index=0, number=0, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='BINARYPROTO',
index=1,
number=1,
serialized_options=None,
......@@ -151,16 +146,10 @@ _SOLVERPARAMETER_SOLVERMODE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='CPU',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='GPU',
index=1,
number=1,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='CPU', index=0, number=0, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='GPU', index=1, number=1, serialized_options=None, type=None),
],
containing_type=None,
serialized_options=None,
......@@ -175,36 +164,34 @@ _SOLVERPARAMETER_SOLVERTYPE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='SGD',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='NESTEROV',
_descriptor.EnumValueDescriptor(
name='SGD', index=0, number=0, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='NESTEROV',
index=1,
number=1,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='ADAGRAD',
_descriptor.EnumValueDescriptor(
name='ADAGRAD',
index=2,
number=2,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='RMSPROP',
_descriptor.EnumValueDescriptor(
name='RMSPROP',
index=3,
number=3,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='ADADELTA',
_descriptor.EnumValueDescriptor(
name='ADADELTA',
index=4,
number=4,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='ADAM',
index=5,
number=5,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='ADAM', index=5, number=5, serialized_options=None, type=None),
],
containing_type=None,
serialized_options=None,
......@@ -219,12 +206,14 @@ _PARAMSPEC_DIMCHECKMODE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='STRICT',
_descriptor.EnumValueDescriptor(
name='STRICT',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='PERMISSIVE',
_descriptor.EnumValueDescriptor(
name='PERMISSIVE',
index=1,
number=1,
serialized_options=None,
......@@ -243,17 +232,16 @@ _RESIZEPARAMETER_RESIZE_MODE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='WARP',
index=0,
number=1,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='FIT_SMALL_SIZE',
_descriptor.EnumValueDescriptor(
name='WARP', index=0, number=1, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='FIT_SMALL_SIZE',
index=1,
number=2,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='FIT_LARGE_SIZE_AND_PAD',
_descriptor.EnumValueDescriptor(
name='FIT_LARGE_SIZE_AND_PAD',
index=2,
number=3,
serialized_options=None,
......@@ -272,17 +260,20 @@ _RESIZEPARAMETER_PAD_MODE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='CONSTANT',
_descriptor.EnumValueDescriptor(
name='CONSTANT',
index=0,
number=1,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='MIRRORED',
_descriptor.EnumValueDescriptor(
name='MIRRORED',
index=1,
number=2,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='REPEAT_NEAREST',
_descriptor.EnumValueDescriptor(
name='REPEAT_NEAREST',
index=2,
number=3,
serialized_options=None,
......@@ -301,27 +292,25 @@ _RESIZEPARAMETER_INTERP_MODE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='LINEAR',
_descriptor.EnumValueDescriptor(
name='LINEAR',
index=0,
number=1,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='AREA',
index=1,
number=2,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='NEAREST',
_descriptor.EnumValueDescriptor(
name='AREA', index=1, number=2, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='NEAREST',
index=2,
number=3,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CUBIC',
index=3,
number=4,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='CUBIC', index=3, number=4, serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='LANCZOS4',
_descriptor.EnumValueDescriptor(
name='LANCZOS4',
index=4,
number=5,
serialized_options=None,
......@@ -340,26 +329,19 @@ _LOSSPARAMETER_NORMALIZATIONMODE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='FULL',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='VALID',
index=1,
number=1,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='FULL', index=0, number=0, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='VALID', index=1, number=1, serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='BATCH_SIZE',
_descriptor.EnumValueDescriptor(
name='BATCH_SIZE',
index=2,
number=2,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='NONE',
index=3,
number=3,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='NONE', index=3, number=3, serialized_options=None, type=None),
],
containing_type=None,
serialized_options=None,
......@@ -374,20 +356,17 @@ _CONVOLUTIONPARAMETER_ENGINE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='DEFAULT',
_descriptor.EnumValueDescriptor(
name='DEFAULT',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CAFFE',
index=1,
number=1,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='CAFFE', index=1, number=1, serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CUDNN',
index=2,
number=2,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='CUDNN', index=2, number=2, serialized_options=None,
type=None),
],
containing_type=None,
......@@ -403,16 +382,14 @@ _DATAPARAMETER_DB = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='LEVELDB',
_descriptor.EnumValueDescriptor(
name='LEVELDB',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='LMDB',
index=1,
number=1,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='LMDB', index=1, number=1, serialized_options=None, type=None),
],
containing_type=None,
serialized_options=None,
......@@ -427,21 +404,12 @@ _ELTWISEPARAMETER_ELTWISEOP = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='PROD',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='SUM',
index=1,
number=1,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='MAX',
index=2,
number=2,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='PROD', index=0, number=0, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='SUM', index=1, number=1, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='MAX', index=2, number=2, serialized_options=None, type=None),
],
containing_type=None,
serialized_options=None,
......@@ -456,16 +424,10 @@ _HINGELOSSPARAMETER_NORM = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='L1',
index=0,
number=1,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='L2',
index=1,
number=2,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='L1', index=0, number=1, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='L2', index=1, number=2, serialized_options=None, type=None),
],
containing_type=None,
serialized_options=None,
......@@ -480,12 +442,14 @@ _LRNPARAMETER_NORMREGION = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='ACROSS_CHANNELS',
_descriptor.EnumValueDescriptor(
name='ACROSS_CHANNELS',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='WITHIN_CHANNEL',
_descriptor.EnumValueDescriptor(
name='WITHIN_CHANNEL',
index=1,
number=1,
serialized_options=None,
......@@ -504,20 +468,17 @@ _LRNPARAMETER_ENGINE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='DEFAULT',
_descriptor.EnumValueDescriptor(
name='DEFAULT',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CAFFE',
index=1,
number=1,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='CAFFE', index=1, number=1, serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CUDNN',
index=2,
number=2,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='CUDNN', index=2, number=2, serialized_options=None,
type=None),
],
containing_type=None,
......@@ -533,12 +494,10 @@ _MULTIBOXLOSSPARAMETER_LOCLOSSTYPE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='L2',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='SMOOTH_L1',
_descriptor.EnumValueDescriptor(
name='L2', index=0, number=0, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='SMOOTH_L1',
index=1,
number=1,
serialized_options=None,
......@@ -557,12 +516,14 @@ _MULTIBOXLOSSPARAMETER_CONFLOSSTYPE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='SOFTMAX',
_descriptor.EnumValueDescriptor(
name='SOFTMAX',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='LOGISTIC',
_descriptor.EnumValueDescriptor(
name='LOGISTIC',
index=1,
number=1,
serialized_options=None,
......@@ -581,12 +542,14 @@ _MULTIBOXLOSSPARAMETER_MATCHTYPE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='BIPARTITE',
_descriptor.EnumValueDescriptor(
name='BIPARTITE',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='PER_PREDICTION',
_descriptor.EnumValueDescriptor(
name='PER_PREDICTION',
index=1,
number=1,
serialized_options=None,
......@@ -605,17 +568,16 @@ _MULTIBOXLOSSPARAMETER_MININGTYPE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='NONE',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='MAX_NEGATIVE',
_descriptor.EnumValueDescriptor(
name='NONE', index=0, number=0, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='MAX_NEGATIVE',
index=1,
number=1,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='HARD_EXAMPLE',
_descriptor.EnumValueDescriptor(
name='HARD_EXAMPLE',
index=2,
number=2,
serialized_options=None,
......@@ -634,17 +596,12 @@ _POOLINGPARAMETER_POOLMETHOD = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='MAX',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='AVE',
index=1,
number=1,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='STOCHASTIC',
_descriptor.EnumValueDescriptor(
name='MAX', index=0, number=0, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='AVE', index=1, number=1, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='STOCHASTIC',
index=2,
number=2,
serialized_options=None,
......@@ -663,20 +620,17 @@ _POOLINGPARAMETER_ENGINE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='DEFAULT',
_descriptor.EnumValueDescriptor(
name='DEFAULT',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CAFFE',
index=1,
number=1,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='CAFFE', index=1, number=1, serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CUDNN',
index=2,
number=2,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='CUDNN', index=2, number=2, serialized_options=None,
type=None),
],
containing_type=None,
......@@ -692,17 +646,20 @@ _PRIORBOXPARAMETER_CODETYPE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='CORNER',
_descriptor.EnumValueDescriptor(
name='CORNER',
index=0,
number=1,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CENTER_SIZE',
_descriptor.EnumValueDescriptor(
name='CENTER_SIZE',
index=1,
number=2,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CORNER_SIZE',
_descriptor.EnumValueDescriptor(
name='CORNER_SIZE',
index=2,
number=3,
serialized_options=None,
......@@ -721,26 +678,15 @@ _REDUCTIONPARAMETER_REDUCTIONOP = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='SUM',
index=0,
number=1,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='ASUM',
index=1,
number=2,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='SUMSQ',
index=2,
number=3,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='MEAN',
index=3,
number=4,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='SUM', index=0, number=1, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='ASUM', index=1, number=2, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='SUMSQ', index=2, number=3, serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='MEAN', index=3, number=4, serialized_options=None, type=None),
],
containing_type=None,
serialized_options=None,
......@@ -755,20 +701,17 @@ _RELUPARAMETER_ENGINE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='DEFAULT',
_descriptor.EnumValueDescriptor(
name='DEFAULT',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CAFFE',
index=1,
number=1,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='CAFFE', index=1, number=1, serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CUDNN',
index=2,
number=2,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='CUDNN', index=2, number=2, serialized_options=None,
type=None),
],
containing_type=None,
......@@ -784,20 +727,17 @@ _SIGMOIDPARAMETER_ENGINE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='DEFAULT',
_descriptor.EnumValueDescriptor(
name='DEFAULT',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CAFFE',
index=1,
number=1,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='CAFFE', index=1, number=1, serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CUDNN',
index=2,
number=2,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='CUDNN', index=2, number=2, serialized_options=None,
type=None),
],
containing_type=None,
......@@ -813,20 +753,17 @@ _SOFTMAXPARAMETER_ENGINE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='DEFAULT',
_descriptor.EnumValueDescriptor(
name='DEFAULT',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CAFFE',
index=1,
number=1,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='CAFFE', index=1, number=1, serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CUDNN',
index=2,
number=2,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='CUDNN', index=2, number=2, serialized_options=None,
type=None),
],
containing_type=None,
......@@ -842,20 +779,17 @@ _TANHPARAMETER_ENGINE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='DEFAULT',
_descriptor.EnumValueDescriptor(
name='DEFAULT',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CAFFE',
index=1,
number=1,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='CAFFE', index=1, number=1, serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CUDNN',
index=2,
number=2,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='CUDNN', index=2, number=2, serialized_options=None,
type=None),
],
containing_type=None,
......@@ -871,15 +805,14 @@ _VIDEODATAPARAMETER_VIDEOTYPE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='WEBCAM',
_descriptor.EnumValueDescriptor(
name='WEBCAM',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='VIDEO',
index=1,
number=1,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='VIDEO', index=1, number=1, serialized_options=None,
type=None),
],
containing_type=None,
......@@ -895,17 +828,12 @@ _SPPPARAMETER_POOLMETHOD = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='MAX',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='AVE',
index=1,
number=1,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='STOCHASTIC',
_descriptor.EnumValueDescriptor(
name='MAX', index=0, number=0, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='AVE', index=1, number=1, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='STOCHASTIC',
index=2,
number=2,
serialized_options=None,
......@@ -924,20 +852,17 @@ _SPPPARAMETER_ENGINE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='DEFAULT',
_descriptor.EnumValueDescriptor(
name='DEFAULT',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CAFFE',
index=1,
number=1,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='CAFFE', index=1, number=1, serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CUDNN',
index=2,
number=2,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='CUDNN', index=2, number=2, serialized_options=None,
type=None),
],
containing_type=None,
......@@ -953,202 +878,221 @@ _V1LAYERPARAMETER_LAYERTYPE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='NONE',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='ABSVAL',
_descriptor.EnumValueDescriptor(
name='NONE', index=0, number=0, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='ABSVAL',
index=1,
number=35,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='ACCURACY',
_descriptor.EnumValueDescriptor(
name='ACCURACY',
index=2,
number=1,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='ARGMAX',
_descriptor.EnumValueDescriptor(
name='ARGMAX',
index=3,
number=30,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='BNLL',
index=4,
number=2,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CONCAT',
_descriptor.EnumValueDescriptor(
name='BNLL', index=4, number=2, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='CONCAT',
index=5,
number=3,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CONTRASTIVE_LOSS',
_descriptor.EnumValueDescriptor(
name='CONTRASTIVE_LOSS',
index=6,
number=37,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='CONVOLUTION',
_descriptor.EnumValueDescriptor(
name='CONVOLUTION',
index=7,
number=4,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='DATA',
index=8,
number=5,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='DECONVOLUTION',
_descriptor.EnumValueDescriptor(
name='DATA', index=8, number=5, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='DECONVOLUTION',
index=9,
number=39,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='DROPOUT',
_descriptor.EnumValueDescriptor(
name='DROPOUT',
index=10,
number=6,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='DUMMY_DATA',
_descriptor.EnumValueDescriptor(
name='DUMMY_DATA',
index=11,
number=32,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='EUCLIDEAN_LOSS',
_descriptor.EnumValueDescriptor(
name='EUCLIDEAN_LOSS',
index=12,
number=7,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='ELTWISE',
_descriptor.EnumValueDescriptor(
name='ELTWISE',
index=13,
number=25,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='EXP',
index=14,
number=38,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='EXP', index=14, number=38, serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='FLATTEN',
_descriptor.EnumValueDescriptor(
name='FLATTEN',
index=15,
number=8,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='HDF5_DATA',
_descriptor.EnumValueDescriptor(
name='HDF5_DATA',
index=16,
number=9,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='HDF5_OUTPUT',
_descriptor.EnumValueDescriptor(
name='HDF5_OUTPUT',
index=17,
number=10,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='HINGE_LOSS',
_descriptor.EnumValueDescriptor(
name='HINGE_LOSS',
index=18,
number=28,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='IM2COL',
_descriptor.EnumValueDescriptor(
name='IM2COL',
index=19,
number=11,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='IMAGE_DATA',
_descriptor.EnumValueDescriptor(
name='IMAGE_DATA',
index=20,
number=12,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='INFOGAIN_LOSS',
_descriptor.EnumValueDescriptor(
name='INFOGAIN_LOSS',
index=21,
number=13,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='INNER_PRODUCT',
_descriptor.EnumValueDescriptor(
name='INNER_PRODUCT',
index=22,
number=14,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='LRN',
index=23,
number=15,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='LRN', index=23, number=15, serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='MEMORY_DATA',
_descriptor.EnumValueDescriptor(
name='MEMORY_DATA',
index=24,
number=29,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='MULTINOMIAL_LOGISTIC_LOSS',
_descriptor.EnumValueDescriptor(
name='MULTINOMIAL_LOGISTIC_LOSS',
index=25,
number=16,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='MVN',
index=26,
number=34,
serialized_options=None,
_descriptor.EnumValueDescriptor(
name='MVN', index=26, number=34, serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='POOLING',
_descriptor.EnumValueDescriptor(
name='POOLING',
index=27,
number=17,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='POWER',
_descriptor.EnumValueDescriptor(
name='POWER',
index=28,
number=26,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='RELU',
_descriptor.EnumValueDescriptor(
name='RELU',
index=29,
number=18,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='SIGMOID',
_descriptor.EnumValueDescriptor(
name='SIGMOID',
index=30,
number=19,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='SIGMOID_CROSS_ENTROPY_LOSS',
_descriptor.EnumValueDescriptor(
name='SIGMOID_CROSS_ENTROPY_LOSS',
index=31,
number=27,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='SILENCE',
_descriptor.EnumValueDescriptor(
name='SILENCE',
index=32,
number=36,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='SOFTMAX',
_descriptor.EnumValueDescriptor(
name='SOFTMAX',
index=33,
number=20,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='SOFTMAX_LOSS',
_descriptor.EnumValueDescriptor(
name='SOFTMAX_LOSS',
index=34,
number=21,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='SPLIT',
_descriptor.EnumValueDescriptor(
name='SPLIT',
index=35,
number=22,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='SLICE',
_descriptor.EnumValueDescriptor(
name='SLICE',
index=36,
number=33,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='TANH',
_descriptor.EnumValueDescriptor(
name='TANH',
index=37,
number=23,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='WINDOW_DATA',
_descriptor.EnumValueDescriptor(
name='WINDOW_DATA',
index=38,
number=24,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='THRESHOLD',
_descriptor.EnumValueDescriptor(
name='THRESHOLD',
index=39,
number=31,
serialized_options=None,
......@@ -1167,12 +1111,14 @@ _V1LAYERPARAMETER_DIMCHECKMODE = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='STRICT',
_descriptor.EnumValueDescriptor(
name='STRICT',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='PERMISSIVE',
_descriptor.EnumValueDescriptor(
name='PERMISSIVE',
index=1,
number=1,
serialized_options=None,
......@@ -1191,17 +1137,12 @@ _V0LAYERPARAMETER_POOLMETHOD = _descriptor.EnumDescriptor(
filename=None,
file=DESCRIPTOR,
values=[
_descriptor.EnumValueDescriptor(name='MAX',
index=0,
number=0,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='AVE',
index=1,
number=1,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(name='STOCHASTIC',
_descriptor.EnumValueDescriptor(
name='MAX', index=0, number=0, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='AVE', index=1, number=1, serialized_options=None, type=None),
_descriptor.EnumValueDescriptor(
name='STOCHASTIC',
index=2,
number=2,
serialized_options=None,
......@@ -1221,7 +1162,8 @@ _BLOBSHAPE = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='dim',
_descriptor.FieldDescriptor(
name='dim',
full_name='caffe.BlobShape.dim',
index=0,
number=1,
......@@ -1257,7 +1199,8 @@ _BLOBPROTO = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='shape',
_descriptor.FieldDescriptor(
name='shape',
full_name='caffe.BlobProto.shape',
index=0,
number=7,
......@@ -1273,7 +1216,8 @@ _BLOBPROTO = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='data',
_descriptor.FieldDescriptor(
name='data',
full_name='caffe.BlobProto.data',
index=1,
number=5,
......@@ -1289,7 +1233,8 @@ _BLOBPROTO = _descriptor.Descriptor(
extension_scope=None,
serialized_options=_b('\020\001'),
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='diff',
_descriptor.FieldDescriptor(
name='diff',
full_name='caffe.BlobProto.diff',
index=2,
number=6,
......@@ -1305,7 +1250,8 @@ _BLOBPROTO = _descriptor.Descriptor(
extension_scope=None,
serialized_options=_b('\020\001'),
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='double_data',
_descriptor.FieldDescriptor(
name='double_data',
full_name='caffe.BlobProto.double_data',
index=3,
number=8,
......@@ -1321,7 +1267,8 @@ _BLOBPROTO = _descriptor.Descriptor(
extension_scope=None,
serialized_options=_b('\020\001'),
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='double_diff',
_descriptor.FieldDescriptor(
name='double_diff',
full_name='caffe.BlobProto.double_diff',
index=4,
number=9,
......@@ -1337,7 +1284,8 @@ _BLOBPROTO = _descriptor.Descriptor(
extension_scope=None,
serialized_options=_b('\020\001'),
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='num',
_descriptor.FieldDescriptor(
name='num',
full_name='caffe.BlobProto.num',
index=5,
number=1,
......@@ -1353,7 +1301,8 @@ _BLOBPROTO = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='channels',
_descriptor.FieldDescriptor(
name='channels',
full_name='caffe.BlobProto.channels',
index=6,
number=2,
......@@ -1369,7 +1318,8 @@ _BLOBPROTO = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='height',
_descriptor.FieldDescriptor(
name='height',
full_name='caffe.BlobProto.height',
index=7,
number=3,
......@@ -1385,7 +1335,8 @@ _BLOBPROTO = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='width',
_descriptor.FieldDescriptor(
name='width',
full_name='caffe.BlobProto.width',
index=8,
number=4,
......@@ -1421,7 +1372,8 @@ _BLOBPROTOVECTOR = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='blobs',
_descriptor.FieldDescriptor(
name='blobs',
full_name='caffe.BlobProtoVector.blobs',
index=0,
number=1,
......@@ -1457,7 +1409,8 @@ _DATUM = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='channels',
_descriptor.FieldDescriptor(
name='channels',
full_name='caffe.Datum.channels',
index=0,
number=1,
......@@ -1473,7 +1426,8 @@ _DATUM = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='height',
_descriptor.FieldDescriptor(
name='height',
full_name='caffe.Datum.height',
index=1,
number=2,
......@@ -1489,7 +1443,8 @@ _DATUM = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='width',
_descriptor.FieldDescriptor(
name='width',
full_name='caffe.Datum.width',
index=2,
number=3,
......@@ -1505,7 +1460,8 @@ _DATUM = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='data',
_descriptor.FieldDescriptor(
name='data',
full_name='caffe.Datum.data',
index=3,
number=4,
......@@ -1521,7 +1477,8 @@ _DATUM = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='label',
_descriptor.FieldDescriptor(
name='label',
full_name='caffe.Datum.label',
index=4,
number=5,
......@@ -1537,7 +1494,8 @@ _DATUM = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='float_data',
_descriptor.FieldDescriptor(
name='float_data',
full_name='caffe.Datum.float_data',
index=5,
number=6,
......@@ -1553,7 +1511,8 @@ _DATUM = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='encoded',
_descriptor.FieldDescriptor(
name='encoded',
full_name='caffe.Datum.encoded',
index=6,
number=7,
......@@ -1589,7 +1548,8 @@ _LABELMAPITEM = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='name',
_descriptor.FieldDescriptor(
name='name',
full_name='caffe.LabelMapItem.name',
index=0,
number=1,
......@@ -1605,7 +1565,8 @@ _LABELMAPITEM = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='label',
_descriptor.FieldDescriptor(
name='label',
full_name='caffe.LabelMapItem.label',
index=1,
number=2,
......@@ -1621,7 +1582,8 @@ _LABELMAPITEM = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='display_name',
_descriptor.FieldDescriptor(
name='display_name',
full_name='caffe.LabelMapItem.display_name',
index=2,
number=3,
......@@ -1657,7 +1619,8 @@ _LABELMAP = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='item',
_descriptor.FieldDescriptor(
name='item',
full_name='caffe.LabelMap.item',
index=0,
number=1,
......@@ -1693,7 +1656,8 @@ _SAMPLER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='min_scale',
_descriptor.FieldDescriptor(
name='min_scale',
full_name='caffe.Sampler.min_scale',
index=0,
number=1,
......@@ -1709,7 +1673,8 @@ _SAMPLER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='max_scale',
_descriptor.FieldDescriptor(
name='max_scale',
full_name='caffe.Sampler.max_scale',
index=1,
number=2,
......@@ -1725,7 +1690,8 @@ _SAMPLER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='min_aspect_ratio',
_descriptor.FieldDescriptor(
name='min_aspect_ratio',
full_name='caffe.Sampler.min_aspect_ratio',
index=2,
number=3,
......@@ -1741,7 +1707,8 @@ _SAMPLER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='max_aspect_ratio',
_descriptor.FieldDescriptor(
name='max_aspect_ratio',
full_name='caffe.Sampler.max_aspect_ratio',
index=3,
number=4,
......@@ -1916,7 +1883,8 @@ _BATCHSAMPLER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='sampler',
_descriptor.FieldDescriptor(
name='sampler',
full_name='caffe.BatchSampler.sampler',
index=1,
number=2,
......@@ -1949,7 +1917,8 @@ _BATCHSAMPLER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='max_sample',
_descriptor.FieldDescriptor(
name='max_sample',
full_name='caffe.BatchSampler.max_sample',
index=3,
number=4,
......@@ -1965,7 +1934,8 @@ _BATCHSAMPLER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='max_trials',
_descriptor.FieldDescriptor(
name='max_trials',
full_name='caffe.BatchSampler.max_trials',
index=4,
number=5,
......@@ -2001,7 +1971,8 @@ _EMITCONSTRAINT = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='emit_type',
_descriptor.FieldDescriptor(
name='emit_type',
full_name='caffe.EmitConstraint.emit_type',
index=0,
number=1,
......@@ -2056,7 +2027,8 @@ _NORMALIZEDBBOX = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='xmin',
_descriptor.FieldDescriptor(
name='xmin',
full_name='caffe.NormalizedBBox.xmin',
index=0,
number=1,
......@@ -2072,7 +2044,8 @@ _NORMALIZEDBBOX = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='ymin',
_descriptor.FieldDescriptor(
name='ymin',
full_name='caffe.NormalizedBBox.ymin',
index=1,
number=2,
......@@ -2088,7 +2061,8 @@ _NORMALIZEDBBOX = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='xmax',
_descriptor.FieldDescriptor(
name='xmax',
full_name='caffe.NormalizedBBox.xmax',
index=2,
number=3,
......@@ -2104,7 +2078,8 @@ _NORMALIZEDBBOX = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='ymax',
_descriptor.FieldDescriptor(
name='ymax',
full_name='caffe.NormalizedBBox.ymax',
index=3,
number=4,
......@@ -2120,7 +2095,8 @@ _NORMALIZEDBBOX = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='label',
_descriptor.FieldDescriptor(
name='label',
full_name='caffe.NormalizedBBox.label',
index=4,
number=5,
......@@ -2136,7 +2112,8 @@ _NORMALIZEDBBOX = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='difficult',
_descriptor.FieldDescriptor(
name='difficult',
full_name='caffe.NormalizedBBox.difficult',
index=5,
number=6,
......@@ -2152,7 +2129,8 @@ _NORMALIZEDBBOX = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='score',
_descriptor.FieldDescriptor(
name='score',
full_name='caffe.NormalizedBBox.score',
index=6,
number=7,
......@@ -2168,7 +2146,8 @@ _NORMALIZEDBBOX = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='size',
_descriptor.FieldDescriptor(
name='size',
full_name='caffe.NormalizedBBox.size',
index=7,
number=8,
......@@ -2204,7 +2183,8 @@ _ANNOTATION = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='instance_id',
_descriptor.FieldDescriptor(
name='instance_id',
full_name='caffe.Annotation.instance_id',
index=0,
number=1,
......@@ -2220,7 +2200,8 @@ _ANNOTATION = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='bbox',
_descriptor.FieldDescriptor(
name='bbox',
full_name='caffe.Annotation.bbox',
index=1,
number=2,
......@@ -2310,7 +2291,8 @@ _ANNOTATEDDATUM = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='datum',
_descriptor.FieldDescriptor(
name='datum',
full_name='caffe.AnnotatedDatum.datum',
index=0,
number=1,
......@@ -2326,7 +2308,8 @@ _ANNOTATEDDATUM = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='type',
_descriptor.FieldDescriptor(
name='type',
full_name='caffe.AnnotatedDatum.type',
index=1,
number=2,
......@@ -2398,7 +2381,8 @@ _FILLERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='value',
_descriptor.FieldDescriptor(
name='value',
full_name='caffe.FillerParameter.value',
index=1,
number=2,
......@@ -2414,7 +2398,8 @@ _FILLERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='min',
_descriptor.FieldDescriptor(
name='min',
full_name='caffe.FillerParameter.min',
index=2,
number=3,
......@@ -2430,7 +2415,8 @@ _FILLERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='max',
_descriptor.FieldDescriptor(
name='max',
full_name='caffe.FillerParameter.max',
index=3,
number=4,
......@@ -2446,7 +2432,8 @@ _FILLERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='mean',
_descriptor.FieldDescriptor(
name='mean',
full_name='caffe.FillerParameter.mean',
index=4,
number=5,
......@@ -2462,7 +2449,8 @@ _FILLERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='std',
_descriptor.FieldDescriptor(
name='std',
full_name='caffe.FillerParameter.std',
index=5,
number=6,
......@@ -2478,7 +2466,8 @@ _FILLERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='sparse',
_descriptor.FieldDescriptor(
name='sparse',
full_name='caffe.FillerParameter.sparse',
index=6,
number=7,
......@@ -2533,7 +2522,8 @@ _NETPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='name',
_descriptor.FieldDescriptor(
name='name',
full_name='caffe.NetParameter.name',
index=0,
number=1,
......@@ -2549,7 +2539,8 @@ _NETPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='input',
_descriptor.FieldDescriptor(
name='input',
full_name='caffe.NetParameter.input',
index=1,
number=3,
......@@ -2565,7 +2556,8 @@ _NETPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='input_shape',
_descriptor.FieldDescriptor(
name='input_shape',
full_name='caffe.NetParameter.input_shape',
index=2,
number=8,
......@@ -2581,7 +2573,8 @@ _NETPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='input_dim',
_descriptor.FieldDescriptor(
name='input_dim',
full_name='caffe.NetParameter.input_dim',
index=3,
number=4,
......@@ -2614,7 +2607,8 @@ _NETPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='state',
_descriptor.FieldDescriptor(
name='state',
full_name='caffe.NetParameter.state',
index=5,
number=6,
......@@ -2630,7 +2624,8 @@ _NETPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='debug_info',
_descriptor.FieldDescriptor(
name='debug_info',
full_name='caffe.NetParameter.debug_info',
index=6,
number=7,
......@@ -2646,7 +2641,8 @@ _NETPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='layer',
_descriptor.FieldDescriptor(
name='layer',
full_name='caffe.NetParameter.layer',
index=7,
number=100,
......@@ -2662,7 +2658,8 @@ _NETPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='layers',
_descriptor.FieldDescriptor(
name='layers',
full_name='caffe.NetParameter.layers',
index=8,
number=2,
......@@ -2698,7 +2695,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='net',
_descriptor.FieldDescriptor(
name='net',
full_name='caffe.SolverParameter.net',
index=0,
number=24,
......@@ -2714,7 +2712,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='net_param',
_descriptor.FieldDescriptor(
name='net_param',
full_name='caffe.SolverParameter.net_param',
index=1,
number=25,
......@@ -2730,7 +2729,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='train_net',
_descriptor.FieldDescriptor(
name='train_net',
full_name='caffe.SolverParameter.train_net',
index=2,
number=1,
......@@ -2746,7 +2746,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='test_net',
_descriptor.FieldDescriptor(
name='test_net',
full_name='caffe.SolverParameter.test_net',
index=3,
number=2,
......@@ -2881,7 +2882,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='test_iter',
_descriptor.FieldDescriptor(
name='test_iter',
full_name='caffe.SolverParameter.test_iter',
index=11,
number=3,
......@@ -2948,7 +2950,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='base_lr',
_descriptor.FieldDescriptor(
name='base_lr',
full_name='caffe.SolverParameter.base_lr',
index=15,
number=5,
......@@ -2964,7 +2967,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='display',
_descriptor.FieldDescriptor(
name='display',
full_name='caffe.SolverParameter.display',
index=16,
number=6,
......@@ -2997,7 +3001,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='max_iter',
_descriptor.FieldDescriptor(
name='max_iter',
full_name='caffe.SolverParameter.max_iter',
index=18,
number=7,
......@@ -3013,7 +3018,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='iter_size',
_descriptor.FieldDescriptor(
name='iter_size',
full_name='caffe.SolverParameter.iter_size',
index=19,
number=36,
......@@ -3029,7 +3035,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='lr_policy',
_descriptor.FieldDescriptor(
name='lr_policy',
full_name='caffe.SolverParameter.lr_policy',
index=20,
number=8,
......@@ -3045,7 +3052,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='gamma',
_descriptor.FieldDescriptor(
name='gamma',
full_name='caffe.SolverParameter.gamma',
index=21,
number=9,
......@@ -3061,7 +3069,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='power',
_descriptor.FieldDescriptor(
name='power',
full_name='caffe.SolverParameter.power',
index=22,
number=10,
......@@ -3077,7 +3086,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='momentum',
_descriptor.FieldDescriptor(
name='momentum',
full_name='caffe.SolverParameter.momentum',
index=23,
number=11,
......@@ -3127,7 +3137,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='stepsize',
_descriptor.FieldDescriptor(
name='stepsize',
full_name='caffe.SolverParameter.stepsize',
index=26,
number=13,
......@@ -3143,7 +3154,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='stepvalue',
_descriptor.FieldDescriptor(
name='stepvalue',
full_name='caffe.SolverParameter.stepvalue',
index=27,
number=34,
......@@ -3193,7 +3205,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='snapshot',
_descriptor.FieldDescriptor(
name='snapshot',
full_name='caffe.SolverParameter.snapshot',
index=30,
number=14,
......@@ -3277,7 +3290,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='device_id',
_descriptor.FieldDescriptor(
name='device_id',
full_name='caffe.SolverParameter.device_id',
index=35,
number=18,
......@@ -3310,7 +3324,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='type',
_descriptor.FieldDescriptor(
name='type',
full_name='caffe.SolverParameter.type',
index=37,
number=40,
......@@ -3326,7 +3341,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='delta',
_descriptor.FieldDescriptor(
name='delta',
full_name='caffe.SolverParameter.delta',
index=38,
number=31,
......@@ -3342,7 +3358,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='momentum2',
_descriptor.FieldDescriptor(
name='momentum2',
full_name='caffe.SolverParameter.momentum2',
index=39,
number=39,
......@@ -3358,7 +3375,8 @@ _SOLVERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='rms_decay',
_descriptor.FieldDescriptor(
name='rms_decay',
full_name='caffe.SolverParameter.rms_decay',
index=40,
number=38,
......@@ -3449,7 +3467,8 @@ _SOLVERSTATE = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='iter',
_descriptor.FieldDescriptor(
name='iter',
full_name='caffe.SolverState.iter',
index=0,
number=1,
......@@ -3465,7 +3484,8 @@ _SOLVERSTATE = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='learned_net',
_descriptor.FieldDescriptor(
name='learned_net',
full_name='caffe.SolverState.learned_net',
index=1,
number=2,
......@@ -3481,7 +3501,8 @@ _SOLVERSTATE = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='history',
_descriptor.FieldDescriptor(
name='history',
full_name='caffe.SolverState.history',
index=2,
number=3,
......@@ -3497,7 +3518,8 @@ _SOLVERSTATE = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='current_step',
_descriptor.FieldDescriptor(
name='current_step',
full_name='caffe.SolverState.current_step',
index=3,
number=4,
......@@ -3513,7 +3535,8 @@ _SOLVERSTATE = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='minimum_loss',
_descriptor.FieldDescriptor(
name='minimum_loss',
full_name='caffe.SolverState.minimum_loss',
index=4,
number=5,
......@@ -3566,7 +3589,8 @@ _NETSTATE = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='phase',
_descriptor.FieldDescriptor(
name='phase',
full_name='caffe.NetState.phase',
index=0,
number=1,
......@@ -3582,7 +3606,8 @@ _NETSTATE = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='level',
_descriptor.FieldDescriptor(
name='level',
full_name='caffe.NetState.level',
index=1,
number=2,
......@@ -3598,7 +3623,8 @@ _NETSTATE = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='stage',
_descriptor.FieldDescriptor(
name='stage',
full_name='caffe.NetState.stage',
index=2,
number=3,
......@@ -3634,7 +3660,8 @@ _NETSTATERULE = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='phase',
_descriptor.FieldDescriptor(
name='phase',
full_name='caffe.NetStateRule.phase',
index=0,
number=1,
......@@ -3650,7 +3677,8 @@ _NETSTATERULE = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='min_level',
_descriptor.FieldDescriptor(
name='min_level',
full_name='caffe.NetStateRule.min_level',
index=1,
number=2,
......@@ -3666,7 +3694,8 @@ _NETSTATERULE = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='max_level',
_descriptor.FieldDescriptor(
name='max_level',
full_name='caffe.NetStateRule.max_level',
index=2,
number=3,
......@@ -3682,7 +3711,8 @@ _NETSTATERULE = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='stage',
_descriptor.FieldDescriptor(
name='stage',
full_name='caffe.NetStateRule.stage',
index=3,
number=4,
......@@ -3698,7 +3728,8 @@ _NETSTATERULE = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='not_stage',
_descriptor.FieldDescriptor(
name='not_stage',
full_name='caffe.NetStateRule.not_stage',
index=4,
number=5,
......@@ -3734,7 +3765,8 @@ _PARAMSPEC = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='name',
_descriptor.FieldDescriptor(
name='name',
full_name='caffe.ParamSpec.name',
index=0,
number=1,
......@@ -3750,7 +3782,8 @@ _PARAMSPEC = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='share_mode',
_descriptor.FieldDescriptor(
name='share_mode',
full_name='caffe.ParamSpec.share_mode',
index=1,
number=2,
......@@ -3766,7 +3799,8 @@ _PARAMSPEC = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='lr_mult',
_descriptor.FieldDescriptor(
name='lr_mult',
full_name='caffe.ParamSpec.lr_mult',
index=2,
number=3,
......@@ -3782,7 +3816,8 @@ _PARAMSPEC = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='decay_mult',
_descriptor.FieldDescriptor(
name='decay_mult',
full_name='caffe.ParamSpec.decay_mult',
index=3,
number=4,
......@@ -3820,7 +3855,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='name',
_descriptor.FieldDescriptor(
name='name',
full_name='caffe.LayerParameter.name',
index=0,
number=1,
......@@ -3836,7 +3872,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='type',
_descriptor.FieldDescriptor(
name='type',
full_name='caffe.LayerParameter.type',
index=1,
number=2,
......@@ -3852,7 +3889,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='bottom',
_descriptor.FieldDescriptor(
name='bottom',
full_name='caffe.LayerParameter.bottom',
index=2,
number=3,
......@@ -3868,7 +3906,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='top',
_descriptor.FieldDescriptor(
name='top',
full_name='caffe.LayerParameter.top',
index=3,
number=4,
......@@ -3884,7 +3923,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='phase',
_descriptor.FieldDescriptor(
name='phase',
full_name='caffe.LayerParameter.phase',
index=4,
number=10,
......@@ -3917,7 +3957,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='param',
_descriptor.FieldDescriptor(
name='param',
full_name='caffe.LayerParameter.param',
index=6,
number=6,
......@@ -3933,7 +3974,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='blobs',
_descriptor.FieldDescriptor(
name='blobs',
full_name='caffe.LayerParameter.blobs',
index=7,
number=7,
......@@ -3966,7 +4008,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='include',
_descriptor.FieldDescriptor(
name='include',
full_name='caffe.LayerParameter.include',
index=9,
number=8,
......@@ -3982,7 +4025,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='exclude',
_descriptor.FieldDescriptor(
name='exclude',
full_name='caffe.LayerParameter.exclude',
index=10,
number=9,
......@@ -4015,7 +4059,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='loss_param',
_descriptor.FieldDescriptor(
name='loss_param',
full_name='caffe.LayerParameter.loss_param',
index=12,
number=101,
......@@ -4099,7 +4144,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='bias_param',
_descriptor.FieldDescriptor(
name='bias_param',
full_name='caffe.LayerParameter.bias_param',
index=17,
number=141,
......@@ -4166,7 +4212,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='crop_param',
_descriptor.FieldDescriptor(
name='crop_param',
full_name='caffe.LayerParameter.crop_param',
index=21,
number=144,
......@@ -4182,7 +4229,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='data_param',
_descriptor.FieldDescriptor(
name='data_param',
full_name='caffe.LayerParameter.data_param',
index=22,
number=107,
......@@ -4283,7 +4331,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='elu_param',
_descriptor.FieldDescriptor(
name='elu_param',
full_name='caffe.LayerParameter.elu_param',
index=28,
number=140,
......@@ -4316,7 +4365,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='exp_param',
_descriptor.FieldDescriptor(
name='exp_param',
full_name='caffe.LayerParameter.exp_param',
index=30,
number=111,
......@@ -4468,7 +4518,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='log_param',
_descriptor.FieldDescriptor(
name='log_param',
full_name='caffe.LayerParameter.log_param',
index=39,
number=134,
......@@ -4484,7 +4535,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='lrn_param',
_descriptor.FieldDescriptor(
name='lrn_param',
full_name='caffe.LayerParameter.lrn_param',
index=40,
number=118,
......@@ -4534,7 +4586,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='mvn_param',
_descriptor.FieldDescriptor(
name='mvn_param',
full_name='caffe.LayerParameter.mvn_param',
index=43,
number=120,
......@@ -4550,7 +4603,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='norm_param',
_descriptor.FieldDescriptor(
name='norm_param',
full_name='caffe.LayerParameter.norm_param',
index=44,
number=206,
......@@ -4719,7 +4773,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='relu_param',
_descriptor.FieldDescriptor(
name='relu_param',
full_name='caffe.LayerParameter.relu_param',
index=54,
number=123,
......@@ -4820,7 +4875,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='spp_param',
_descriptor.FieldDescriptor(
name='spp_param',
full_name='caffe.LayerParameter.spp_param',
index=60,
number=132,
......@@ -4853,7 +4909,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='tanh_param',
_descriptor.FieldDescriptor(
name='tanh_param',
full_name='caffe.LayerParameter.tanh_param',
index=62,
number=127,
......@@ -4886,7 +4943,8 @@ _LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='tile_param',
_descriptor.FieldDescriptor(
name='tile_param',
full_name='caffe.LayerParameter.tile_param',
index=64,
number=138,
......@@ -5214,7 +5272,8 @@ _RESIZEPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='prob',
_descriptor.FieldDescriptor(
name='prob',
full_name='caffe.ResizeParameter.prob',
index=0,
number=1,
......@@ -5247,7 +5306,8 @@ _RESIZEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='height',
_descriptor.FieldDescriptor(
name='height',
full_name='caffe.ResizeParameter.height',
index=2,
number=3,
......@@ -5263,7 +5323,8 @@ _RESIZEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='width',
_descriptor.FieldDescriptor(
name='width',
full_name='caffe.ResizeParameter.width',
index=3,
number=4,
......@@ -5313,7 +5374,8 @@ _RESIZEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='pad_mode',
_descriptor.FieldDescriptor(
name='pad_mode',
full_name='caffe.ResizeParameter.pad_mode',
index=6,
number=5,
......@@ -5329,7 +5391,8 @@ _RESIZEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='pad_value',
_descriptor.FieldDescriptor(
name='pad_value',
full_name='caffe.ResizeParameter.pad_value',
index=7,
number=6,
......@@ -5403,7 +5466,8 @@ _SALTPEPPERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='value',
_descriptor.FieldDescriptor(
name='value',
full_name='caffe.SaltPepperParameter.value',
index=1,
number=2,
......@@ -5439,7 +5503,8 @@ _NOISEPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='prob',
_descriptor.FieldDescriptor(
name='prob',
full_name='caffe.NoiseParameter.prob',
index=0,
number=1,
......@@ -5455,7 +5520,8 @@ _NOISEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='hist_eq',
_descriptor.FieldDescriptor(
name='hist_eq',
full_name='caffe.NoiseParameter.hist_eq',
index=1,
number=2,
......@@ -5471,7 +5537,8 @@ _NOISEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='inverse',
_descriptor.FieldDescriptor(
name='inverse',
full_name='caffe.NoiseParameter.inverse',
index=2,
number=3,
......@@ -5487,7 +5554,8 @@ _NOISEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='decolorize',
_descriptor.FieldDescriptor(
name='decolorize',
full_name='caffe.NoiseParameter.decolorize',
index=3,
number=4,
......@@ -5503,7 +5571,8 @@ _NOISEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='gauss_blur',
_descriptor.FieldDescriptor(
name='gauss_blur',
full_name='caffe.NoiseParameter.gauss_blur',
index=4,
number=5,
......@@ -5519,7 +5588,8 @@ _NOISEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='jpeg',
_descriptor.FieldDescriptor(
name='jpeg',
full_name='caffe.NoiseParameter.jpeg',
index=5,
number=6,
......@@ -5535,7 +5605,8 @@ _NOISEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='posterize',
_descriptor.FieldDescriptor(
name='posterize',
full_name='caffe.NoiseParameter.posterize',
index=6,
number=7,
......@@ -5551,7 +5622,8 @@ _NOISEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='erode',
_descriptor.FieldDescriptor(
name='erode',
full_name='caffe.NoiseParameter.erode',
index=7,
number=8,
......@@ -5567,7 +5639,8 @@ _NOISEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='saltpepper',
_descriptor.FieldDescriptor(
name='saltpepper',
full_name='caffe.NoiseParameter.saltpepper',
index=8,
number=9,
......@@ -5600,7 +5673,8 @@ _NOISEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='clahe',
_descriptor.FieldDescriptor(
name='clahe',
full_name='caffe.NoiseParameter.clahe',
index=10,
number=11,
......@@ -5877,7 +5951,8 @@ _EXPANSIONPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='prob',
_descriptor.FieldDescriptor(
name='prob',
full_name='caffe.ExpansionParameter.prob',
index=0,
number=1,
......@@ -5964,7 +6039,8 @@ _LOSSPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='normalize',
_descriptor.FieldDescriptor(
name='normalize',
full_name='caffe.LossParameter.normalize',
index=2,
number=2,
......@@ -6002,7 +6078,8 @@ _ACCURACYPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='top_k',
_descriptor.FieldDescriptor(
name='top_k',
full_name='caffe.AccuracyParameter.top_k',
index=0,
number=1,
......@@ -6018,7 +6095,8 @@ _ACCURACYPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='axis',
_descriptor.FieldDescriptor(
name='axis',
full_name='caffe.AccuracyParameter.axis',
index=1,
number=2,
......@@ -6159,7 +6237,8 @@ _ARGMAXPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='top_k',
_descriptor.FieldDescriptor(
name='top_k',
full_name='caffe.ArgMaxParameter.top_k',
index=1,
number=2,
......@@ -6175,7 +6254,8 @@ _ARGMAXPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='axis',
_descriptor.FieldDescriptor(
name='axis',
full_name='caffe.ArgMaxParameter.axis',
index=2,
number=3,
......@@ -6211,7 +6291,8 @@ _CONCATPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='axis',
_descriptor.FieldDescriptor(
name='axis',
full_name='caffe.ConcatParameter.axis',
index=0,
number=2,
......@@ -6298,7 +6379,8 @@ _BATCHNORMPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='eps',
_descriptor.FieldDescriptor(
name='eps',
full_name='caffe.BatchNormParameter.eps',
index=2,
number=3,
......@@ -6334,7 +6416,8 @@ _BIASPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='axis',
_descriptor.FieldDescriptor(
name='axis',
full_name='caffe.BiasParameter.axis',
index=0,
number=1,
......@@ -6350,7 +6433,8 @@ _BIASPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='num_axes',
_descriptor.FieldDescriptor(
name='num_axes',
full_name='caffe.BiasParameter.num_axes',
index=1,
number=2,
......@@ -6366,7 +6450,8 @@ _BIASPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='filler',
_descriptor.FieldDescriptor(
name='filler',
full_name='caffe.BiasParameter.filler',
index=2,
number=3,
......@@ -6490,7 +6575,8 @@ _CONVOLUTIONPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='pad',
_descriptor.FieldDescriptor(
name='pad',
full_name='caffe.ConvolutionParameter.pad',
index=2,
number=3,
......@@ -6727,7 +6813,8 @@ _CONVOLUTIONPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='axis',
_descriptor.FieldDescriptor(
name='axis',
full_name='caffe.ConvolutionParameter.axis',
index=16,
number=16,
......@@ -6782,7 +6869,8 @@ _CROPPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='axis',
_descriptor.FieldDescriptor(
name='axis',
full_name='caffe.CropParameter.axis',
index=0,
number=1,
......@@ -6798,7 +6886,8 @@ _CROPPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='offset',
_descriptor.FieldDescriptor(
name='offset',
full_name='caffe.CropParameter.offset',
index=1,
number=2,
......@@ -6834,7 +6923,8 @@ _DATAPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='source',
_descriptor.FieldDescriptor(
name='source',
full_name='caffe.DataParameter.source',
index=0,
number=1,
......@@ -6850,7 +6940,8 @@ _DATAPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='batch_size',
_descriptor.FieldDescriptor(
name='batch_size',
full_name='caffe.DataParameter.batch_size',
index=1,
number=4,
......@@ -6866,7 +6957,8 @@ _DATAPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='rand_skip',
_descriptor.FieldDescriptor(
name='rand_skip',
full_name='caffe.DataParameter.rand_skip',
index=2,
number=7,
......@@ -6882,7 +6974,8 @@ _DATAPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='backend',
_descriptor.FieldDescriptor(
name='backend',
full_name='caffe.DataParameter.backend',
index=3,
number=8,
......@@ -6898,7 +6991,8 @@ _DATAPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='scale',
_descriptor.FieldDescriptor(
name='scale',
full_name='caffe.DataParameter.scale',
index=4,
number=2,
......@@ -6914,7 +7008,8 @@ _DATAPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='mean_file',
_descriptor.FieldDescriptor(
name='mean_file',
full_name='caffe.DataParameter.mean_file',
index=5,
number=3,
......@@ -6930,7 +7025,8 @@ _DATAPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='crop_size',
_descriptor.FieldDescriptor(
name='crop_size',
full_name='caffe.DataParameter.crop_size',
index=6,
number=5,
......@@ -6946,7 +7042,8 @@ _DATAPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='mirror',
_descriptor.FieldDescriptor(
name='mirror',
full_name='caffe.DataParameter.mirror',
index=7,
number=6,
......@@ -6979,7 +7076,8 @@ _DATAPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='prefetch',
_descriptor.FieldDescriptor(
name='prefetch',
full_name='caffe.DataParameter.prefetch',
index=9,
number=10,
......@@ -7628,7 +7726,8 @@ _DUMMYDATAPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='shape',
_descriptor.FieldDescriptor(
name='shape',
full_name='caffe.DummyDataParameter.shape',
index=1,
number=6,
......@@ -7644,7 +7743,8 @@ _DUMMYDATAPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='num',
_descriptor.FieldDescriptor(
name='num',
full_name='caffe.DummyDataParameter.num',
index=2,
number=2,
......@@ -7677,7 +7777,8 @@ _DUMMYDATAPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='height',
_descriptor.FieldDescriptor(
name='height',
full_name='caffe.DummyDataParameter.height',
index=4,
number=4,
......@@ -7693,7 +7794,8 @@ _DUMMYDATAPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='width',
_descriptor.FieldDescriptor(
name='width',
full_name='caffe.DummyDataParameter.width',
index=5,
number=5,
......@@ -7746,7 +7848,8 @@ _ELTWISEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='coeff',
_descriptor.FieldDescriptor(
name='coeff',
full_name='caffe.EltwiseParameter.coeff',
index=1,
number=2,
......@@ -7801,7 +7904,8 @@ _ELUPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='alpha',
_descriptor.FieldDescriptor(
name='alpha',
full_name='caffe.ELUParameter.alpha',
index=0,
number=1,
......@@ -7837,7 +7941,8 @@ _EMBEDPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='num_output',
_descriptor.FieldDescriptor(
name='num_output',
full_name='caffe.EmbedParameter.num_output',
index=0,
number=1,
......@@ -7853,7 +7958,8 @@ _EMBEDPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='input_dim',
_descriptor.FieldDescriptor(
name='input_dim',
full_name='caffe.EmbedParameter.input_dim',
index=1,
number=2,
......@@ -7869,7 +7975,8 @@ _EMBEDPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='bias_term',
_descriptor.FieldDescriptor(
name='bias_term',
full_name='caffe.EmbedParameter.bias_term',
index=2,
number=3,
......@@ -7939,7 +8046,8 @@ _EXPPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='base',
_descriptor.FieldDescriptor(
name='base',
full_name='caffe.ExpParameter.base',
index=0,
number=1,
......@@ -7955,7 +8063,8 @@ _EXPPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='scale',
_descriptor.FieldDescriptor(
name='scale',
full_name='caffe.ExpParameter.scale',
index=1,
number=2,
......@@ -7971,7 +8080,8 @@ _EXPPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='shift',
_descriptor.FieldDescriptor(
name='shift',
full_name='caffe.ExpParameter.shift',
index=2,
number=3,
......@@ -8007,7 +8117,8 @@ _FLATTENPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='axis',
_descriptor.FieldDescriptor(
name='axis',
full_name='caffe.FlattenParameter.axis',
index=0,
number=1,
......@@ -8023,7 +8134,8 @@ _FLATTENPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='end_axis',
_descriptor.FieldDescriptor(
name='end_axis',
full_name='caffe.FlattenParameter.end_axis',
index=1,
number=2,
......@@ -8059,7 +8171,8 @@ _HDF5DATAPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='source',
_descriptor.FieldDescriptor(
name='source',
full_name='caffe.HDF5DataParameter.source',
index=0,
number=1,
......@@ -8092,7 +8205,8 @@ _HDF5DATAPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='shuffle',
_descriptor.FieldDescriptor(
name='shuffle',
full_name='caffe.HDF5DataParameter.shuffle',
index=2,
number=3,
......@@ -8165,7 +8279,8 @@ _HINGELOSSPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='norm',
_descriptor.FieldDescriptor(
name='norm',
full_name='caffe.HingeLossParameter.norm',
index=0,
number=1,
......@@ -8203,7 +8318,8 @@ _IMAGEDATAPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='source',
_descriptor.FieldDescriptor(
name='source',
full_name='caffe.ImageDataParameter.source',
index=0,
number=1,
......@@ -8321,7 +8437,8 @@ _IMAGEDATAPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='scale',
_descriptor.FieldDescriptor(
name='scale',
full_name='caffe.ImageDataParameter.scale',
index=7,
number=2,
......@@ -8371,7 +8488,8 @@ _IMAGEDATAPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='mirror',
_descriptor.FieldDescriptor(
name='mirror',
full_name='caffe.ImageDataParameter.mirror',
index=10,
number=6,
......@@ -8583,7 +8701,8 @@ _INPUTPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='shape',
_descriptor.FieldDescriptor(
name='shape',
full_name='caffe.InputParameter.shape',
index=0,
number=1,
......@@ -8619,7 +8738,8 @@ _LOGPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='base',
_descriptor.FieldDescriptor(
name='base',
full_name='caffe.LogParameter.base',
index=0,
number=1,
......@@ -8635,7 +8755,8 @@ _LOGPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='scale',
_descriptor.FieldDescriptor(
name='scale',
full_name='caffe.LogParameter.scale',
index=1,
number=2,
......@@ -8651,7 +8772,8 @@ _LOGPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='shift',
_descriptor.FieldDescriptor(
name='shift',
full_name='caffe.LogParameter.shift',
index=2,
number=3,
......@@ -8687,7 +8809,8 @@ _LRNPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='local_size',
_descriptor.FieldDescriptor(
name='local_size',
full_name='caffe.LRNParameter.local_size',
index=0,
number=1,
......@@ -8703,7 +8826,8 @@ _LRNPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='alpha',
_descriptor.FieldDescriptor(
name='alpha',
full_name='caffe.LRNParameter.alpha',
index=1,
number=2,
......@@ -8719,7 +8843,8 @@ _LRNPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='beta',
_descriptor.FieldDescriptor(
name='beta',
full_name='caffe.LRNParameter.beta',
index=2,
number=3,
......@@ -8735,7 +8860,8 @@ _LRNPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='norm_region',
_descriptor.FieldDescriptor(
name='norm_region',
full_name='caffe.LRNParameter.norm_region',
index=3,
number=4,
......@@ -8751,7 +8877,8 @@ _LRNPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='k',
_descriptor.FieldDescriptor(
name='k',
full_name='caffe.LRNParameter.k',
index=4,
number=5,
......@@ -8767,7 +8894,8 @@ _LRNPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='engine',
_descriptor.FieldDescriptor(
name='engine',
full_name='caffe.LRNParameter.engine',
index=5,
number=6,
......@@ -8857,7 +8985,8 @@ _MEMORYDATAPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='width',
_descriptor.FieldDescriptor(
name='width',
full_name='caffe.MemoryDataParameter.width',
index=3,
number=4,
......@@ -9326,7 +9455,8 @@ _MVNPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='eps',
_descriptor.FieldDescriptor(
name='eps',
full_name='caffe.MVNParameter.eps',
index=2,
number=3,
......@@ -9413,7 +9543,8 @@ _NORMALIZEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='eps',
_descriptor.FieldDescriptor(
name='eps',
full_name='caffe.NormalizeParameter.eps',
index=3,
number=4,
......@@ -9449,7 +9580,8 @@ _PARAMETERPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='shape',
_descriptor.FieldDescriptor(
name='shape',
full_name='caffe.ParameterParameter.shape',
index=0,
number=1,
......@@ -9485,7 +9617,8 @@ _PERMUTEPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='order',
_descriptor.FieldDescriptor(
name='order',
full_name='caffe.PermuteParameter.order',
index=0,
number=1,
......@@ -9521,7 +9654,8 @@ _POOLINGPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='pool',
_descriptor.FieldDescriptor(
name='pool',
full_name='caffe.PoolingParameter.pool',
index=0,
number=1,
......@@ -9537,7 +9671,8 @@ _POOLINGPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='pad',
_descriptor.FieldDescriptor(
name='pad',
full_name='caffe.PoolingParameter.pad',
index=1,
number=4,
......@@ -9553,7 +9688,8 @@ _POOLINGPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='pad_h',
_descriptor.FieldDescriptor(
name='pad_h',
full_name='caffe.PoolingParameter.pad_h',
index=2,
number=9,
......@@ -9569,7 +9705,8 @@ _POOLINGPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='pad_w',
_descriptor.FieldDescriptor(
name='pad_w',
full_name='caffe.PoolingParameter.pad_w',
index=3,
number=10,
......@@ -9602,7 +9739,8 @@ _POOLINGPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='kernel_h',
_descriptor.FieldDescriptor(
name='kernel_h',
full_name='caffe.PoolingParameter.kernel_h',
index=5,
number=5,
......@@ -9618,7 +9756,8 @@ _POOLINGPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='kernel_w',
_descriptor.FieldDescriptor(
name='kernel_w',
full_name='caffe.PoolingParameter.kernel_w',
index=6,
number=6,
......@@ -9634,7 +9773,8 @@ _POOLINGPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='stride',
_descriptor.FieldDescriptor(
name='stride',
full_name='caffe.PoolingParameter.stride',
index=7,
number=3,
......@@ -9650,7 +9790,8 @@ _POOLINGPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='stride_h',
_descriptor.FieldDescriptor(
name='stride_h',
full_name='caffe.PoolingParameter.stride_h',
index=8,
number=7,
......@@ -9666,7 +9807,8 @@ _POOLINGPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='stride_w',
_descriptor.FieldDescriptor(
name='stride_w',
full_name='caffe.PoolingParameter.stride_w',
index=9,
number=8,
......@@ -9682,7 +9824,8 @@ _POOLINGPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='engine',
_descriptor.FieldDescriptor(
name='engine',
full_name='caffe.PoolingParameter.engine',
index=10,
number=11,
......@@ -9738,7 +9881,8 @@ _POWERPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='power',
_descriptor.FieldDescriptor(
name='power',
full_name='caffe.PowerParameter.power',
index=0,
number=1,
......@@ -9754,7 +9898,8 @@ _POWERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='scale',
_descriptor.FieldDescriptor(
name='scale',
full_name='caffe.PowerParameter.scale',
index=1,
number=2,
......@@ -9770,7 +9915,8 @@ _POWERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='shift',
_descriptor.FieldDescriptor(
name='shift',
full_name='caffe.PowerParameter.shift',
index=2,
number=3,
......@@ -9857,7 +10003,8 @@ _PRIORBOXPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='flip',
_descriptor.FieldDescriptor(
name='flip',
full_name='caffe.PriorBoxParameter.flip',
index=3,
number=4,
......@@ -9873,7 +10020,8 @@ _PRIORBOXPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='clip',
_descriptor.FieldDescriptor(
name='clip',
full_name='caffe.PriorBoxParameter.clip',
index=4,
number=5,
......@@ -9923,7 +10071,8 @@ _PRIORBOXPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='img_h',
_descriptor.FieldDescriptor(
name='img_h',
full_name='caffe.PriorBoxParameter.img_h',
index=7,
number=8,
......@@ -9939,7 +10088,8 @@ _PRIORBOXPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='img_w',
_descriptor.FieldDescriptor(
name='img_w',
full_name='caffe.PriorBoxParameter.img_w',
index=8,
number=9,
......@@ -9955,7 +10105,8 @@ _PRIORBOXPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='step',
_descriptor.FieldDescriptor(
name='step',
full_name='caffe.PriorBoxParameter.step',
index=9,
number=10,
......@@ -9971,7 +10122,8 @@ _PRIORBOXPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='step_h',
_descriptor.FieldDescriptor(
name='step_h',
full_name='caffe.PriorBoxParameter.step_h',
index=10,
number=11,
......@@ -9987,7 +10139,8 @@ _PRIORBOXPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='step_w',
_descriptor.FieldDescriptor(
name='step_w',
full_name='caffe.PriorBoxParameter.step_w',
index=11,
number=12,
......@@ -10003,7 +10156,8 @@ _PRIORBOXPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='offset',
_descriptor.FieldDescriptor(
name='offset',
full_name='caffe.PriorBoxParameter.offset',
index=12,
number=13,
......@@ -10041,7 +10195,8 @@ _PYTHONPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='module',
_descriptor.FieldDescriptor(
name='module',
full_name='caffe.PythonParameter.module',
index=0,
number=1,
......@@ -10057,7 +10212,8 @@ _PYTHONPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='layer',
_descriptor.FieldDescriptor(
name='layer',
full_name='caffe.PythonParameter.layer',
index=1,
number=2,
......@@ -10073,7 +10229,8 @@ _PYTHONPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='param_str',
_descriptor.FieldDescriptor(
name='param_str',
full_name='caffe.PythonParameter.param_str',
index=2,
number=3,
......@@ -10248,7 +10405,8 @@ _REDUCTIONPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='axis',
_descriptor.FieldDescriptor(
name='axis',
full_name='caffe.ReductionParameter.axis',
index=1,
number=2,
......@@ -10264,7 +10422,8 @@ _REDUCTIONPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='coeff',
_descriptor.FieldDescriptor(
name='coeff',
full_name='caffe.ReductionParameter.coeff',
index=2,
number=3,
......@@ -10319,7 +10478,8 @@ _RELUPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='engine',
_descriptor.FieldDescriptor(
name='engine',
full_name='caffe.ReLUParameter.engine',
index=1,
number=2,
......@@ -10357,7 +10517,8 @@ _RESHAPEPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='shape',
_descriptor.FieldDescriptor(
name='shape',
full_name='caffe.ReshapeParameter.shape',
index=0,
number=1,
......@@ -10373,7 +10534,8 @@ _RESHAPEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='axis',
_descriptor.FieldDescriptor(
name='axis',
full_name='caffe.ReshapeParameter.axis',
index=1,
number=2,
......@@ -10389,7 +10551,8 @@ _RESHAPEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='num_axes',
_descriptor.FieldDescriptor(
name='num_axes',
full_name='caffe.ReshapeParameter.num_axes',
index=2,
number=3,
......@@ -10425,7 +10588,8 @@ _SCALEPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='axis',
_descriptor.FieldDescriptor(
name='axis',
full_name='caffe.ScaleParameter.axis',
index=0,
number=1,
......@@ -10441,7 +10605,8 @@ _SCALEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='num_axes',
_descriptor.FieldDescriptor(
name='num_axes',
full_name='caffe.ScaleParameter.num_axes',
index=1,
number=2,
......@@ -10457,7 +10622,8 @@ _SCALEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='filler',
_descriptor.FieldDescriptor(
name='filler',
full_name='caffe.ScaleParameter.filler',
index=2,
number=3,
......@@ -10473,7 +10639,8 @@ _SCALEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='bias_term',
_descriptor.FieldDescriptor(
name='bias_term',
full_name='caffe.ScaleParameter.bias_term',
index=3,
number=4,
......@@ -10526,7 +10693,8 @@ _SIGMOIDPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='engine',
_descriptor.FieldDescriptor(
name='engine',
full_name='caffe.SigmoidParameter.engine',
index=0,
number=1,
......@@ -10564,7 +10732,8 @@ _SLICEPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='axis',
_descriptor.FieldDescriptor(
name='axis',
full_name='caffe.SliceParameter.axis',
index=0,
number=3,
......@@ -10597,7 +10766,8 @@ _SLICEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='slice_dim',
_descriptor.FieldDescriptor(
name='slice_dim',
full_name='caffe.SliceParameter.slice_dim',
index=2,
number=1,
......@@ -10633,7 +10803,8 @@ _SOFTMAXPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='engine',
_descriptor.FieldDescriptor(
name='engine',
full_name='caffe.SoftmaxParameter.engine',
index=0,
number=1,
......@@ -10649,7 +10820,8 @@ _SOFTMAXPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='axis',
_descriptor.FieldDescriptor(
name='axis',
full_name='caffe.SoftmaxParameter.axis',
index=1,
number=2,
......@@ -10687,7 +10859,8 @@ _TANHPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='engine',
_descriptor.FieldDescriptor(
name='engine',
full_name='caffe.TanHParameter.engine',
index=0,
number=1,
......@@ -10725,7 +10898,8 @@ _TILEPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='axis',
_descriptor.FieldDescriptor(
name='axis',
full_name='caffe.TileParameter.axis',
index=0,
number=1,
......@@ -10741,7 +10915,8 @@ _TILEPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='tiles',
_descriptor.FieldDescriptor(
name='tiles',
full_name='caffe.TileParameter.tiles',
index=1,
number=2,
......@@ -10921,7 +11096,8 @@ _WINDOWDATAPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='scale',
_descriptor.FieldDescriptor(
name='scale',
full_name='caffe.WindowDataParameter.scale',
index=1,
number=2,
......@@ -11161,7 +11337,8 @@ _SPPPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='pool',
_descriptor.FieldDescriptor(
name='pool',
full_name='caffe.SPPParameter.pool',
index=1,
number=2,
......@@ -11177,7 +11354,8 @@ _SPPPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='engine',
_descriptor.FieldDescriptor(
name='engine',
full_name='caffe.SPPParameter.engine',
index=2,
number=6,
......@@ -11216,7 +11394,8 @@ _V1LAYERPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='bottom',
_descriptor.FieldDescriptor(
name='bottom',
full_name='caffe.V1LayerParameter.bottom',
index=0,
number=2,
......@@ -11232,7 +11411,8 @@ _V1LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='top',
_descriptor.FieldDescriptor(
name='top',
full_name='caffe.V1LayerParameter.top',
index=1,
number=3,
......@@ -11248,7 +11428,8 @@ _V1LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='name',
_descriptor.FieldDescriptor(
name='name',
full_name='caffe.V1LayerParameter.name',
index=2,
number=4,
......@@ -11264,7 +11445,8 @@ _V1LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='include',
_descriptor.FieldDescriptor(
name='include',
full_name='caffe.V1LayerParameter.include',
index=3,
number=32,
......@@ -11280,7 +11462,8 @@ _V1LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='exclude',
_descriptor.FieldDescriptor(
name='exclude',
full_name='caffe.V1LayerParameter.exclude',
index=4,
number=33,
......@@ -11296,7 +11479,8 @@ _V1LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='type',
_descriptor.FieldDescriptor(
name='type',
full_name='caffe.V1LayerParameter.type',
index=5,
number=5,
......@@ -11312,7 +11496,8 @@ _V1LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='blobs',
_descriptor.FieldDescriptor(
name='blobs',
full_name='caffe.V1LayerParameter.blobs',
index=6,
number=6,
......@@ -11328,7 +11513,8 @@ _V1LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='param',
_descriptor.FieldDescriptor(
name='param',
full_name='caffe.V1LayerParameter.param',
index=7,
number=1001,
......@@ -11361,7 +11547,8 @@ _V1LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='blobs_lr',
_descriptor.FieldDescriptor(
name='blobs_lr',
full_name='caffe.V1LayerParameter.blobs_lr',
index=9,
number=7,
......@@ -11921,7 +12108,8 @@ _V1LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='layer',
_descriptor.FieldDescriptor(
name='layer',
full_name='caffe.V1LayerParameter.layer',
index=42,
number=1,
......@@ -11960,7 +12148,8 @@ _V0LAYERPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='name',
_descriptor.FieldDescriptor(
name='name',
full_name='caffe.V0LayerParameter.name',
index=0,
number=1,
......@@ -11976,7 +12165,8 @@ _V0LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='type',
_descriptor.FieldDescriptor(
name='type',
full_name='caffe.V0LayerParameter.type',
index=1,
number=2,
......@@ -12009,7 +12199,8 @@ _V0LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='biasterm',
_descriptor.FieldDescriptor(
name='biasterm',
full_name='caffe.V0LayerParameter.biasterm',
index=3,
number=4,
......@@ -12059,7 +12250,8 @@ _V0LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='pad',
_descriptor.FieldDescriptor(
name='pad',
full_name='caffe.V0LayerParameter.pad',
index=6,
number=7,
......@@ -12092,7 +12284,8 @@ _V0LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='group',
_descriptor.FieldDescriptor(
name='group',
full_name='caffe.V0LayerParameter.group',
index=8,
number=9,
......@@ -12108,7 +12301,8 @@ _V0LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='stride',
_descriptor.FieldDescriptor(
name='stride',
full_name='caffe.V0LayerParameter.stride',
index=9,
number=10,
......@@ -12124,7 +12318,8 @@ _V0LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='pool',
_descriptor.FieldDescriptor(
name='pool',
full_name='caffe.V0LayerParameter.pool',
index=10,
number=11,
......@@ -12174,7 +12369,8 @@ _V0LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='alpha',
_descriptor.FieldDescriptor(
name='alpha',
full_name='caffe.V0LayerParameter.alpha',
index=13,
number=14,
......@@ -12190,7 +12386,8 @@ _V0LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='beta',
_descriptor.FieldDescriptor(
name='beta',
full_name='caffe.V0LayerParameter.beta',
index=14,
number=15,
......@@ -12206,7 +12403,8 @@ _V0LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='k',
_descriptor.FieldDescriptor(
name='k',
full_name='caffe.V0LayerParameter.k',
index=15,
number=22,
......@@ -12222,7 +12420,8 @@ _V0LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='source',
_descriptor.FieldDescriptor(
name='source',
full_name='caffe.V0LayerParameter.source',
index=16,
number=16,
......@@ -12238,7 +12437,8 @@ _V0LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='scale',
_descriptor.FieldDescriptor(
name='scale',
full_name='caffe.V0LayerParameter.scale',
index=17,
number=17,
......@@ -12254,7 +12454,8 @@ _V0LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='meanfile',
_descriptor.FieldDescriptor(
name='meanfile',
full_name='caffe.V0LayerParameter.meanfile',
index=18,
number=18,
......@@ -12287,7 +12488,8 @@ _V0LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='cropsize',
_descriptor.FieldDescriptor(
name='cropsize',
full_name='caffe.V0LayerParameter.cropsize',
index=20,
number=20,
......@@ -12303,7 +12505,8 @@ _V0LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='mirror',
_descriptor.FieldDescriptor(
name='mirror',
full_name='caffe.V0LayerParameter.mirror',
index=21,
number=21,
......@@ -12319,7 +12522,8 @@ _V0LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='blobs',
_descriptor.FieldDescriptor(
name='blobs',
full_name='caffe.V0LayerParameter.blobs',
index=22,
number=50,
......@@ -12335,7 +12539,8 @@ _V0LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='blobs_lr',
_descriptor.FieldDescriptor(
name='blobs_lr',
full_name='caffe.V0LayerParameter.blobs_lr',
index=23,
number=51,
......@@ -12470,7 +12675,8 @@ _V0LAYERPARAMETER = _descriptor.Descriptor(
extension_scope=None,
serialized_options=None,
file=DESCRIPTOR),
_descriptor.FieldDescriptor(name='new_num',
_descriptor.FieldDescriptor(
name='new_num',
full_name='caffe.V0LayerParameter.new_num',
index=31,
number=60,
......@@ -12610,7 +12816,8 @@ _PRELUPARAMETER = _descriptor.Descriptor(
file=DESCRIPTOR,
containing_type=None,
fields=[
_descriptor.FieldDescriptor(name='filler',
_descriptor.FieldDescriptor(
name='filler',
full_name='caffe.PReLUParameter.filler',
index=0,
number=1,
......@@ -13109,7 +13316,8 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR)
BlobShape = _reflection.GeneratedProtocolMessageType(
'BlobShape',
(_message.Message, ),
dict(DESCRIPTOR=_BLOBSHAPE,
dict(
DESCRIPTOR=_BLOBSHAPE,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.BlobShape)
))
......@@ -13118,7 +13326,8 @@ _sym_db.RegisterMessage(BlobShape)
BlobProto = _reflection.GeneratedProtocolMessageType(
'BlobProto',
(_message.Message, ),
dict(DESCRIPTOR=_BLOBPROTO,
dict(
DESCRIPTOR=_BLOBPROTO,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.BlobProto)
))
......@@ -13127,7 +13336,8 @@ _sym_db.RegisterMessage(BlobProto)
BlobProtoVector = _reflection.GeneratedProtocolMessageType(
'BlobProtoVector',
(_message.Message, ),
dict(DESCRIPTOR=_BLOBPROTOVECTOR,
dict(
DESCRIPTOR=_BLOBPROTOVECTOR,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.BlobProtoVector)
))
......@@ -13136,7 +13346,8 @@ _sym_db.RegisterMessage(BlobProtoVector)
Datum = _reflection.GeneratedProtocolMessageType(
'Datum',
(_message.Message, ),
dict(DESCRIPTOR=_DATUM,
dict(
DESCRIPTOR=_DATUM,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.Datum)
))
......@@ -13145,7 +13356,8 @@ _sym_db.RegisterMessage(Datum)
LabelMapItem = _reflection.GeneratedProtocolMessageType(
'LabelMapItem',
(_message.Message, ),
dict(DESCRIPTOR=_LABELMAPITEM,
dict(
DESCRIPTOR=_LABELMAPITEM,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.LabelMapItem)
))
......@@ -13154,7 +13366,8 @@ _sym_db.RegisterMessage(LabelMapItem)
LabelMap = _reflection.GeneratedProtocolMessageType(
'LabelMap',
(_message.Message, ),
dict(DESCRIPTOR=_LABELMAP,
dict(
DESCRIPTOR=_LABELMAP,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.LabelMap)
))
......@@ -13163,7 +13376,8 @@ _sym_db.RegisterMessage(LabelMap)
Sampler = _reflection.GeneratedProtocolMessageType(
'Sampler',
(_message.Message, ),
dict(DESCRIPTOR=_SAMPLER,
dict(
DESCRIPTOR=_SAMPLER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.Sampler)
))
......@@ -13172,7 +13386,8 @@ _sym_db.RegisterMessage(Sampler)
SampleConstraint = _reflection.GeneratedProtocolMessageType(
'SampleConstraint',
(_message.Message, ),
dict(DESCRIPTOR=_SAMPLECONSTRAINT,
dict(
DESCRIPTOR=_SAMPLECONSTRAINT,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.SampleConstraint)
))
......@@ -13181,7 +13396,8 @@ _sym_db.RegisterMessage(SampleConstraint)
BatchSampler = _reflection.GeneratedProtocolMessageType(
'BatchSampler',
(_message.Message, ),
dict(DESCRIPTOR=_BATCHSAMPLER,
dict(
DESCRIPTOR=_BATCHSAMPLER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.BatchSampler)
))
......@@ -13190,7 +13406,8 @@ _sym_db.RegisterMessage(BatchSampler)
EmitConstraint = _reflection.GeneratedProtocolMessageType(
'EmitConstraint',
(_message.Message, ),
dict(DESCRIPTOR=_EMITCONSTRAINT,
dict(
DESCRIPTOR=_EMITCONSTRAINT,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.EmitConstraint)
))
......@@ -13199,7 +13416,8 @@ _sym_db.RegisterMessage(EmitConstraint)
NormalizedBBox = _reflection.GeneratedProtocolMessageType(
'NormalizedBBox',
(_message.Message, ),
dict(DESCRIPTOR=_NORMALIZEDBBOX,
dict(
DESCRIPTOR=_NORMALIZEDBBOX,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.NormalizedBBox)
))
......@@ -13208,7 +13426,8 @@ _sym_db.RegisterMessage(NormalizedBBox)
Annotation = _reflection.GeneratedProtocolMessageType(
'Annotation',
(_message.Message, ),
dict(DESCRIPTOR=_ANNOTATION,
dict(
DESCRIPTOR=_ANNOTATION,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.Annotation)
))
......@@ -13217,7 +13436,8 @@ _sym_db.RegisterMessage(Annotation)
AnnotationGroup = _reflection.GeneratedProtocolMessageType(
'AnnotationGroup',
(_message.Message, ),
dict(DESCRIPTOR=_ANNOTATIONGROUP,
dict(
DESCRIPTOR=_ANNOTATIONGROUP,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.AnnotationGroup)
))
......@@ -13226,7 +13446,8 @@ _sym_db.RegisterMessage(AnnotationGroup)
AnnotatedDatum = _reflection.GeneratedProtocolMessageType(
'AnnotatedDatum',
(_message.Message, ),
dict(DESCRIPTOR=_ANNOTATEDDATUM,
dict(
DESCRIPTOR=_ANNOTATEDDATUM,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.AnnotatedDatum)
))
......@@ -13235,7 +13456,8 @@ _sym_db.RegisterMessage(AnnotatedDatum)
FillerParameter = _reflection.GeneratedProtocolMessageType(
'FillerParameter',
(_message.Message, ),
dict(DESCRIPTOR=_FILLERPARAMETER,
dict(
DESCRIPTOR=_FILLERPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.FillerParameter)
))
......@@ -13244,7 +13466,8 @@ _sym_db.RegisterMessage(FillerParameter)
NetParameter = _reflection.GeneratedProtocolMessageType(
'NetParameter',
(_message.Message, ),
dict(DESCRIPTOR=_NETPARAMETER,
dict(
DESCRIPTOR=_NETPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.NetParameter)
))
......@@ -13253,7 +13476,8 @@ _sym_db.RegisterMessage(NetParameter)
SolverParameter = _reflection.GeneratedProtocolMessageType(
'SolverParameter',
(_message.Message, ),
dict(DESCRIPTOR=_SOLVERPARAMETER,
dict(
DESCRIPTOR=_SOLVERPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.SolverParameter)
))
......@@ -13262,7 +13486,8 @@ _sym_db.RegisterMessage(SolverParameter)
SolverState = _reflection.GeneratedProtocolMessageType(
'SolverState',
(_message.Message, ),
dict(DESCRIPTOR=_SOLVERSTATE,
dict(
DESCRIPTOR=_SOLVERSTATE,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.SolverState)
))
......@@ -13271,7 +13496,8 @@ _sym_db.RegisterMessage(SolverState)
NetState = _reflection.GeneratedProtocolMessageType(
'NetState',
(_message.Message, ),
dict(DESCRIPTOR=_NETSTATE,
dict(
DESCRIPTOR=_NETSTATE,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.NetState)
))
......@@ -13280,7 +13506,8 @@ _sym_db.RegisterMessage(NetState)
NetStateRule = _reflection.GeneratedProtocolMessageType(
'NetStateRule',
(_message.Message, ),
dict(DESCRIPTOR=_NETSTATERULE,
dict(
DESCRIPTOR=_NETSTATERULE,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.NetStateRule)
))
......@@ -13289,7 +13516,8 @@ _sym_db.RegisterMessage(NetStateRule)
ParamSpec = _reflection.GeneratedProtocolMessageType(
'ParamSpec',
(_message.Message, ),
dict(DESCRIPTOR=_PARAMSPEC,
dict(
DESCRIPTOR=_PARAMSPEC,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.ParamSpec)
))
......@@ -13298,7 +13526,8 @@ _sym_db.RegisterMessage(ParamSpec)
LayerParameter = _reflection.GeneratedProtocolMessageType(
'LayerParameter',
(_message.Message, ),
dict(DESCRIPTOR=_LAYERPARAMETER,
dict(
DESCRIPTOR=_LAYERPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.LayerParameter)
))
......@@ -13307,7 +13536,8 @@ _sym_db.RegisterMessage(LayerParameter)
TransformationParameter = _reflection.GeneratedProtocolMessageType(
'TransformationParameter',
(_message.Message, ),
dict(DESCRIPTOR=_TRANSFORMATIONPARAMETER,
dict(
DESCRIPTOR=_TRANSFORMATIONPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.TransformationParameter)
))
......@@ -13316,7 +13546,8 @@ _sym_db.RegisterMessage(TransformationParameter)
ResizeParameter = _reflection.GeneratedProtocolMessageType(
'ResizeParameter',
(_message.Message, ),
dict(DESCRIPTOR=_RESIZEPARAMETER,
dict(
DESCRIPTOR=_RESIZEPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.ResizeParameter)
))
......@@ -13325,7 +13556,8 @@ _sym_db.RegisterMessage(ResizeParameter)
SaltPepperParameter = _reflection.GeneratedProtocolMessageType(
'SaltPepperParameter',
(_message.Message, ),
dict(DESCRIPTOR=_SALTPEPPERPARAMETER,
dict(
DESCRIPTOR=_SALTPEPPERPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.SaltPepperParameter)
))
......@@ -13334,7 +13566,8 @@ _sym_db.RegisterMessage(SaltPepperParameter)
NoiseParameter = _reflection.GeneratedProtocolMessageType(
'NoiseParameter',
(_message.Message, ),
dict(DESCRIPTOR=_NOISEPARAMETER,
dict(
DESCRIPTOR=_NOISEPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.NoiseParameter)
))
......@@ -13343,7 +13576,8 @@ _sym_db.RegisterMessage(NoiseParameter)
DistortionParameter = _reflection.GeneratedProtocolMessageType(
'DistortionParameter',
(_message.Message, ),
dict(DESCRIPTOR=_DISTORTIONPARAMETER,
dict(
DESCRIPTOR=_DISTORTIONPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.DistortionParameter)
))
......@@ -13352,7 +13586,8 @@ _sym_db.RegisterMessage(DistortionParameter)
ExpansionParameter = _reflection.GeneratedProtocolMessageType(
'ExpansionParameter',
(_message.Message, ),
dict(DESCRIPTOR=_EXPANSIONPARAMETER,
dict(
DESCRIPTOR=_EXPANSIONPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.ExpansionParameter)
))
......@@ -13361,7 +13596,8 @@ _sym_db.RegisterMessage(ExpansionParameter)
LossParameter = _reflection.GeneratedProtocolMessageType(
'LossParameter',
(_message.Message, ),
dict(DESCRIPTOR=_LOSSPARAMETER,
dict(
DESCRIPTOR=_LOSSPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.LossParameter)
))
......@@ -13370,7 +13606,8 @@ _sym_db.RegisterMessage(LossParameter)
AccuracyParameter = _reflection.GeneratedProtocolMessageType(
'AccuracyParameter',
(_message.Message, ),
dict(DESCRIPTOR=_ACCURACYPARAMETER,
dict(
DESCRIPTOR=_ACCURACYPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.AccuracyParameter)
))
......@@ -13379,7 +13616,8 @@ _sym_db.RegisterMessage(AccuracyParameter)
AnnotatedDataParameter = _reflection.GeneratedProtocolMessageType(
'AnnotatedDataParameter',
(_message.Message, ),
dict(DESCRIPTOR=_ANNOTATEDDATAPARAMETER,
dict(
DESCRIPTOR=_ANNOTATEDDATAPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.AnnotatedDataParameter)
))
......@@ -13388,7 +13626,8 @@ _sym_db.RegisterMessage(AnnotatedDataParameter)
ArgMaxParameter = _reflection.GeneratedProtocolMessageType(
'ArgMaxParameter',
(_message.Message, ),
dict(DESCRIPTOR=_ARGMAXPARAMETER,
dict(
DESCRIPTOR=_ARGMAXPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.ArgMaxParameter)
))
......@@ -13397,7 +13636,8 @@ _sym_db.RegisterMessage(ArgMaxParameter)
ConcatParameter = _reflection.GeneratedProtocolMessageType(
'ConcatParameter',
(_message.Message, ),
dict(DESCRIPTOR=_CONCATPARAMETER,
dict(
DESCRIPTOR=_CONCATPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.ConcatParameter)
))
......@@ -13406,7 +13646,8 @@ _sym_db.RegisterMessage(ConcatParameter)
BatchNormParameter = _reflection.GeneratedProtocolMessageType(
'BatchNormParameter',
(_message.Message, ),
dict(DESCRIPTOR=_BATCHNORMPARAMETER,
dict(
DESCRIPTOR=_BATCHNORMPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.BatchNormParameter)
))
......@@ -13415,7 +13656,8 @@ _sym_db.RegisterMessage(BatchNormParameter)
BiasParameter = _reflection.GeneratedProtocolMessageType(
'BiasParameter',
(_message.Message, ),
dict(DESCRIPTOR=_BIASPARAMETER,
dict(
DESCRIPTOR=_BIASPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.BiasParameter)
))
......@@ -13424,7 +13666,8 @@ _sym_db.RegisterMessage(BiasParameter)
ContrastiveLossParameter = _reflection.GeneratedProtocolMessageType(
'ContrastiveLossParameter',
(_message.Message, ),
dict(DESCRIPTOR=_CONTRASTIVELOSSPARAMETER,
dict(
DESCRIPTOR=_CONTRASTIVELOSSPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.ContrastiveLossParameter)
))
......@@ -13433,7 +13676,8 @@ _sym_db.RegisterMessage(ContrastiveLossParameter)
ConvolutionParameter = _reflection.GeneratedProtocolMessageType(
'ConvolutionParameter',
(_message.Message, ),
dict(DESCRIPTOR=_CONVOLUTIONPARAMETER,
dict(
DESCRIPTOR=_CONVOLUTIONPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.ConvolutionParameter)
))
......@@ -13442,7 +13686,8 @@ _sym_db.RegisterMessage(ConvolutionParameter)
CropParameter = _reflection.GeneratedProtocolMessageType(
'CropParameter',
(_message.Message, ),
dict(DESCRIPTOR=_CROPPARAMETER,
dict(
DESCRIPTOR=_CROPPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.CropParameter)
))
......@@ -13451,7 +13696,8 @@ _sym_db.RegisterMessage(CropParameter)
DataParameter = _reflection.GeneratedProtocolMessageType(
'DataParameter',
(_message.Message, ),
dict(DESCRIPTOR=_DATAPARAMETER,
dict(
DESCRIPTOR=_DATAPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.DataParameter)
))
......@@ -13480,7 +13726,8 @@ _sym_db.RegisterMessage(NonMaximumSuppressionParameter)
SaveOutputParameter = _reflection.GeneratedProtocolMessageType(
'SaveOutputParameter',
(_message.Message, ),
dict(DESCRIPTOR=_SAVEOUTPUTPARAMETER,
dict(
DESCRIPTOR=_SAVEOUTPUTPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.SaveOutputParameter)
))
......@@ -13489,7 +13736,8 @@ _sym_db.RegisterMessage(SaveOutputParameter)
DetectionOutputParameter = _reflection.GeneratedProtocolMessageType(
'DetectionOutputParameter',
(_message.Message, ),
dict(DESCRIPTOR=_DETECTIONOUTPUTPARAMETER,
dict(
DESCRIPTOR=_DETECTIONOUTPUTPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.DetectionOutputParameter)
))
......@@ -13498,7 +13746,8 @@ _sym_db.RegisterMessage(DetectionOutputParameter)
DropoutParameter = _reflection.GeneratedProtocolMessageType(
'DropoutParameter',
(_message.Message, ),
dict(DESCRIPTOR=_DROPOUTPARAMETER,
dict(
DESCRIPTOR=_DROPOUTPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.DropoutParameter)
))
......@@ -13507,7 +13756,8 @@ _sym_db.RegisterMessage(DropoutParameter)
DummyDataParameter = _reflection.GeneratedProtocolMessageType(
'DummyDataParameter',
(_message.Message, ),
dict(DESCRIPTOR=_DUMMYDATAPARAMETER,
dict(
DESCRIPTOR=_DUMMYDATAPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.DummyDataParameter)
))
......@@ -13516,7 +13766,8 @@ _sym_db.RegisterMessage(DummyDataParameter)
EltwiseParameter = _reflection.GeneratedProtocolMessageType(
'EltwiseParameter',
(_message.Message, ),
dict(DESCRIPTOR=_ELTWISEPARAMETER,
dict(
DESCRIPTOR=_ELTWISEPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.EltwiseParameter)
))
......@@ -13525,7 +13776,8 @@ _sym_db.RegisterMessage(EltwiseParameter)
ELUParameter = _reflection.GeneratedProtocolMessageType(
'ELUParameter',
(_message.Message, ),
dict(DESCRIPTOR=_ELUPARAMETER,
dict(
DESCRIPTOR=_ELUPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.ELUParameter)
))
......@@ -13534,7 +13786,8 @@ _sym_db.RegisterMessage(ELUParameter)
EmbedParameter = _reflection.GeneratedProtocolMessageType(
'EmbedParameter',
(_message.Message, ),
dict(DESCRIPTOR=_EMBEDPARAMETER,
dict(
DESCRIPTOR=_EMBEDPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.EmbedParameter)
))
......@@ -13543,7 +13796,8 @@ _sym_db.RegisterMessage(EmbedParameter)
ExpParameter = _reflection.GeneratedProtocolMessageType(
'ExpParameter',
(_message.Message, ),
dict(DESCRIPTOR=_EXPPARAMETER,
dict(
DESCRIPTOR=_EXPPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.ExpParameter)
))
......@@ -13552,7 +13806,8 @@ _sym_db.RegisterMessage(ExpParameter)
FlattenParameter = _reflection.GeneratedProtocolMessageType(
'FlattenParameter',
(_message.Message, ),
dict(DESCRIPTOR=_FLATTENPARAMETER,
dict(
DESCRIPTOR=_FLATTENPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.FlattenParameter)
))
......@@ -13561,7 +13816,8 @@ _sym_db.RegisterMessage(FlattenParameter)
HDF5DataParameter = _reflection.GeneratedProtocolMessageType(
'HDF5DataParameter',
(_message.Message, ),
dict(DESCRIPTOR=_HDF5DATAPARAMETER,
dict(
DESCRIPTOR=_HDF5DATAPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.HDF5DataParameter)
))
......@@ -13570,7 +13826,8 @@ _sym_db.RegisterMessage(HDF5DataParameter)
HDF5OutputParameter = _reflection.GeneratedProtocolMessageType(
'HDF5OutputParameter',
(_message.Message, ),
dict(DESCRIPTOR=_HDF5OUTPUTPARAMETER,
dict(
DESCRIPTOR=_HDF5OUTPUTPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.HDF5OutputParameter)
))
......@@ -13579,7 +13836,8 @@ _sym_db.RegisterMessage(HDF5OutputParameter)
HingeLossParameter = _reflection.GeneratedProtocolMessageType(
'HingeLossParameter',
(_message.Message, ),
dict(DESCRIPTOR=_HINGELOSSPARAMETER,
dict(
DESCRIPTOR=_HINGELOSSPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.HingeLossParameter)
))
......@@ -13588,7 +13846,8 @@ _sym_db.RegisterMessage(HingeLossParameter)
ImageDataParameter = _reflection.GeneratedProtocolMessageType(
'ImageDataParameter',
(_message.Message, ),
dict(DESCRIPTOR=_IMAGEDATAPARAMETER,
dict(
DESCRIPTOR=_IMAGEDATAPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.ImageDataParameter)
))
......@@ -13597,7 +13856,8 @@ _sym_db.RegisterMessage(ImageDataParameter)
InfogainLossParameter = _reflection.GeneratedProtocolMessageType(
'InfogainLossParameter',
(_message.Message, ),
dict(DESCRIPTOR=_INFOGAINLOSSPARAMETER,
dict(
DESCRIPTOR=_INFOGAINLOSSPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.InfogainLossParameter)
))
......@@ -13606,7 +13866,8 @@ _sym_db.RegisterMessage(InfogainLossParameter)
InnerProductParameter = _reflection.GeneratedProtocolMessageType(
'InnerProductParameter',
(_message.Message, ),
dict(DESCRIPTOR=_INNERPRODUCTPARAMETER,
dict(
DESCRIPTOR=_INNERPRODUCTPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.InnerProductParameter)
))
......@@ -13615,7 +13876,8 @@ _sym_db.RegisterMessage(InnerProductParameter)
InputParameter = _reflection.GeneratedProtocolMessageType(
'InputParameter',
(_message.Message, ),
dict(DESCRIPTOR=_INPUTPARAMETER,
dict(
DESCRIPTOR=_INPUTPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.InputParameter)
))
......@@ -13624,7 +13886,8 @@ _sym_db.RegisterMessage(InputParameter)
LogParameter = _reflection.GeneratedProtocolMessageType(
'LogParameter',
(_message.Message, ),
dict(DESCRIPTOR=_LOGPARAMETER,
dict(
DESCRIPTOR=_LOGPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.LogParameter)
))
......@@ -13633,7 +13896,8 @@ _sym_db.RegisterMessage(LogParameter)
LRNParameter = _reflection.GeneratedProtocolMessageType(
'LRNParameter',
(_message.Message, ),
dict(DESCRIPTOR=_LRNPARAMETER,
dict(
DESCRIPTOR=_LRNPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.LRNParameter)
))
......@@ -13642,7 +13906,8 @@ _sym_db.RegisterMessage(LRNParameter)
MemoryDataParameter = _reflection.GeneratedProtocolMessageType(
'MemoryDataParameter',
(_message.Message, ),
dict(DESCRIPTOR=_MEMORYDATAPARAMETER,
dict(
DESCRIPTOR=_MEMORYDATAPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.MemoryDataParameter)
))
......@@ -13651,7 +13916,8 @@ _sym_db.RegisterMessage(MemoryDataParameter)
MultiBoxLossParameter = _reflection.GeneratedProtocolMessageType(
'MultiBoxLossParameter',
(_message.Message, ),
dict(DESCRIPTOR=_MULTIBOXLOSSPARAMETER,
dict(
DESCRIPTOR=_MULTIBOXLOSSPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.MultiBoxLossParameter)
))
......@@ -13660,7 +13926,8 @@ _sym_db.RegisterMessage(MultiBoxLossParameter)
MVNParameter = _reflection.GeneratedProtocolMessageType(
'MVNParameter',
(_message.Message, ),
dict(DESCRIPTOR=_MVNPARAMETER,
dict(
DESCRIPTOR=_MVNPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.MVNParameter)
))
......@@ -13669,7 +13936,8 @@ _sym_db.RegisterMessage(MVNParameter)
NormalizeParameter = _reflection.GeneratedProtocolMessageType(
'NormalizeParameter',
(_message.Message, ),
dict(DESCRIPTOR=_NORMALIZEPARAMETER,
dict(
DESCRIPTOR=_NORMALIZEPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.NormalizeParameter)
))
......@@ -13678,7 +13946,8 @@ _sym_db.RegisterMessage(NormalizeParameter)
ParameterParameter = _reflection.GeneratedProtocolMessageType(
'ParameterParameter',
(_message.Message, ),
dict(DESCRIPTOR=_PARAMETERPARAMETER,
dict(
DESCRIPTOR=_PARAMETERPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.ParameterParameter)
))
......@@ -13687,7 +13956,8 @@ _sym_db.RegisterMessage(ParameterParameter)
PermuteParameter = _reflection.GeneratedProtocolMessageType(
'PermuteParameter',
(_message.Message, ),
dict(DESCRIPTOR=_PERMUTEPARAMETER,
dict(
DESCRIPTOR=_PERMUTEPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.PermuteParameter)
))
......@@ -13696,7 +13966,8 @@ _sym_db.RegisterMessage(PermuteParameter)
PoolingParameter = _reflection.GeneratedProtocolMessageType(
'PoolingParameter',
(_message.Message, ),
dict(DESCRIPTOR=_POOLINGPARAMETER,
dict(
DESCRIPTOR=_POOLINGPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.PoolingParameter)
))
......@@ -13705,7 +13976,8 @@ _sym_db.RegisterMessage(PoolingParameter)
PowerParameter = _reflection.GeneratedProtocolMessageType(
'PowerParameter',
(_message.Message, ),
dict(DESCRIPTOR=_POWERPARAMETER,
dict(
DESCRIPTOR=_POWERPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.PowerParameter)
))
......@@ -13714,7 +13986,8 @@ _sym_db.RegisterMessage(PowerParameter)
PriorBoxParameter = _reflection.GeneratedProtocolMessageType(
'PriorBoxParameter',
(_message.Message, ),
dict(DESCRIPTOR=_PRIORBOXPARAMETER,
dict(
DESCRIPTOR=_PRIORBOXPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.PriorBoxParameter)
))
......@@ -13723,7 +13996,8 @@ _sym_db.RegisterMessage(PriorBoxParameter)
PythonParameter = _reflection.GeneratedProtocolMessageType(
'PythonParameter',
(_message.Message, ),
dict(DESCRIPTOR=_PYTHONPARAMETER,
dict(
DESCRIPTOR=_PYTHONPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.PythonParameter)
))
......@@ -13732,7 +14006,8 @@ _sym_db.RegisterMessage(PythonParameter)
RecurrentParameter = _reflection.GeneratedProtocolMessageType(
'RecurrentParameter',
(_message.Message, ),
dict(DESCRIPTOR=_RECURRENTPARAMETER,
dict(
DESCRIPTOR=_RECURRENTPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.RecurrentParameter)
))
......@@ -13741,7 +14016,8 @@ _sym_db.RegisterMessage(RecurrentParameter)
ReductionParameter = _reflection.GeneratedProtocolMessageType(
'ReductionParameter',
(_message.Message, ),
dict(DESCRIPTOR=_REDUCTIONPARAMETER,
dict(
DESCRIPTOR=_REDUCTIONPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.ReductionParameter)
))
......@@ -13750,7 +14026,8 @@ _sym_db.RegisterMessage(ReductionParameter)
ReLUParameter = _reflection.GeneratedProtocolMessageType(
'ReLUParameter',
(_message.Message, ),
dict(DESCRIPTOR=_RELUPARAMETER,
dict(
DESCRIPTOR=_RELUPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.ReLUParameter)
))
......@@ -13759,7 +14036,8 @@ _sym_db.RegisterMessage(ReLUParameter)
ReshapeParameter = _reflection.GeneratedProtocolMessageType(
'ReshapeParameter',
(_message.Message, ),
dict(DESCRIPTOR=_RESHAPEPARAMETER,
dict(
DESCRIPTOR=_RESHAPEPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.ReshapeParameter)
))
......@@ -13768,7 +14046,8 @@ _sym_db.RegisterMessage(ReshapeParameter)
ScaleParameter = _reflection.GeneratedProtocolMessageType(
'ScaleParameter',
(_message.Message, ),
dict(DESCRIPTOR=_SCALEPARAMETER,
dict(
DESCRIPTOR=_SCALEPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.ScaleParameter)
))
......@@ -13777,7 +14056,8 @@ _sym_db.RegisterMessage(ScaleParameter)
SigmoidParameter = _reflection.GeneratedProtocolMessageType(
'SigmoidParameter',
(_message.Message, ),
dict(DESCRIPTOR=_SIGMOIDPARAMETER,
dict(
DESCRIPTOR=_SIGMOIDPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.SigmoidParameter)
))
......@@ -13786,7 +14066,8 @@ _sym_db.RegisterMessage(SigmoidParameter)
SliceParameter = _reflection.GeneratedProtocolMessageType(
'SliceParameter',
(_message.Message, ),
dict(DESCRIPTOR=_SLICEPARAMETER,
dict(
DESCRIPTOR=_SLICEPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.SliceParameter)
))
......@@ -13795,7 +14076,8 @@ _sym_db.RegisterMessage(SliceParameter)
SoftmaxParameter = _reflection.GeneratedProtocolMessageType(
'SoftmaxParameter',
(_message.Message, ),
dict(DESCRIPTOR=_SOFTMAXPARAMETER,
dict(
DESCRIPTOR=_SOFTMAXPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.SoftmaxParameter)
))
......@@ -13804,7 +14086,8 @@ _sym_db.RegisterMessage(SoftmaxParameter)
TanHParameter = _reflection.GeneratedProtocolMessageType(
'TanHParameter',
(_message.Message, ),
dict(DESCRIPTOR=_TANHPARAMETER,
dict(
DESCRIPTOR=_TANHPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.TanHParameter)
))
......@@ -13813,7 +14096,8 @@ _sym_db.RegisterMessage(TanHParameter)
TileParameter = _reflection.GeneratedProtocolMessageType(
'TileParameter',
(_message.Message, ),
dict(DESCRIPTOR=_TILEPARAMETER,
dict(
DESCRIPTOR=_TILEPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.TileParameter)
))
......@@ -13822,7 +14106,8 @@ _sym_db.RegisterMessage(TileParameter)
ThresholdParameter = _reflection.GeneratedProtocolMessageType(
'ThresholdParameter',
(_message.Message, ),
dict(DESCRIPTOR=_THRESHOLDPARAMETER,
dict(
DESCRIPTOR=_THRESHOLDPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.ThresholdParameter)
))
......@@ -13831,7 +14116,8 @@ _sym_db.RegisterMessage(ThresholdParameter)
VideoDataParameter = _reflection.GeneratedProtocolMessageType(
'VideoDataParameter',
(_message.Message, ),
dict(DESCRIPTOR=_VIDEODATAPARAMETER,
dict(
DESCRIPTOR=_VIDEODATAPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.VideoDataParameter)
))
......@@ -13840,7 +14126,8 @@ _sym_db.RegisterMessage(VideoDataParameter)
WindowDataParameter = _reflection.GeneratedProtocolMessageType(
'WindowDataParameter',
(_message.Message, ),
dict(DESCRIPTOR=_WINDOWDATAPARAMETER,
dict(
DESCRIPTOR=_WINDOWDATAPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.WindowDataParameter)
))
......@@ -13849,7 +14136,8 @@ _sym_db.RegisterMessage(WindowDataParameter)
SPPParameter = _reflection.GeneratedProtocolMessageType(
'SPPParameter',
(_message.Message, ),
dict(DESCRIPTOR=_SPPPARAMETER,
dict(
DESCRIPTOR=_SPPPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.SPPParameter)
))
......@@ -13858,7 +14146,8 @@ _sym_db.RegisterMessage(SPPParameter)
V1LayerParameter = _reflection.GeneratedProtocolMessageType(
'V1LayerParameter',
(_message.Message, ),
dict(DESCRIPTOR=_V1LAYERPARAMETER,
dict(
DESCRIPTOR=_V1LAYERPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.V1LayerParameter)
))
......@@ -13867,7 +14156,8 @@ _sym_db.RegisterMessage(V1LayerParameter)
V0LayerParameter = _reflection.GeneratedProtocolMessageType(
'V0LayerParameter',
(_message.Message, ),
dict(DESCRIPTOR=_V0LAYERPARAMETER,
dict(
DESCRIPTOR=_V0LAYERPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.V0LayerParameter)
))
......@@ -13876,7 +14166,8 @@ _sym_db.RegisterMessage(V0LayerParameter)
PReLUParameter = _reflection.GeneratedProtocolMessageType(
'PReLUParameter',
(_message.Message, ),
dict(DESCRIPTOR=_PRELUPARAMETER,
dict(
DESCRIPTOR=_PRELUPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.PReLUParameter)
))
......@@ -13885,7 +14176,8 @@ _sym_db.RegisterMessage(PReLUParameter)
ShuffleChannelParameter = _reflection.GeneratedProtocolMessageType(
'ShuffleChannelParameter',
(_message.Message, ),
dict(DESCRIPTOR=_SHUFFLECHANNELPARAMETER,
dict(
DESCRIPTOR=_SHUFFLECHANNELPARAMETER,
__module__='caffe_pb2'
# @@protoc_insertion_point(class_scope:caffe.ShuffleChannelParameter)
))
......
x2paddle/decoder/onnx_decoder.py
浏览文件 @ 73830eb2
......@@ -71,9 +71,8 @@ class ONNXGraphNode(GraphNode):
if attr.type == onnx.AttributeProto.TENSOR:
dtype = np.dtype(TENSOR_TYPE_TO_NP_TYPE[attr.t.data_type])
data = attr.t.raw_data
value = np.frombuffer(data,
dtype=dtype,
count=(len(data) // dtype.itemsize))
value = np.frombuffer(
data, dtype=dtype, count=(len(data) // dtype.itemsize))
elif attr.type == onnx.AttributeProto.STRING:
value = attr.s
value = value.decode() if isinstance(value, bytes) else value
......@@ -205,9 +204,8 @@ class ONNXGraph(Graph):
self.node_map[name].weight = weight
self.node_map[name].embeded_as = []
else:
self.node_map[name] = ONNXGraphDataNode(initializer,
layer_name=name,
is_global_input=False)
self.node_map[name] = ONNXGraphDataNode(
initializer, layer_name=name, is_global_input=False)
self.node_map[name].weight = weight
self.node_map[name].embeded_as = []
......
x2paddle/decoder/tf_decoder.py
浏览文件 @ 73830eb2
......@@ -120,13 +120,13 @@ class TFGraph(Graph):
def build(self):
for layer in self.model.node:
self.node_map[layer.name.replace('/', '_').replace(
'-', '_')] = TFGraphNode(layer, data_format=self.tf_data_format)
'-', '_')] = TFGraphNode(
layer, data_format=self.tf_data_format)
for layer_name, node in self.node_map.items():
for in_node in node.layer.input:
in_node = in_node.replace('/',
'_').replace('-',
'_').replace('^', '')
in_node = in_node.replace('/', '_').replace('-', '_').replace(
'^', '')
if in_node not in self.node_map:
if in_node.strip().split(':')[0] in self.node_map:
self.connect(in_node.strip().split(':')[0], layer_name)
......@@ -390,10 +390,10 @@ class TFDecoder(object):
shape=shape,
name="x2paddle_{}".format(layer.name))
except:
x2paddle_input = tf.placeholder(dtype=dtype,
x2paddle_input = tf.placeholder(
dtype=dtype,
shape=shape,
name="x2paddle_{}".format(
layer.name))
name="x2paddle_{}".format(layer.name))
input_map["{}:0".format(layer.name)] = x2paddle_input
if shape.count(None) > 0:
......
x2paddle/op_mapper/caffe_custom_layer/convolutiondepthwise.py
浏览文件 @ 73830eb2
......@@ -120,9 +120,10 @@ def convolutiondepthwise_layer(inputs,
dila_len)
c_in = input_shape[0][1]
c_out = num_output if num_output is not None else input_shape[0][1]
group = int(c_in / (c_in / c_out)) if c_in > c_out else int(c_in /
(c_out / c_in))
out = fluid.layers.conv2d(input,
group = int(c_in / (c_in / c_out)) if c_in > c_out else int(
c_in / (c_out / c_in))
out = fluid.layers.conv2d(
input,
dilation=[dila_h, dila_w],
filter_size=[k_h, k_w],
stride=[s_h, s_w],
......@@ -142,7 +143,8 @@ def convolutiondepthwise_weights(name, data=None):
return weights_name
register(kind='ConvolutionDepthwise',
register(
kind='ConvolutionDepthwise',
shape=convolutiondepthwise_shape,
layer=convolutiondepthwise_layer,
weights=convolutiondepthwise_weights)
x2paddle/op_mapper/caffe_custom_layer/detectionoutput.py
浏览文件 @ 73830eb2
......@@ -37,8 +37,8 @@ def detectionoutput_layer(inputs,
pbv = fluid.layers.reshape(x=pbv, shape=[-1, 4])
mbox_loc = inputs[0]
mbox_loc = fluid.layers.reshape(x=mbox_loc, shape=[-1, pb.shape[0], 4])
mbox_conf_flatten = fluid.layers.reshape(x=mbox_conf_flatten,
shape=[0, pb.shape[0], -1])
mbox_conf_flatten = fluid.layers.reshape(
x=mbox_conf_flatten, shape=[0, pb.shape[0], -1])
default = {"nms_threshold": 0.3, "top_k": 10, "eta": 1.0}
fields = ['eta', 'top_k', 'nms_threshold']
......@@ -64,7 +64,8 @@ def detectionoutput_weights(name, data=None):
return weights_name
register(kind='DetectionOutput',
register(
kind='DetectionOutput',
shape=detectionoutput_shape,
layer=detectionoutput_layer,
weights=detectionoutput_weights)
x2paddle/op_mapper/caffe_custom_layer/normalize.py
浏览文件 @ 73830eb2
......@@ -20,9 +20,8 @@ def normalize_layer(inputs,
attr=name + '_scale')
scale_param = fluid.layers.reshape(x=scale_param, \
shape=[1] if channel_shared else [input_shape[0][1]])
out = fluid.layers.elementwise_mul(x=l2_norm,
y=scale_param,
axis=-1 if channel_shared else 1)
out = fluid.layers.elementwise_mul(
x=l2_norm, y=scale_param, axis=-1 if channel_shared else 1)
return out
......@@ -31,7 +30,8 @@ def normalize_weights(name, data=None):
return weights_name
register(kind='Normalize',
register(
kind='Normalize',
shape=normalize_shape,
layer=normalize_layer,
weights=normalize_weights)
x2paddle/op_mapper/caffe_custom_layer/permute.py
浏览文件 @ 73830eb2
......@@ -23,7 +23,8 @@ def permute_weights(name, data=None):
return weights_name
register(kind='Permute',
register(
kind='Permute',
shape=permute_shape,
layer=permute_layer,
weights=permute_weights)
x2paddle/op_mapper/caffe_custom_layer/priorbox.py
浏览文件 @ 73830eb2
......@@ -30,7 +30,8 @@ def priorbox_layer(inputs,
steps = tuple(step) if type(step) is list or type(step) is tuple else (step,
step)
box, variance_ = fluid.layers.prior_box(input,
box, variance_ = fluid.layers.prior_box(
input,
image,
min_sizes=min_size,
max_sizes=max_size,
......@@ -53,7 +54,8 @@ def priorbox_weights(name, data=None):
return weights_name
register(kind='PriorBox',
register(
kind='PriorBox',
shape=priorbox_shape,
layer=priorbox_layer,
weights=priorbox_weights)
x2paddle/op_mapper/caffe_custom_layer/roipooling.py
浏览文件 @ 73830eb2
......@@ -21,7 +21,8 @@ def roipooling_layer(inputs,
input = inputs[0]
roi = inputs[1]
roi = fluid.layers.slice(roi, axes=[1], starts=[1], ends=[5])
out = fluid.layers.roi_pool(input,
out = fluid.layers.roi_pool(
input,
roi,
pooled_height=pooled_h,
pooled_width=pooled_w,
......@@ -34,7 +35,8 @@ def roipooling_weights(name, data=None):
return weights_name
register(kind='ROIPooling',
register(
kind='ROIPooling',
shape=roipooling_shape,
layer=roipooling_layer,
weights=roipooling_weights)
x2paddle/op_mapper/caffe_custom_layer/select.py
浏览文件 @ 73830eb2
......@@ -30,7 +30,8 @@ def select_layer(inputs,
out = []
for i in range(len(slice_point)):
out.append(
fluid.layers.slice(input,
fluid.layers.slice(
input,
axes=[axis],
starts=[slice_point[i]],
ends=[slice_point[i + 1]],
......@@ -45,7 +46,8 @@ def select_weights(name, data=None):
return weights_name
register(kind='Select',
register(
kind='Select',
shape=select_shape,
layer=select_layer,
weights=select_weights)
x2paddle/op_mapper/caffe_custom_layer/shufflechannel.py
浏览文件 @ 73830eb2
......@@ -17,7 +17,8 @@ def shufflechannel_weights(name, data=None):
return weights_name
register(kind='ShuffleChannel',
register(
kind='ShuffleChannel',
shape=shufflechannel_shape,
layer=shufflechannel_layer,
weights=shufflechannel_weights)
x2paddle/op_mapper/caffe_op_mapper.py
浏览文件 @ 73830eb2
......@@ -195,10 +195,8 @@ class CaffeOpMapper(OpMapper):
'shape': shape,
'name': string(node.layer_name)
}
node.fluid_code.add_layer("data",
inputs=None,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"data", inputs=None, output=node, param_attr=attr)
def MemoryData(self, node):
# TODO(syf): Paddlepaddle can't fully support
......@@ -209,10 +207,8 @@ class CaffeOpMapper(OpMapper):
'shape': shape,
'name': string(node.layer_name)
}
node.fluid_code.add_layer("data",
inputs=None,
output=node.layer_name + '0',
param_attr=attr)
node.fluid_code.add_layer(
"data", inputs=None, output=node.layer_name + '0', param_attr=attr)
node.fluid_code.add_note('{} = [{}]'.format(node.layer_name,
node.layer_name + '0'))
......@@ -263,10 +259,8 @@ class CaffeOpMapper(OpMapper):
'bias_attr':
False if len(data) == 1 else string(node.layer_name + '_bias'),
}
node.fluid_code.add_layer("conv2d",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"conv2d", inputs=input, output=node, param_attr=attr)
def Deconvolution(self, node):
data = node.data
......@@ -316,10 +310,8 @@ class CaffeOpMapper(OpMapper):
'bias_attr':
False if len(data) == 1 else string(node.layer_name + '_bias')
}
node.fluid_code.add_layer("conv2d_transpose",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"conv2d_transpose", inputs=input, output=node, param_attr=attr)
def Pooling(self, node):
params = node.layer.pooling_param
......@@ -345,10 +337,8 @@ class CaffeOpMapper(OpMapper):
'global_pooling': global_pool,
'name': string(node.layer_name)
}
node.fluid_code.add_layer("pool2d",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"pool2d", inputs=input, output=node, param_attr=attr)
def LRN(self, node):
assert len(node.inputs) == 1, 'The count of LRN node\'s input is not 1.'
......@@ -368,10 +358,8 @@ class CaffeOpMapper(OpMapper):
'beta': params.beta,
'name': string(node.layer_name)
}
node.fluid_code.add_layer("lrn",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"lrn", inputs=input, output=node, param_attr=attr)
def InnerProduct(self, node):
data = node.data
......@@ -420,10 +408,8 @@ class CaffeOpMapper(OpMapper):
'bias_attr':
False if len(data) == 1 else string(node.layer_name + '_bias')
}
node.fluid_code.add_layer("fc",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"fc", inputs=input, output=node, param_attr=attr)
def Softmax(self, node):
assert len(
......@@ -435,10 +421,8 @@ class CaffeOpMapper(OpMapper):
dims = len(shape)
axis = axis + dims if axis < 0 else axis
attr = {'axis': axis, 'name': string(node.layer_name + '_softmax')}
node.fluid_code.add_layer("softmax",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"softmax", inputs=input, output=node, param_attr=attr)
def Slice(self, node):
assert len(
......@@ -459,10 +443,8 @@ class CaffeOpMapper(OpMapper):
'dim': axis,
'name': string(node.layer_name)
}
node.fluid_code.add_layer("split",
inputs=input,
output=node.layer_name,
param_attr=attr)
node.fluid_code.add_layer(
"split", inputs=input, output=node.layer_name, param_attr=attr)
def Concat(self, node):
assert len(
......@@ -475,10 +457,8 @@ class CaffeOpMapper(OpMapper):
params = node.layer.concat_param
axis = params.axis
attr = {'axis': axis, 'name': string(node.layer_name)}
node.fluid_code.add_layer("concat",
inputs=inputs,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"concat", inputs=inputs, output=node, param_attr=attr)
def PReLU(self, node):
assert len(
......@@ -499,10 +479,8 @@ class CaffeOpMapper(OpMapper):
'param_attr': string(node.layer_name + '_weights'),
'name': string(node.layer_name)
}
node.fluid_code.add_layer("prelu",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"prelu", inputs=input, output=node, param_attr=attr)
def Accuracy(self, node):
assert len(
......@@ -526,10 +504,8 @@ class CaffeOpMapper(OpMapper):
assert axis == 1, 'PaddlePaddle can not support the situation when the axis is not 1.'
assert not ignore_label >= 0, 'PaddlePaddle can not support the situation when the model has ignore label.'
attr = {'k': top_k}
node.fluid_code.add_layer("accuracy",
inputs=inputs,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"accuracy", inputs=inputs, output=node, param_attr=attr)
def Eltwise(self, node):
assert len(
......@@ -546,7 +522,8 @@ class CaffeOpMapper(OpMapper):
inputs_dict['x'] = inputs[0]
inputs_dict['y'] = inputs[1]
attr = {'act': None, 'name': string(node.layer_name)}
node.fluid_code.add_layer("elementwise_mul",
node.fluid_code.add_layer(
"elementwise_mul",
inputs=inputs_dict,
output=node,
param_attr=attr)
......@@ -559,14 +536,15 @@ class CaffeOpMapper(OpMapper):
'value': coeff[0],
'dtype': '{}.dtype'.format(input1_name)
}
node.fluid_code.add_layer("fill_constant",
node.fluid_code.add_layer(
"fill_constant",
inputs=None,
output=node.layer_name + '_const1',
param_attr=attr)
attr = {'act': None, 'name': string(node.layer_name + '_mul1')}
node.fluid_code.add_layer("elementwise_mul",
inputs=input1_name + ', ' +
node.layer_name + '_const1',
node.fluid_code.add_layer(
"elementwise_mul",
inputs=input1_name + ', ' + node.layer_name + '_const1',
output=node.layer_name + '_mul1',
param_attr=attr)
input2_name = self.get_input_name(inputs[1])
......@@ -575,21 +553,23 @@ class CaffeOpMapper(OpMapper):
'value': coeff[1],
'dtype': '{}.dtype'.format(input2_name)
}
node.fluid_code.add_layer("fill_constant",
node.fluid_code.add_layer(
"fill_constant",
inputs=None,
output=node.layer_name + '_const2',
param_attr=attr)
attr = {'act': None, 'name': string(node.layer_name + '_mul2')}
node.fluid_code.add_layer("elementwise_mul",
inputs=input2_name + ', ' +
node.layer_name + '_const2',
node.fluid_code.add_layer(
"elementwise_mul",
inputs=input2_name + ', ' + node.layer_name + '_const2',
output=node.layer_name + '_mul2',
param_attr=attr)
attr = {'act': None, 'name': string(node.layer_name)}
node.fluid_code.add_layer("elementwise_add",
inputs='{}_mul1, {}_mul2'.format(
node.layer_name, node.layer_name),
node.fluid_code.add_layer(
"elementwise_add",
inputs='{}_mul1, {}_mul2'.format(node.layer_name,
node.layer_name),
output=node,
param_attr=attr)
else:
......@@ -597,7 +577,8 @@ class CaffeOpMapper(OpMapper):
inputs_dict['x'] = inputs[0]
inputs_dict['y'] = inputs[1]
attr = {'act': None, 'name': string(node.layer_name)}
node.fluid_code.add_layer("elementwise_add",
node.fluid_code.add_layer(
"elementwise_add",
inputs=inputs_dict,
output=node,
param_attr=attr)
......@@ -606,7 +587,8 @@ class CaffeOpMapper(OpMapper):
inputs_dict['x'] = inputs[0]
inputs_dict['y'] = inputs[1]
attr = {'act': None, 'name': string(node.layer_name)}
node.fluid_code.add_layer("elementwise_max",
node.fluid_code.add_layer(
"elementwise_max",
inputs=inputs_dict,
output=node,
param_attr=attr)
......@@ -651,10 +633,8 @@ class CaffeOpMapper(OpMapper):
'epsilon': eps,
'name': string(node.layer_name)
}
node.fluid_code.add_layer("batch_norm",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"batch_norm", inputs=input, output=node, param_attr=attr)
def Scale(self, node):
if node.data is None:
......@@ -687,7 +667,8 @@ class CaffeOpMapper(OpMapper):
inputs_dict['x'] = input0
inputs_dict['y'] = input1
attr = {'axis': axis, 'name': string(node.layer_name + '_mul')}
node.fluid_code.add_layer("elementwise_mul",
node.fluid_code.add_layer(
"elementwise_mul",
inputs=inputs_dict,
output=node.layer_name + '_mul',
param_attr=attr)
......@@ -703,15 +684,14 @@ class CaffeOpMapper(OpMapper):
'is_bias': True,
'default_initializer': 'Constant(value=1.0)'
}
node.fluid_code.add_layer("create_parameter",
inputs=None,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"create_parameter", inputs=None, output=node, param_attr=attr)
inputs_dict = {}
inputs_dict['x'] = input0
inputs_dict['y'] = node
attr = {'axis': axis, 'name': string(node.layer_name + '_mul')}
node.fluid_code.add_layer("elementwise_mul",
node.fluid_code.add_layer(
"elementwise_mul",
inputs=inputs_dict,
output=node.layer_name + '_mul',
param_attr=attr)
......@@ -725,14 +705,16 @@ class CaffeOpMapper(OpMapper):
'is_bias': True,
'default_initializer': 'Constant(value=1.0)'
}
node.fluid_code.add_layer("create_parameter",
node.fluid_code.add_layer(
"create_parameter",
inputs=None,
output=node.layer_name + '_offset_param',
param_attr=attr)
attr = {'axis': axis, 'name': string(node.layer_name + '_add')}
node.fluid_code.add_layer("elementwise_add",
inputs='{}_mul, {}_offset_param'.format(
node.layer_name, node.layer_name),
node.fluid_code.add_layer(
"elementwise_add",
inputs='{}_mul, {}_offset_param'.format(node.layer_name,
node.layer_name),
output=node,
param_attr=attr)
......@@ -747,10 +729,8 @@ class CaffeOpMapper(OpMapper):
'act': None,
'name': string(node.layer_name)
}
node.fluid_code.add_layer("reshape",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"reshape", inputs=input, output=node, param_attr=attr)
def ArgMax(self, node):
assert len(node.inputs) == 1 and len(
......@@ -767,7 +747,8 @@ class CaffeOpMapper(OpMapper):
axis += len(input_shape)
if out_max_val is True:
attr = {'k': top_k, 'name': string(node.layer_name + '_topk')}
node.fluid_code.add_layer("topk",
node.fluid_code.add_layer(
"topk",
inputs=input,
output='{}_topk_var, {}_index_var'.format(
node.layer_name, node.layer_name),
......@@ -779,14 +760,16 @@ class CaffeOpMapper(OpMapper):
output='{}_index_var'.format(node.layer_name),
param_attr=attr)
attr = {'axis': axis, 'name': string(node.layer_name)}
node.fluid_code.add_layer("concat",
node.fluid_code.add_layer(
"concat",
inputs='{}_topk_var, {}_index_var'.format(
node.layer_name, node.layer_name),
output=node,
param_attr=attr)
else:
attr = {'k': top_k, 'name': string(node.layer_name)}
node.fluid_code.add_layer("topk",
node.fluid_code.add_layer(
"topk",
inputs=input,
output='_, {}'.format(node.layer_name),
param_attr=attr)
......@@ -808,7 +791,8 @@ class CaffeOpMapper(OpMapper):
offset), "invalid offset[%s] in crop layer" % (str(offset))
offset_real = [0] * axis + offset
attr = {'offsets': list(offset_real), 'name': string(node.layer_name)}
node.fluid_code.add_layer("crop",
node.fluid_code.add_layer(
"crop",
inputs={
'x': input,
'shape': node.input_shape[1]
......@@ -823,10 +807,8 @@ class CaffeOpMapper(OpMapper):
input = self.graph.get_bottom_node(node, idx=0, copy=True)
shape = node.output_shape[0]
attr = {'shape': shape, 'name': string(node.layer_name)}
node.fluid_code.add_layer("reshape",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"reshape", inputs=input, output=node, param_attr=attr)
def Power(self, node):
assert len(
......@@ -842,15 +824,11 @@ class CaffeOpMapper(OpMapper):
'bias_after_scale': True,
'name': string(node.layer_name + '_scale')
}
node.fluid_code.add_layer("scale",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"scale", inputs=input, output=node, param_attr=attr)
attr = {'factor': power, 'name': string(node.layer_name)}
node.fluid_code.add_layer("pow",
inputs=node,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"pow", inputs=node, output=node, param_attr=attr)
def Reduction(self, node):
assert len(
......@@ -872,55 +850,41 @@ class CaffeOpMapper(OpMapper):
'keep_dim': False,
'name': string(node.layer_name)
}
node.fluid_code.add_layer("reduce_sum",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"reduce_sum", inputs=input, output=node, param_attr=attr)
elif operation == 2: ## operation = ASUM
attr = {'name': string(node.layer_name + '_abs')}
node.fluid_code.add_layer("abs",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"abs", inputs=input, output=node, param_attr=attr)
attr = {
'dim': dim[axis:],
'keep_dim': False,
'name': string(node.layer_name)
}
node.fluid_code.add_layer("reduce_sum",
inputs=node,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"reduce_sum", inputs=node, output=node, param_attr=attr)
elif operation == 3: ## operation = SUMSQ
attr = {'factor': 2.0, 'name': string(node.layer_name + '_pow')}
node.fluid_code.add_layer("pow",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"pow", inputs=input, output=node, param_attr=attr)
attr = {
'dim': dim[axis:],
'keep_dim': False,
'name': string(node.layer_name)
}
node.fluid_code.add_layer("reduce_sum",
inputs=node,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"reduce_sum", inputs=node, output=node, param_attr=attr)
else: ## operation = MEAN
attr = {
'dim': dim[axis:],
'keep_dim': False,
'name': string(node.layer_name)
}
node.fluid_code.add_layer("reduce_mean",
inputs=node,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"reduce_mean", inputs=node, output=node, param_attr=attr)
attr = {'scale': coeff}
node.fluid_code.add_layer("scale",
inputs=node,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"scale", inputs=node, output=node, param_attr=attr)
def deal_custom_layer(self, node):
op = node.layer_type
......@@ -947,7 +911,8 @@ class CaffeOpMapper(OpMapper):
assert input is not None, 'This kind of DetectionOutput is not supported!'
input = self.graph.get_bottom_node(input, idx=0, copy=True)
inputs_node.append(input)
node.fluid_code.add_layer(func.__code__.co_name,
node.fluid_code.add_layer(
func.__code__.co_name,
inputs=inputs_node,
output=node,
param_attr=kwargs,
......@@ -960,7 +925,5 @@ class CaffeOpMapper(OpMapper):
op_info = self.directly_map_ops[node.layer_type]
input = self.graph.get_bottom_node(node, idx=0, copy=True)
attr = {'name': string(node.layer_name)}
node.fluid_code.add_layer(op_info,
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
op_info, inputs=input, output=node, param_attr=attr)
x2paddle/op_mapper/caffe_shape.py
浏览文件 @ 73830eb2
......@@ -67,10 +67,10 @@ def get_strided_kernel_output_shape(params, input_shape, round_func):
i_w = input_shape[3]
dila_h, dila_w, pad_h, pad_w, kernel_h, kernel_w, stride_h, stride_w = get_kernel_parameters(
params)
o_h = (i_h + 2 * pad_h - (dila_h *
(kernel_h - 1) + 1)) / float(stride_h) + 1
o_w = (i_w + 2 * pad_w - (dila_w *
(kernel_w - 1) + 1)) / float(stride_w) + 1
o_h = (i_h + 2 * pad_h -
(dila_h * (kernel_h - 1) + 1)) / float(stride_h) + 1
o_w = (i_w + 2 * pad_w -
(dila_w * (kernel_w - 1) + 1)) / float(stride_w) + 1
o_h = int(round_func(o_h))
o_w = int(round_func(o_w))
has_c_o = hasattr(params, 'num_output')
......
x2paddle/op_mapper/onnx_custom_layer/InstanceNormalization.py
浏览文件 @ 73830eb2
......@@ -24,21 +24,18 @@ def InstanceNormalization_layer(inputs, name=None):
epsilon = 1e-5
input_ = inputs[0]
mean = fluid.layers.reduce_mean(input_, dim=[2, 3], keep_dim=True)
var = fluid.layers.reduce_mean(fluid.layers.square(input_ - mean),
dim=[2, 3],
keep_dim=True)
var = fluid.layers.reduce_mean(
fluid.layers.square(input_ - mean), dim=[2, 3], keep_dim=True)
if name is not None:
scale_name = name + "_scale"
offset_name = name + "_offset"
scale_param = inputs[1]
offset_param = inputs[2]
scale = fluid.layers.create_parameter(name=scale_param.name,
shape=input_.shape[1:2],
dtype="float32")
offset = fluid.layers.create_parameter(name=offset_param.name,
shape=input_.shape[1:2],
dtype="float32")
scale = fluid.layers.create_parameter(
name=scale_param.name, shape=input_.shape[1:2], dtype="float32")
offset = fluid.layers.create_parameter(
name=offset_param.name, shape=input_.shape[1:2], dtype="float32")
tmp = fluid.layers.elementwise_mul(x=(input_ - mean), y=scale, axis=1)
tmp = tmp / fluid.layers.sqrt(var + epsilon)
......@@ -51,7 +48,8 @@ def InstanceNormalization_weights(name, data=None):
return weights_name
register(kind='InstanceNormalization',
register(
kind='InstanceNormalization',
shape=InstanceNormalization_shape,
layer=InstanceNormalization_layer,
child_func=None,
......
x2paddle/op_mapper/tf_op_mapper.py
浏览文件 @ 73830eb2
......@@ -141,10 +141,8 @@ class TFOpMapper(OpMapper):
pd_param_name = list(param.values())[0]
tf_param = node.get_attr(tf_param_name)
attr[pd_param_name] = tf_param
node.fluid_code.add_layer(op_info[0],
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
op_info[0], inputs=input, output=node, param_attr=attr)
def elementwise_map(self, node):
assert node.layer_type in self.elementwise_ops
......@@ -179,21 +177,21 @@ class TFOpMapper(OpMapper):
0] == y_shape[-1] and y_shape.count(-1) < 1:
shape = [1, x_shape[0], 1, 1]
attr = {"shape": shape}
node.fluid_code.add_layer("reshape",
node.fluid_code.add_layer(
"reshape",
inputs=x_input,
output="reshape_x",
param_attr=attr)
if y_shape[0] != 1:
attr = {"expand_times": [y_shape[0], 1, 1, 1]}
node.fluid_code.add_layer("expand",
node.fluid_code.add_layer(
"expand",
inputs="reshape_x",
output="reshape_x",
param_attr=attr)
inputs = {"x": "reshape_x", "y": y_input}
node.fluid_code.add_layer(op_type,
inputs=inputs,
output=node,
param_attr=None)
node.fluid_code.add_layer(
op_type, inputs=inputs, output=node, param_attr=None)
return
else:
raise Exception("Unexpected situation happend")
......@@ -205,10 +203,8 @@ class TFOpMapper(OpMapper):
axis = -1
attr = {"axis": axis}
inputs = {"x": x_input, "y": y_input}
node.fluid_code.add_layer(op_type,
inputs=inputs,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
op_type, inputs=inputs, output=node, param_attr=attr)
return
is_sub_seq = True
......@@ -242,10 +238,8 @@ class TFOpMapper(OpMapper):
if len(x_expand_times) == 4 and x.tf_data_format == "NHWC":
x_expand_times = [x_expand_times[i] for i in [0, 3, 1, 2]]
attr = {"expand_times": x_expand_times}
node.fluid_code.add_layer("expand",
inputs=x_input,
output="x_tmp",
param_attr=attr)
node.fluid_code.add_layer(
"expand", inputs=x_input, output="x_tmp", param_attr=attr)
x_input = "x_tmp"
if y_need_expand:
if len(y_expand_times) == 3 and y.tf_data_format == "NHWC":
......@@ -253,16 +247,12 @@ class TFOpMapper(OpMapper):
if len(y_expand_times) == 4 and y.tf_data_format == "NHWC":
y_expand_times = [y_expand_times[i] for i in [0, 3, 1, 2]]
attr = {"expand_times": y_expand_times}
node.fluid_code.add_layer("expand",
inputs=y_input,
output="y_tmp",
param_attr=attr)
node.fluid_code.add_layer(
"expand", inputs=y_input, output="y_tmp", param_attr=attr)
y_input = "y_tmp"
inputs = {"x": x_input, "y": y_input}
node.fluid_code.add_layer(op_type,
inputs=inputs,
output=node,
param_attr=None)
node.fluid_code.add_layer(
op_type, inputs=inputs, output=node, param_attr=None)
def Placeholder(self, node):
shape = node.out_shapes[0]
......@@ -283,10 +273,8 @@ class TFOpMapper(OpMapper):
if shape[0] < 0:
self.batch_node = node
node.fluid_code.add_layer("data",
inputs=None,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"data", inputs=None, output=node, param_attr=attr)
def OneShotIterator(self, node):
return self.Placeholder(node)
......@@ -320,10 +308,8 @@ class TFOpMapper(OpMapper):
'name': string(node.layer_name),
'default_initializer': initializer
}
node.fluid_code.add_layer("create_parameter",
inputs=None,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"create_parameter", inputs=None, output=node, param_attr=attr)
def Transpose(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -362,16 +348,12 @@ class TFOpMapper(OpMapper):
node.tf_data_format = [tf_data_format[i] for i in perm]
node.pd_data_format = [pd_data_format[i] for i in perm]
attr = {'perm': new_perm}
node.fluid_code.add_layer("transpose",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"transpose", inputs=input, output=node, param_attr=attr)
elif len(node.out_shapes[0]) != 4:
attr = {'perm': perm}
node.fluid_code.add_layer("transpose",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"transpose", inputs=input, output=node, param_attr=attr)
else:
raise Exception("Unexpected situation happend in Transpose OP")
......@@ -401,10 +383,8 @@ class TFOpMapper(OpMapper):
"pool_padding": string(pad_mode),
"pool_stride": strides[2:4]
}
node.fluid_code.add_layer("pool2d",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"pool2d", inputs=input, output=node, param_attr=attr)
def Conv2D(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -444,10 +424,8 @@ class TFOpMapper(OpMapper):
"dilation": dilations[2:4],
"padding": string(pad_mode)
}
node.fluid_code.add_layer("conv2d",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"conv2d", inputs=input, output=node, param_attr=attr)
def BiasAdd(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -457,10 +435,8 @@ class TFOpMapper(OpMapper):
axis = 1
inputs = {"x": input, "y": bias}
attr = {"axis": axis}
node.fluid_code.add_layer("elementwise_add",
inputs=inputs,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"elementwise_add", inputs=inputs, output=node, param_attr=attr)
def FusedBatchNorm(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -491,10 +467,8 @@ class TFOpMapper(OpMapper):
"is_test": True
}
node.fluid_code.add_layer("batch_norm",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"batch_norm", inputs=input, output=node, param_attr=attr)
def FusedBatchNormV3(self, node):
return self.FusedBatchNorm(node)
......@@ -539,10 +513,8 @@ class TFOpMapper(OpMapper):
"use_cudnn": False,
"padding": string(pad_mode)
}
node.fluid_code.add_layer("conv2d",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"conv2d", inputs=input, output=node, param_attr=attr)
def Reshape(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -565,15 +537,14 @@ class TFOpMapper(OpMapper):
assert len(param.out_shapes[0]
) == 1, "Unexpected situation of shape parameter"
attr = {"shape": [-1]}
node.fluid_code.add_layer("reshape",
node.fluid_code.add_layer(
"reshape",
inputs=param,
output="shape_param",
param_attr=attr)
attr = {"num_or_sections": param.out_shapes[0][0], "dim": 0}
node.fluid_code.add_layer("split",
inputs="shape_param",
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"split", inputs="shape_param", output=node, param_attr=attr)
new_param = "["
for i in range(param.out_shapes[0][0]):
new_param += (node.layer_name + "[{}]".format(i) + ", ")
......@@ -601,14 +572,10 @@ class TFOpMapper(OpMapper):
if len(input.out_shapes[0]) == 4 and node.tf_data_format == "NHWC":
if len(attr["shape"]) < 3:
perm = {"perm": [0, 2, 3, 1]}
node.fluid_code.add_layer("transpose",
inputs=input,
output=node,
param_attr=perm)
node.fluid_code.add_layer("reshape",
inputs=node,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"transpose", inputs=input, output=node, param_attr=perm)
node.fluid_code.add_layer(
"reshape", inputs=node, output=node, param_attr=attr)
return
if len(attr["shape"]) == 4 and node.tf_data_format == "NHWC":
......@@ -617,27 +584,19 @@ class TFOpMapper(OpMapper):
attr["shape"] = [attr["shape"][i] for i in [0, 3, 1, 2]]
else:
perm = {"perm": [0, 2, 3, 1]}
node.fluid_code.add_layer("transpose",
inputs=input,
output=node,
param_attr=perm)
node.fluid_code.add_layer("reshape",
inputs=node,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"transpose", inputs=input, output=node, param_attr=perm)
node.fluid_code.add_layer(
"reshape", inputs=node, output=node, param_attr=attr)
perm = {"perm": [0, 3, 1, 2]}
node.fluid_code.add_layer("transpose",
inputs=node,
output=node,
param_attr=perm)
node.fluid_code.add_layer(
"transpose", inputs=node, output=node, param_attr=perm)
return
if len(attr["shape"]) == 5:
attr["shape"] = [attr["shape"][i] for i in [0, 1, 4, 2, 3]]
node.fluid_code.add_layer("reshape",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"reshape", inputs=input, output=node, param_attr=attr)
def AvgPool(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -665,10 +624,8 @@ class TFOpMapper(OpMapper):
"pool_stride": strides[2:4],
"pool_padding": string(pad_mode)
}
node.fluid_code.add_layer("pool2d",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"pool2d", inputs=input, output=node, param_attr=attr)
def SplitV(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -685,10 +642,8 @@ class TFOpMapper(OpMapper):
"num_or_sections": num_sections.value.tolist(),
"dim": dim.value
}
node.fluid_code.add_layer("split",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"split", inputs=input, output=node, param_attr=attr)
def ConcatV2(self, node):
inputs = [
......@@ -703,10 +658,8 @@ class TFOpMapper(OpMapper):
inputs[0].out_shapes[0]) == 4:
axis = nhwc_dim_to_nchw(inputs[0], axis)
attr = {"axis": axis}
node.fluid_code.add_layer("concat",
inputs=inputs,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"concat", inputs=inputs, output=node, param_attr=attr)
def Tile(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -726,10 +679,8 @@ class TFOpMapper(OpMapper):
expand_times[i] = 1
attr = {"expand_times": expand_times}
node.fluid_code.add_layer("expand",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"expand", inputs=input, output=node, param_attr=attr)
def Pack(self, node):
inputs = [
......@@ -747,10 +698,8 @@ class TFOpMapper(OpMapper):
node.pd_data_format = "".join(pd_data_format)
attr = {"axis": axis}
node.fluid_code.add_layer("stack",
inputs=inputs,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"stack", inputs=inputs, output=node, param_attr=attr)
def Pad(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -767,10 +716,8 @@ class TFOpMapper(OpMapper):
paddings = paddings[4:]
pad_op = "pad2d"
attr = {"paddings": paddings}
node.fluid_code.add_layer(pad_op,
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
pad_op, inputs=input, output=node, param_attr=attr)
def MirrorPad(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -789,10 +736,8 @@ class TFOpMapper(OpMapper):
paddings = paddings[4:]
pad_op = "pad2d"
attr = {"paddings": paddings, "mode": string("reflect")}
node.fluid_code.add_layer(pad_op,
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
pad_op, inputs=input, output=node, param_attr=attr)
def Range(self, node):
start = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -816,10 +761,8 @@ class TFOpMapper(OpMapper):
inputs = {"start": start, "end": limit, "step": delta}
attr = {"dtype": string(node.dtype)}
node.fluid_code.add_layer("range",
inputs=inputs,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"range", inputs=inputs, output=node, param_attr=attr)
def Mean(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -833,10 +776,8 @@ class TFOpMapper(OpMapper):
dims[i] = nhwc_dim_to_nchw(input, dims[i])
attr = {"dim": dims, "keep_dim": keep_dims}
node.fluid_code.add_layer("reduce_mean",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"reduce_mean", inputs=input, output=node, param_attr=attr)
def MatMul(self, node):
x = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -850,15 +791,11 @@ class TFOpMapper(OpMapper):
shape = x.out_shapes[0]
shape[-1] = y.out_shapes[0][0]
attr = {"shape": shape}
node.fluid_code.add_layer("reshape",
inputs=x,
output=x,
param_attr=attr)
node.fluid_code.add_layer(
"reshape", inputs=x, output=x, param_attr=attr)
attr = {"transpose_x": transpose_a, "transpose_y": transpose_b}
node.fluid_code.add_layer("matmul",
inputs=inputs,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"matmul", inputs=inputs, output=node, param_attr=attr)
def ArgMax(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -869,10 +806,8 @@ class TFOpMapper(OpMapper):
if input.tf_data_format == "NHWC" and len(input.out_shapes[0]) == 4:
axis = nhwc_dim_to_nchw(input, axis)
attr = {"axis": axis}
node.fluid_code.add_layer("argmax",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"argmax", inputs=input, output=node, param_attr=attr)
def StridedSlice(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -910,16 +845,12 @@ class TFOpMapper(OpMapper):
x = shrink_axis_mask >> i & 1
if x == 1:
squeeze_dims.append(i)
node.fluid_code.add_layer("slice",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"slice", inputs=input, output=node, param_attr=attr)
if shrink_axis_mask > 0 and len(input.out_shapes[0]) == 5:
attr = {"axes": squeeze_dims}
node.fluid_code.add_layer("squeeze",
inputs=node,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"squeeze", inputs=node, output=node, param_attr=attr)
def Slice(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -951,10 +882,8 @@ class TFOpMapper(OpMapper):
"starts": begin,
"ends": size
}
node.fluid_code.add_layer("slice",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"slice", inputs=input, output=node, param_attr=attr)
def Conv2DBackpropInput(self, node):
out_shape = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -1004,10 +933,8 @@ class TFOpMapper(OpMapper):
"padding": string(pad_mode),
"output_size": out_shape[1:3]
}
node.fluid_code.add_layer("conv2d_transpose",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"conv2d_transpose", inputs=input, output=node, param_attr=attr)
def Max(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -1019,10 +946,8 @@ class TFOpMapper(OpMapper):
dim = nhwc_dim_to_nchw(input, dim)
attr = {"dim": dim, "keep_dim": keep_dims}
node.fluid_code.add_layer("reduce_max",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"reduce_max", inputs=input, output=node, param_attr=attr)
def Sum(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -1034,19 +959,15 @@ class TFOpMapper(OpMapper):
dim = nhwc_dim_to_nchw(input, dim)
attr = {"dim": dim, "keep_dim": keep_dims}
node.fluid_code.add_layer("reduce_sum",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"reduce_sum", inputs=input, output=node, param_attr=attr)
def Cast(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
dtype = node.dtype_map[node.get_attr('DstT')]
attr = {"dtype": string(dtype)}
node.fluid_code.add_layer("cast",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"cast", inputs=input, output=node, param_attr=attr)
def Split(self, node):
dim = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -1058,10 +979,8 @@ class TFOpMapper(OpMapper):
dim = nhwc_dim_to_nchw(input, dim)
attr = {"num_or_sections": num_split, "dim": dim}
node.fluid_code.add_layer("split",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"split", inputs=input, output=node, param_attr=attr)
def Squeeze(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -1070,10 +989,8 @@ class TFOpMapper(OpMapper):
for i in range(len(squeeze_dims)):
squeeze_dims[i] = nhwc_dim_to_nchw(input, squeeze_dims[i])
attr = {"axes": squeeze_dims}
node.fluid_code.add_layer("squeeze",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"squeeze", inputs=input, output=node, param_attr=attr)
def Softmax(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -1083,10 +1000,8 @@ class TFOpMapper(OpMapper):
if input.tf_data_format == "NHWC" and len(input.out_shapes[0]) == 4:
axis = nhwc_dim_to_nchw(input, axis)
attr = {"axis": axis}
node.fluid_code.add_layer("softmax",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"softmax", inputs=input, output=node, param_attr=attr)
def ResizeNearestNeighbor(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -1099,10 +1014,8 @@ class TFOpMapper(OpMapper):
resize_shape, node.out_shapes[0])
align_corners = node.get_attr("align_corners")
attr = {"align_corners": align_corners, "out_shape": resize_shape}
node.fluid_code.add_layer("resize_nearest",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"resize_nearest", inputs=input, output=node, param_attr=attr)
def ResizeBilinear(self, node):
input = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -1119,19 +1032,15 @@ class TFOpMapper(OpMapper):
"out_shape": resize_shape,
"align_mode": 1
}
node.fluid_code.add_layer("resize_bilinear",
inputs=input,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"resize_bilinear", inputs=input, output=node, param_attr=attr)
def GreaterEqual(self, node):
x = self.graph.get_node(node.layer.input[0], copy=True)
y = self.graph.get_node(node.layer.input[1], copy=True)
inputs = {"x": x, "y": y}
node.fluid_code.add_layer("greater_equal",
inputs=inputs,
output=node,
param_attr=None)
node.fluid_code.add_layer(
"greater_equal", inputs=inputs, output=node, param_attr=None)
def RandomUniform(self, node):
shape = self.graph.get_node(node.layer.input[0], copy=True)
......@@ -1145,26 +1054,21 @@ class TFOpMapper(OpMapper):
attr = {"shape": shape, "min": 0.0, "max": 0.9999}
if shape[0] < 0:
input = self.batch_node
node.fluid_code.add_layer("uniform_random_batch_size_like",
node.fluid_code.add_layer(
"uniform_random_batch_size_like",
inputs=input,
output=node,
param_attr=attr)
else:
node.fluid_code.add_layer("uniform_random",
inputs=None,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"uniform_random", inputs=None, output=node, param_attr=attr)
def SquaredDifference(self, node):
x = self.graph.get_node(node.layer.input[0], copy=True)
y = self.graph.get_node(node.layer.input[1], copy=True)
inputs = {"x": x, "y": y}
node.fluid_code.add_layer("elementwise_sub",
inputs=inputs,
output=node,
param_attr=None)
node.fluid_code.add_layer(
"elementwise_sub", inputs=inputs, output=node, param_attr=None)
inputs = {"x": node, "y": node}
node.fluid_code.add_layer("elementwise_mul",
inputs=inputs,
output=node,
param_attr=None)
node.fluid_code.add_layer(
"elementwise_mul", inputs=inputs, output=node, param_attr=None)
x2paddle/optimizer/caffe_optimizer.py
浏览文件 @ 73830eb2
......@@ -41,7 +41,8 @@ class CaffeOptimizer(object):
if is_delete_node:
parent_node.fluid_code.clear()
node.fluid_code.clear()
node.fluid_code.add_layer("batch_norm",
node.fluid_code.add_layer(
"batch_norm",
inputs=input,
output=node,
param_attr=parent_param_attr)
......@@ -62,7 +63,8 @@ class CaffeOptimizer(object):
if is_delete_node:
parent_node.fluid_code.clear()
node.fluid_code.clear()
node.fluid_code.add_layer(op,
node.fluid_code.add_layer(
op,
inputs=input,
output=node,
param_attr=parent_param_attr)
x2paddle/optimizer/tf_optimizer.py
浏览文件 @ 73830eb2
......@@ -554,7 +554,8 @@ class TFOptimizer(object):
node.fluid_code.layers[0].param_attr["shape"] = shape
node.fluid_code.layers[0].output = "nhwc_" + name
attr = {"perm": [0, 2, 3, 1]}
node.fluid_code.add_layer("transpose",
node.fluid_code.add_layer(
"transpose",
inputs="nhwc_" + name,
output=node,
param_attr=attr)
......@@ -972,10 +973,8 @@ class TFOptimizer(object):
"bias_after_scale": True,
"act": act
}
node.fluid_code.add_layer("scale",
inputs=in_node,
output=node,
param_attr=attr)
node.fluid_code.add_layer(
"scale", inputs=in_node, output=node, param_attr=attr)
del self.graph.node_map[in_nodes0[0].layer_name]
del self.graph.node_map[in_nodes0[1].layer_name]
......@@ -1055,7 +1054,8 @@ class TFOptimizer(object):
"shape": [channel],
"name": string(node.layer_name + "_scale")
}
node.fluid_code.add_layer("create_parameter",
node.fluid_code.add_layer(
"create_parameter",
inputs=None,
output=node.layer_name + "_scale",
param_attr=attr)
......@@ -1064,7 +1064,8 @@ class TFOptimizer(object):
"shape": [channel],
"name": string(node.layer_name + "_bias")
}
node.fluid_code.add_layer("create_parameter",
node.fluid_code.add_layer(
"create_parameter",
inputs=None,
output=node.layer_name + "_bias",
param_attr=attr)
......@@ -1074,7 +1075,8 @@ class TFOptimizer(object):
"bias": node.layer_name + "_bias"
}
attr = {"act": act}
node.fluid_code.add_layer("affine_channel",
node.fluid_code.add_layer(
"affine_channel",
inputs=inputs,
output=node,
param_attr=attr)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或