diff options
| author |  Xiaoming (Jason) Cui <xiaoming.cui@intel.com> | 2018-09-30 01:12:34 -0700 |
|---|---|---|
| committer | Xiaoming (Jason) Cui <xiaoming.cui@intel.com> | 2018-09-30 01:12:34 -0700 |
| commit | 2b456a2b5dc6b5bb092b3986a400acb77b21a30f (patch) | |
| tree | 6324d237ede010bb64df98a8d0c42942f60c46f7 /tensorflow/core | |
| parent | d936d819752916d3122f02def571ecac9e995029 (diff) | |
Added some minor format changes
Diffstat (limited to 'tensorflow/core')
| -rw-r--r-- | tensorflow/core/common_runtime/process_util.cc | 6 | ||||
| -rw-r--r-- | tensorflow/core/common_runtime/threadpool_device.cc | 6 | ||||
| -rw-r--r-- | tensorflow/core/util/util.cc | 2 | ||||
| -rw-r--r-- | tensorflow/core/util/util.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/tensorflow/core/common_runtime/process_util.cc b/tensorflow/core/common_runtime/process_util.cc index b3064a4c08..c75d8a8ce6 100644 --- a/tensorflow/core/common_runtime/process_util.cc +++ b/tensorflow/core/common_runtime/process_util.cc @@ -62,15 +62,15 @@ int32 NumInterOpThreadsFromSessionOptions(const SessionOptions& options) { // Set inter_op conservatively to avoid thread oversubscription that could // lead to severe perf degradations and OMP resource exhaustion int mkl_intra_op = 1; - #ifdef _OPENMP +#ifdef _OPENMP mkl_intra_op = omp_get_max_threads(); - #endif // _OPENMP +#endif // _OPENMP 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."; + << ".Tune using inter_op_parallelism_threads for best performance."; return mkl_inter_op; } #endif // INTEL_MKL diff --git a/tensorflow/core/common_runtime/threadpool_device.cc b/tensorflow/core/common_runtime/threadpool_device.cc index f188016610..6404d8bc6a 100644 --- a/tensorflow/core/common_runtime/threadpool_device.cc +++ b/tensorflow/core/common_runtime/threadpool_device.cc @@ -51,8 +51,7 @@ ThreadPoolDevice::ThreadPoolDevice(const SessionOptions& options, scoped_allocator_mgr_(new ScopedAllocatorMgr(name)) { #ifdef INTEL_MKL // Early return when MKL is disabled - if (DisableMKL()) - return; + if (DisableMKL()) return; #ifdef _OPENMP const char* user_omp_threads = getenv("OMP_NUM_THREADS"); if (user_omp_threads == nullptr) { @@ -118,7 +117,8 @@ class MklCPUAllocatorFactory : public AllocatorFactory { }; #ifdef ENABLE_MKL -REGISTER_MEM_ALLOCATOR("MklCPUAllocator", (DisableMKL() ? 50 : 200), MklCPUAllocatorFactory); +REGISTER_MEM_ALLOCATOR("MklCPUAllocator", (DisableMKL() ? 50 : 200), + MklCPUAllocatorFactory); #endif // ENABLE_MKL } // namespace diff --git a/tensorflow/core/util/util.cc b/tensorflow/core/util/util.cc index 44d5becb9c..6e78777dd9 100644 --- a/tensorflow/core/util/util.cc +++ b/tensorflow/core/util/util.cc @@ -139,5 +139,5 @@ bool DisableMKL() { } return status == MKL_OFF ? true : false; } -#endif +#endif // INTEL_MKL } // namespace tensorflow diff --git a/tensorflow/core/util/util.h b/tensorflow/core/util/util.h index ba90ad52c2..4aa47aa48a 100644 --- a/tensorflow/core/util/util.h +++ b/tensorflow/core/util/util.h @@ -59,7 +59,7 @@ string SliceDebugString(const TensorShape& shape, const int64 flat); // disable MKL in runtime #ifdef INTEL_MKL bool DisableMKL(); -#endif +#endif // INTEL_MKL } // namespace tensorflow |