|
| 1 | +diff --git a/tensorflow/contrib/lite/kernels/internal/BUILD b/tensorflow/contrib/lite/kernels/internal/BUILD |
| 2 | +index 0a5223b..b7d8806 100644 |
| 3 | +--- a/tensorflow/contrib/lite/kernels/internal/BUILD |
| 4 | ++++ b/tensorflow/contrib/lite/kernels/internal/BUILD |
| 5 | +@@ -21,7 +21,6 @@ HARD_FP_FLAGS_IF_APPLICABLE = select({ |
| 6 | + NEON_FLAGS_IF_APPLICABLE = select({ |
| 7 | + ":arm": [ |
| 8 | + "-O3", |
| 9 | +- "-mfpu=neon", |
| 10 | + ], |
| 11 | + ":armeabi-v7a": [ |
| 12 | + "-O3", |
| 13 | +diff --git a/tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_uint8.h b/tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_uint8.h |
| 14 | +index 3fd00c8..6eea465 100644 |
| 15 | +--- a/tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_uint8.h |
| 16 | ++++ b/tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_uint8.h |
| 17 | +@@ -1699,7 +1699,7 @@ inline void DepthwiseConv(const uint8* input_data, const Dims<4>& input_dims, |
| 18 | + |
| 19 | + // Enable for arm64 except for the Nvidia Linux 4 Tegra (L4T) running on |
| 20 | + // Jetson TX-2. This compiler does not support the offsetof() macro. |
| 21 | +-#if defined(__aarch64__) && !defined(GOOGLE_L4T) |
| 22 | ++#if !defined(__aarch64__) && defined(GOOGLE_L4T) |
| 23 | + // Call kernel optimized for depthwise convolutions using 3x3 filters if |
| 24 | + // parameters are supported. |
| 25 | + if (Fast3x3FilterKernelSupported( |
| 26 | +diff --git a/tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_uint8_3x3_filter.h b/tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_uint8_3x3_filter.h |
| 27 | +index 8cd7223..9461ef5 100644 |
| 28 | +--- a/tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_uint8_3x3_filter.h |
| 29 | ++++ b/tensorflow/contrib/lite/kernels/internal/optimized/depthwiseconv_uint8_3x3_filter.h |
| 30 | +@@ -25,7 +25,7 @@ namespace optimized_ops { |
| 31 | + |
| 32 | + // Enable for arm64 except for the Nvidia Linux 4 Tegra (L4T) running on |
| 33 | + // Jetson TX-2. This compiler does not support the offsetof() macro. |
| 34 | +-#if defined(__aarch64__) && !defined(GOOGLE_L4T) |
| 35 | ++#if defined(__aarch64__) && defined(GOOGLE_L4T) |
| 36 | + |
| 37 | + // clang-format gets confused with this file and ends up formatting lines to |
| 38 | + // be larger than 80 characters. Turn off here and back on at the end of the |
0 commit comments