Update eigen header locations for TF 2.16 (#2863)

tensorflow · Apr 15, 2024 · d208d75 · d208d75
1 parent 3380b3c
commit d208d75
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 0 deletions.
diff --git a/tensorflow_addons/custom_ops/image/cc/kernels/adjust_hsv_in_yiq_op.h b/tensorflow_addons/custom_ops/image/cc/kernels/adjust_hsv_in_yiq_op.h
@@ -23,8 +23,14 @@ limitations under the License.
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/register_types.h"
 #include "tensorflow/core/framework/types.h"
+#include "tensorflow/core/public/version.h"
+#if TF_MAJOR_VERSION == 2 && TF_MINOR_VERSION >= 16
+#include "Eigen/Core"
+#include "unsupported/Eigen/CXX11/Tensor"
+#else
 #include "third_party/eigen3/Eigen/Core"
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#endif
 
 namespace tensorflow {
 namespace addons {

diff --git a/tensorflow_addons/custom_ops/image/cc/kernels/connected_components.h b/tensorflow_addons/custom_ops/image/cc/kernels/connected_components.h
@@ -26,8 +26,13 @@ limitations under the License.
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/tensor_types.h"
 #include "tensorflow/core/platform/types.h"
+#include "tensorflow/core/public/version.h"
 #include "tensorflow/core/util/work_sharder.h"
+#if TF_MAJOR_VERSION == 2 && TF_MINOR_VERSION >= 16
+#include "unsupported/Eigen/CXX11/Tensor"
+#else
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#endif
 
 namespace tensorflow {
 namespace addons {

diff --git a/tensorflow_addons/custom_ops/image/cc/kernels/euclidean_distance_transform_op.h b/tensorflow_addons/custom_ops/image/cc/kernels/euclidean_distance_transform_op.h
@@ -21,7 +21,12 @@ limitations under the License.
 #include "tensorflow/core/framework/op_kernel.h"
 #include "tensorflow/core/framework/tensor_types.h"
 #include "tensorflow/core/platform/types.h"
+#include "tensorflow/core/public/version.h"
+#if TF_MAJOR_VERSION == 2 && TF_MINOR_VERSION >= 16
+#include "unsupported/Eigen/CXX11/Tensor"
+#else
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#endif
 
 namespace tensorflow {
 namespace addons {

diff --git a/tensorflow_addons/custom_ops/seq2seq/cc/kernels/beam_search_ops.cc b/tensorflow_addons/custom_ops/seq2seq/cc/kernels/beam_search_ops.cc
@@ -32,8 +32,13 @@ limitations under the License.
 #include "tensorflow/core/framework/types.h"
 #include "tensorflow/core/platform/logging.h"
 #include "tensorflow/core/platform/macros.h"
+#include "tensorflow/core/public/version.h"
 #include "tensorflow/core/util/work_sharder.h"
+#if TF_MAJOR_VERSION == 2 && TF_MINOR_VERSION >= 16
+#include "unsupported/Eigen/CXX11/Tensor"
+#else
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#endif
 
 namespace tensorflow {
 namespace addons {

diff --git a/tensorflow_addons/custom_ops/seq2seq/cc/kernels/beam_search_ops.h b/tensorflow_addons/custom_ops/seq2seq/cc/kernels/beam_search_ops.h
@@ -18,7 +18,12 @@ limitations under the License.
 
 #include "tensorflow/core/framework/tensor_types.h"
 #include "tensorflow/core/platform/types.h"
+#include "tensorflow/core/public/version.h"
+#if TF_MAJOR_VERSION == 2 && TF_MINOR_VERSION >= 16
+#include "unsupported/Eigen/CXX11/Tensor"
+#else
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
+#endif
 
 namespace tensorflow {
 class OpKernelContext;