diff --git a/mindspore/lite/schema/model.fbs b/mindspore/lite/schema/model.fbs index 07721e240ed..63ce23fbfa0 100644 --- a/mindspore/lite/schema/model.fbs +++ b/mindspore/lite/schema/model.fbs @@ -103,9 +103,7 @@ table MetaGraph { allTensors: [Tensor]; // weight + input + output subGraph : [SubGraph]; obfuscate: bool = false; - encrypt: bool = false; obfMetaData: [ubyte]; - decryptTable: [ubyte]; } root_type MetaGraph; diff --git a/mindspore/lite/schema/ops.fbs b/mindspore/lite/schema/ops.fbs index c62ff80115e..e6605bead0d 100644 --- a/mindspore/lite/schema/ops.fbs +++ b/mindspore/lite/schema/ops.fbs @@ -1158,4 +1158,8 @@ table GenOP { global: bool; channel_shared: bool; axes: [long]; + keep_dims: bool; + reduce_mode: ReduceMode; + reduce_to_end: bool; + coeff: float; } diff --git a/mindspore/lite/src/ops/ops_def.cc b/mindspore/lite/src/ops/ops_def.cc index 0588d5bdc24..a8e51192557 100644 --- a/mindspore/lite/src/ops/ops_def.cc +++ b/mindspore/lite/src/ops/ops_def.cc @@ -1157,4 +1157,8 @@ OP_ATTR_ONLY(round_mode, RoundMode) OP_ATTR_ONLY(global, bool) OP_ATTR_ONLY(channel_shared, bool) OP_ATTR_ONLY(axes, [long]) +OP_ATTR_ONLY(keep_dims, bool) +OP_ATTR_ONLY(reduce_mode, ReduceMode) +OP_ATTR_ONLY(reduce_to_end, bool) +OP_ATTR_ONLY(coeff, float) OP_SCHEMA_DEF_ONLY_END(GenOP) diff --git a/mindspore/lite/tools/obfuscator/bin/linux-x64/msobfuscator b/mindspore/lite/tools/obfuscator/bin/linux-x64/msobfuscator index 73ad0427171..7ad7c903781 100644 Binary files a/mindspore/lite/tools/obfuscator/bin/linux-x64/msobfuscator and b/mindspore/lite/tools/obfuscator/bin/linux-x64/msobfuscator differ diff --git a/mindspore/lite/tools/obfuscator/include/deobfuscator.h b/mindspore/lite/tools/obfuscator/include/deobfuscator.h index 6edf410fbf7..692e5015f0f 100644 --- a/mindspore/lite/tools/obfuscator/include/deobfuscator.h +++ b/mindspore/lite/tools/obfuscator/include/deobfuscator.h @@ -55,13 +55,12 @@ bool IsMetaGraphObfuscated(const T &meta_graph) { template DeObfuscator *GetModelDeObfuscator(const T &meta_graph, Model *model) { auto meta_data = meta_graph.obfMetaData(); - auto decrypt_table = meta_graph.decryptTable(); auto *model_deobfuscator = new (std::nothrow) DeObfuscator(); if (model_deobfuscator == nullptr) { MS_LOG(ERROR) << "new model deobfuscator fail!"; return nullptr; } - if (!InitModelDeObfuscator(model, model_deobfuscator, meta_data, decrypt_table, meta_graph.nodes()->size())) { + if (!InitModelDeObfuscator(model, model_deobfuscator, meta_data, nullptr, meta_graph.nodes()->size())) { MS_LOG(ERROR) << "init model deobfuscator fail!"; delete model_deobfuscator; return nullptr; diff --git a/mindspore/lite/tools/obfuscator/lib/android-aarch32/libmsdeobfuscator-lite.so b/mindspore/lite/tools/obfuscator/lib/android-aarch32/libmsdeobfuscator-lite.so index c35ee9a02da..19cdd85c1ed 100644 Binary files a/mindspore/lite/tools/obfuscator/lib/android-aarch32/libmsdeobfuscator-lite.so and b/mindspore/lite/tools/obfuscator/lib/android-aarch32/libmsdeobfuscator-lite.so differ diff --git a/mindspore/lite/tools/obfuscator/lib/android-aarch64/libmsdeobfuscator-lite.so b/mindspore/lite/tools/obfuscator/lib/android-aarch64/libmsdeobfuscator-lite.so index ba5d68755e5..5aa178cd746 100644 Binary files a/mindspore/lite/tools/obfuscator/lib/android-aarch64/libmsdeobfuscator-lite.so and b/mindspore/lite/tools/obfuscator/lib/android-aarch64/libmsdeobfuscator-lite.so differ diff --git a/mindspore/lite/tools/obfuscator/lib/linux-x64/libmsdeobfuscator-lite.so b/mindspore/lite/tools/obfuscator/lib/linux-x64/libmsdeobfuscator-lite.so index 286ac0562d1..65d44355067 100644 Binary files a/mindspore/lite/tools/obfuscator/lib/linux-x64/libmsdeobfuscator-lite.so and b/mindspore/lite/tools/obfuscator/lib/linux-x64/libmsdeobfuscator-lite.so differ