From da1f98a3781e0c3c2df6bd3e59e6ee9d6286aa66 Mon Sep 17 00:00:00 2001
From: Jared Duke <jdduke@google.com>
Date: Wed, 7 Nov 2018 10:21:14 -0800
Subject: [PATCH] Add AvgPool3d/Conv3D/MaxPool3D to TFMobile ops list

PiperOrigin-RevId: 220485157
---
 tensorflow/contrib/makefile/tf_op_files.txt         | 2 ++
 tensorflow/core/kernels/BUILD                       | 5 +++++
 tensorflow/lite/toco/tflite/whitelisted_flex_ops.cc | 3 +++
 3 files changed, 10 insertions(+)

diff --git a/tensorflow/contrib/makefile/tf_op_files.txt b/tensorflow/contrib/makefile/tf_op_files.txt
index 24a4a03f232..e779eff6890 100644
--- a/tensorflow/contrib/makefile/tf_op_files.txt
+++ b/tensorflow/contrib/makefile/tf_op_files.txt
@@ -42,6 +42,7 @@ tensorflow/core/kernels/conv_grad_filter_ops.cc
 tensorflow/core/kernels/conv_grad_input_ops.cc
 tensorflow/core/kernels/conv_grad_ops.cc
 tensorflow/core/kernels/conv_ops.cc
+tensorflow/core/kernels/conv_ops_3d.cc
 tensorflow/core/kernels/conv_ops_fused.cc
 tensorflow/core/kernels/conv_ops_using_gemm.cc
 tensorflow/core/kernels/crop_and_resize_op.cc
@@ -163,6 +164,7 @@ tensorflow/core/kernels/pack_op.cc
 tensorflow/core/kernels/pad_op.cc
 tensorflow/core/kernels/padding_fifo_queue.cc
 tensorflow/core/kernels/padding_fifo_queue_op.cc
+tensorflow/core/kernels/pooling_ops_3d.cc
 tensorflow/core/kernels/pooling_ops_common.cc
 tensorflow/core/kernels/population_count_op.cc
 tensorflow/core/kernels/quantization_utils.cc
diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD
index be448ed3db1..b855fe5436b 100644
--- a/tensorflow/core/kernels/BUILD
+++ b/tensorflow/core/kernels/BUILD
@@ -5314,7 +5314,9 @@ filegroup(
         "batch_norm_op.h",
         "control_flow_ops.h",
         "conv_2d.h",
+        "conv_3d.h",
         "conv_ops.h",
+        "conv_ops_gpu.h",
         "data_format_ops.h",
         "depthtospace_op.h",
         "depthwise_conv_op.h",
@@ -5333,6 +5335,7 @@ filegroup(
         "mirror_pad_op.h",
         "mirror_pad_op_cpu_impl.h",
         "pad_op.h",
+        "pooling_ops_3d.h",
         "random_op.h",
         "reduction_ops.h",
         "reduction_ops_common.h",
@@ -5380,6 +5383,7 @@ filegroup(
         "conv_grad_ops.cc",
         "conv_grad_ops.h",
         "conv_ops.cc",
+        "conv_ops_3d.cc",
         "conv_ops_fused.cc",
         "conv_ops_using_gemm.cc",
         "crop_and_resize_op.cc",
@@ -5490,6 +5494,7 @@ filegroup(
         "pad_op.cc",
         "padding_fifo_queue.cc",
         "padding_fifo_queue_op.cc",
+        "pooling_ops_3d.cc",
         "queue_base.cc",
         "queue_op.cc",
         "queue_ops.cc",
diff --git a/tensorflow/lite/toco/tflite/whitelisted_flex_ops.cc b/tensorflow/lite/toco/tflite/whitelisted_flex_ops.cc
index 221e9b8e34e..d251589b483 100644
--- a/tensorflow/lite/toco/tflite/whitelisted_flex_ops.cc
+++ b/tensorflow/lite/toco/tflite/whitelisted_flex_ops.cc
@@ -55,6 +55,7 @@ bool IsWhitelistedFlexOp(const std::string& tensorflow_op_name) {
           "AssignSub",
           "AudioSpectrogram",
           "AvgPool",
+          "AvgPool3D",
           "AvgPoolGrad",
           "BatchMatMul",
           "BatchNormWithGlobalNormalization",
@@ -78,6 +79,7 @@ bool IsWhitelistedFlexOp(const std::string& tensorflow_op_name) {
           "Conv2D",
           "Conv2DBackpropFilter",
           "Conv2DBackpropInput",
+          "Conv3D",
           "Cos",
           "Cosh",
           "CropAndResize",
@@ -168,6 +170,7 @@ bool IsWhitelistedFlexOp(const std::string& tensorflow_op_name) {
           "Max",
           "Maximum",
           "MaxPool",
+          "MaxPool3D",
           "MaxPoolGrad",
           "MaxPoolGradGrad",
           "MaxPoolGradGradV2",