experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup eigen_contraction_kernel includes

Browse Source 
PiperOrigin-RevId: 243176924
This commit is contained in:
Eugene Zhulenev 2019-04-11 17:38:46 -07:00 committed by TensorFlower Gardener
parent cbd0dd8164
commit 4fc3d561ed
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tensorflow/core/kernels/BUILD
View File

@ -778,7 +778,6 @@ cc_library(
srcs = ["fused_eigen_output_kernels.cc"], srcs = ["fused_eigen_output_kernels.cc"],
hdrs = ["fused_eigen_output_kernels.h"], hdrs = ["fused_eigen_output_kernels.h"],
deps = [ deps = [
":eigen_contraction_kernel",
"//tensorflow/core:framework", "//tensorflow/core:framework",
"//third_party/eigen3", "//third_party/eigen3",
"@com_google_absl//absl/strings", "@com_google_absl//absl/strings",

1
tensorflow/core/kernels/conv_ops_fused_impl.h
View File

@ -51,7 +51,6 @@ limitations under the License.
#include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/framework/tensor_shape.h"
#include "tensorflow/core/kernels/conv_2d.h" #include "tensorflow/core/kernels/conv_2d.h"
#include "tensorflow/core/kernels/conv_ops.h" #include "tensorflow/core/kernels/conv_ops.h"
#include "tensorflow/core/kernels/eigen_contraction_kernel.h"
#include "tensorflow/core/kernels/fused_eigen_output_kernels.h" #include "tensorflow/core/kernels/fused_eigen_output_kernels.h"
#include "tensorflow/core/kernels/ops_util.h" #include "tensorflow/core/kernels/ops_util.h"
#include "tensorflow/core/util/tensor_format.h" #include "tensorflow/core/util/tensor_format.h"

6
tensorflow/core/kernels/fused_eigen_output_kernels.h
View File

@ -26,17 +26,13 @@ limitations under the License.
#ifndef TENSORFLOW_CORE_KERNELS_FUSED_EIGEN_OUTPUT_KERNELS_H_ #ifndef TENSORFLOW_CORE_KERNELS_FUSED_EIGEN_OUTPUT_KERNELS_H_
#define TENSORFLOW_CORE_KERNELS_FUSED_EIGEN_OUTPUT_KERNELS_H_ #define TENSORFLOW_CORE_KERNELS_FUSED_EIGEN_OUTPUT_KERNELS_H_
#include "third_party/eigen3/Eigen/Core" #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
#include "tensorflow/core/framework/op_kernel.h" #include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/tensor.h" #include "tensorflow/core/framework/tensor.h"
#include "tensorflow/core/framework/tensor_types.h" #include "tensorflow/core/framework/tensor_types.h"
#include "tensorflow/core/kernels/eigen_contraction_kernel.h"
namespace tensorflow { namespace tensorflow {
typedef Eigen::ThreadPoolDevice CPUDevice;
typedef Eigen::GpuDevice GPUDevice;
enum class FusedComputationType { enum class FusedComputationType {
kUndefined, kUndefined,
kBiasAdd, kBiasAdd,

6
tensorflow/core/kernels/matmul_op_fused.cc
View File

@ -36,15 +36,17 @@ limitations under the License.
#include "tensorflow/core/framework/register_types.h" #include "tensorflow/core/framework/register_types.h"
#include "tensorflow/core/framework/tensor.h" #include "tensorflow/core/framework/tensor.h"
#include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/framework/tensor_shape.h"
#include "tensorflow/core/kernels/eigen_contraction_kernel.h"
#include "tensorflow/core/kernels/fill_functor.h" #include "tensorflow/core/kernels/fill_functor.h"
#include "tensorflow/core/kernels/fused_eigen_output_kernels.h" #include "tensorflow/core/kernels/fused_eigen_output_kernels.h"
#include "tensorflow/core/util/tensor_format.h" #include "tensorflow/core/util/tensor_format.h"
#if defined(TENSORFLOW_USE_CUSTOM_CONTRACTION_KERNEL)
#include "tensorflow/core/kernels/eigen_contraction_kernel.h"
#endif
namespace tensorflow { namespace tensorflow {
typedef Eigen::ThreadPoolDevice CPUDevice; typedef Eigen::ThreadPoolDevice CPUDevice;
typedef Eigen::GpuDevice GPUDevice;
template <typename Device, typename T> template <typename Device, typename T>
struct LaunchFusedMatMulOp { struct LaunchFusedMatMulOp {