diff options
| author |  A. Unique TensorFlower <nobody@tensorflow.org> | 2016-04-19 16:36:49 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2016-04-19 17:44:41 -0700 |
| commit | 43fc42b7052b2bc47040ad85049290387d6dc2e8 (patch) | |
| tree | 255bbaeff0be22e1ab8acf17c78de923d9ef3cd0 /tensorflow/core/framework/op_def_util.cc | |
| parent | e8beb7e6436c2d8f511f53749733b7762ae3d896 (diff) | |
Rollback of "Change tensorflow code to use proto_text for DebugString andS hortDebugString"
calls, for call sites that are needed on android.
Also changed protobuf.h to use MessageLite.
Change: 120289807
Diffstat (limited to 'tensorflow/core/framework/op_def_util.cc')
| -rw-r--r-- | tensorflow/core/framework/op_def_util.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tensorflow/core/framework/op_def_util.cc b/tensorflow/core/framework/op_def_util.cc index 7f559ce525..f7e4f1f05a 100644 --- a/tensorflow/core/framework/op_def_util.cc +++ b/tensorflow/core/framework/op_def_util.cc @@ -18,7 +18,6 @@ limitations under the License. #include <set> #include <unordered_map> #include "tensorflow/core/framework/attr_value_util.h" -#include "tensorflow/core/framework/op_def.pb_text.h" #include "tensorflow/core/framework/types.h" #include "tensorflow/core/lib/core/errors.h" #include "tensorflow/core/lib/core/stringpiece.h" @@ -156,12 +155,12 @@ OpDef::AttrDef* FindAttrMutable(StringPiece name, OpDef* op_def) { return nullptr; } -#define VALIDATE(EXPR, ...) \ - do { \ - if (!(EXPR)) { \ - return errors::InvalidArgument(__VA_ARGS__, "; in OpDef: ", \ - ProtoShortDebugString(op_def)); \ - } \ +#define VALIDATE(EXPR, ...) \ + do { \ + if (!(EXPR)) { \ + return errors::InvalidArgument(__VA_ARGS__, "; in OpDef: ", \ + op_def.ShortDebugString()); \ + } \ } while (false) static Status ValidateArg(const OpDef::ArgDef& arg, const OpDef& op_def, |