diff options
| author |  Xiaoming (Jason) Cui <xiaoming.cui@intel.com> | 2018-09-28 19:08:20 -0700 |
|---|---|---|
| committer | Xiaoming (Jason) Cui <xiaoming.cui@intel.com> | 2018-09-28 19:08:20 -0700 |
| commit | a287961cffcb9ae1a0675f4e18d14674dfae130a (patch) | |
| tree | 7d1c8e4bfc2fe80b099cb5d99c1fb808dbb7fa8a /tensorflow/core/util | |
| parent | b5feceb9058e06eac3de86ec45c44f5637054855 (diff) | |
| parent | abd5c32c0fa6451e73b491affdd86d852a74177f (diff) | |
Merge branch 'master' into cuixiaom_disable_MKL
Diffstat (limited to 'tensorflow/core/util')
| -rw-r--r-- | tensorflow/core/util/mkl_util.h | 12 | ||||
| -rw-r--r-- | tensorflow/core/util/tensor_bundle/BUILD | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/tensorflow/core/util/mkl_util.h b/tensorflow/core/util/mkl_util.h index cf7ffd8149..04aaea4f89 100644 --- a/tensorflow/core/util/mkl_util.h +++ b/tensorflow/core/util/mkl_util.h @@ -2039,8 +2039,8 @@ class MklPrimitiveFactory { /// Fuction to check whether primitive memory optimization is enabled static inline bool IsPrimitiveMemOptEnabled() { bool is_primitive_mem_opt_enabled = true; - TF_CHECK_OK(ReadBoolFromEnvVar("TF_MKL_OPTIMIZE_PRIMITVE_MEMUSE", true, - &is_primitive_mem_opt_enabled)); + TF_CHECK_OK(ReadBoolFromEnvVar("TF_MKL_OPTIMIZE_PRIMITIVE_MEMUSE", true, + &is_primitive_mem_opt_enabled)); return is_primitive_mem_opt_enabled; } @@ -2095,9 +2095,8 @@ static inline memory::format get_desired_format(int channel, fmt_desired = is_2d ? memory::format::nChw16c : memory::format::nCdhw16c; } else if (port::TestCPUFeature(port::CPUFeature::AVX2) && (channel % 8) == 0) { - fmt_desired = is_2d - ? memory::format::nChw8c - : memory::format::ncdhw; //not support avx2 for 3d yet. + fmt_desired = is_2d ? memory::format::nChw8c + : memory::format::ncdhw; // no avx2 support for 3d yet. } else { fmt_desired = is_2d ? memory::format::nchw : memory::format::ncdhw; } @@ -2209,7 +2208,8 @@ inline primitive FindOrCreateReorder(const memory* from, const memory* to) { // utility function to determine if it is conv 1x1 and stride != 1 // for purpose of temporarily disabling primitive reuse -inline bool IsConv1x1StrideNot1(memory::dims filter_dims, memory::dims strides) { +inline bool IsConv1x1StrideNot1(memory::dims filter_dims, + memory::dims strides) { if (filter_dims.size() != 4 || strides.size() != 2) return false; return ((filter_dims[2] == 1) && (filter_dims[3] == 1) && diff --git a/tensorflow/core/util/tensor_bundle/BUILD b/tensorflow/core/util/tensor_bundle/BUILD index 4d4db86df2..f40ec9b752 100644 --- a/tensorflow/core/util/tensor_bundle/BUILD +++ b/tensorflow/core/util/tensor_bundle/BUILD @@ -65,6 +65,10 @@ tf_cc_test( name = "tensor_bundle_test", srcs = ["tensor_bundle_test.cc"], data = glob(["testdata/**"]), + tags = [ + "nomsan", + "notsan", + ], deps = [ ":tensor_bundle", "//tensorflow/core:framework", |