diff options
| author |  Xiaoming (Jason) Cui <xiaoming.cui@intel.com> | 2018-10-01 17:00:04 -0700 |
|---|---|---|
| committer | Xiaoming (Jason) Cui <xiaoming.cui@intel.com> | 2018-10-01 17:00:04 -0700 |
| commit | 9571f0e9f07679f0b4140c62488b21163394bb3d (patch) | |
| tree | f513245ef9d5162b720ee6fc128345ce42a5bc81 /tensorflow/core | |
| parent | a5ee8abc086c87144b1a74ef5ee005ca859fbff2 (diff) | |
| parent | e0da6256cd116d17057374594f2fc191cf201f42 (diff) | |
Merge the branch with master branch
Diffstat (limited to 'tensorflow/core')
| -rw-r--r-- | tensorflow/core/common_runtime/process_util.cc | 7 | ||||
| -rw-r--r-- | tensorflow/core/util/util.cc | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/tensorflow/core/common_runtime/process_util.cc b/tensorflow/core/common_runtime/process_util.cc index c75d8a8ce6..4570496637 100644 --- a/tensorflow/core/common_runtime/process_util.cc +++ b/tensorflow/core/common_runtime/process_util.cc @@ -68,9 +68,10 @@ int32 NumInterOpThreadsFromSessionOptions(const SessionOptions& options) { CHECK_GE(mkl_intra_op, 1); const int32 mkl_inter_op = std::max( (port::NumSchedulableCPUs() + mkl_intra_op - 1) / mkl_intra_op, 2); - VLOG(0) << "Creating new thread pool with default inter op setting: " - << mkl_inter_op - << ".Tune using inter_op_parallelism_threads for best performance."; + VLOG(0) + << "Creating new thread pool with default inter op setting: " + << mkl_inter_op + << ". Tune using inter_op_parallelism_threads for best performance."; return mkl_inter_op; } #endif // INTEL_MKL diff --git a/tensorflow/core/util/util.cc b/tensorflow/core/util/util.cc index 6e78777dd9..489999d1e8 100644 --- a/tensorflow/core/util/util.cc +++ b/tensorflow/core/util/util.cc @@ -122,11 +122,7 @@ string SliceDebugString(const TensorShape& shape, const int64 flat) { #ifdef INTEL_MKL bool DisableMKL() { - enum MklStatus { - MKL_DEFAULT = 0, - MKL_ON = 1, - MKL_OFF = 2 - }; + enum MklStatus { MKL_DEFAULT = 0, MKL_ON = 1, MKL_OFF = 2 }; static MklStatus status = MKL_DEFAULT; if (status == MKL_DEFAULT) { char* tf_disable_mkl = getenv("TF_DISABLE_MKL"); |