diff options
| author |  Xiaoming (Jason) Cui <xiaoming.cui@intel.com> | 2018-09-30 01:14:27 -0700 |
|---|---|---|
| committer | Xiaoming (Jason) Cui <xiaoming.cui@intel.com> | 2018-09-30 01:14:27 -0700 |
| commit | a5ee8abc086c87144b1a74ef5ee005ca859fbff2 (patch) | |
| tree | f01425612d10836969655f355c3362b16b1957d3 /tensorflow/core | |
| parent | 2b456a2b5dc6b5bb092b3986a400acb77b21a30f (diff) | |
| parent | 2538e68a69e585696175bd972cae119e06bde294 (diff) | |
Merge branch 'master' into cuixiaom_disable_MKL
Diffstat (limited to 'tensorflow/core')
| -rw-r--r-- | tensorflow/core/BUILD | 3 | ||||
| -rw-r--r-- | tensorflow/core/grappler/optimizers/pin_to_host_optimizer.cc | 8 | ||||
| -rw-r--r-- | tensorflow/core/profiler/BUILD | 1 |
3 files changed, 7 insertions, 5 deletions
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD index 7da4b9fbd0..57819cec70 100644 --- a/tensorflow/core/BUILD +++ b/tensorflow/core/BUILD @@ -239,7 +239,6 @@ tf_proto_library( srcs = [], cc_api_version = 2, default_header = True, - java_api_version = 2, js_api_version = 2, protodeps = [ ":protos_all_proto", @@ -2385,7 +2384,6 @@ tf_proto_library( srcs = ERROR_CODES_PROTO_SRCS, cc_api_version = 2, default_header = True, - java_api_version = 2, js_api_version = 2, provide_cc_alias = True, ) @@ -2406,7 +2404,6 @@ tf_proto_library( srcs = COMMON_PROTO_SRCS + ADDITIONAL_CORE_PROTO_SRCS, cc_api_version = 2, default_header = True, - java_api_version = 2, js_api_version = 2, protodeps = [ ":error_codes_proto", diff --git a/tensorflow/core/grappler/optimizers/pin_to_host_optimizer.cc b/tensorflow/core/grappler/optimizers/pin_to_host_optimizer.cc index 2190d38937..89eb76046e 100644 --- a/tensorflow/core/grappler/optimizers/pin_to_host_optimizer.cc +++ b/tensorflow/core/grappler/optimizers/pin_to_host_optimizer.cc @@ -169,7 +169,13 @@ bool IsTPUGraphDef(const GraphDef& def) { } // All the nodes that should be blacklisted and not swapped. -bool IsBlacklisted(const NodeDef& node) { return IsCollective(node); } +bool IsBlacklisted(const NodeDef& node) { + return + // Collective ops should not be swapped. + IsCollective(node) || + // NoOp breaks perf regression tests (probably due to group dependencies). + IsNoOp(node); +} } // end namespace internal Status PinToHostOptimizer::Optimize(Cluster* cluster, const GrapplerItem& item, diff --git a/tensorflow/core/profiler/BUILD b/tensorflow/core/profiler/BUILD index af034bdd7d..2bf371276e 100644 --- a/tensorflow/core/profiler/BUILD +++ b/tensorflow/core/profiler/BUILD @@ -40,7 +40,6 @@ tf_proto_library( name = "protos_all", srcs = glob(["**/*.proto"]), cc_api_version = 2, - java_api_version = 2, protodeps = tf_additional_all_protos(), visibility = ["//visibility:public"], ) |