[CMake] TF's .so is missing absl symbols

Add dependencies to avoid:

(gst-plugin-scanner:29481): GStreamer-WARNING **: Failed to load plugin '/home/abuild/rpmbuild/BUILD/nnstreamer-0.2.1/build/ext/nnstreamer/tensor_filter/libnnstreamer_filter_tensorflow.so': /lib64/libpywrap_tensorflow_internal.so: undefined symbol: _ZN4absl16variant_internal21ThrowBadVariantAccessEv

Change-Id: Ic1b1fe2ac58537678a6a0c317441497a73423acd
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>

diff --git a/tensorflow/contrib/cmake/external/abseil_cpp.cmake b/tensorflow/contrib/cmake/external/abseil_cpp.cmake
index a7859c142efeb9e0b746b92a9cdfc3784a1af8ed..63869a96b0ae9abd05734da07d5fd67f957822f2 100644 (file)
--- a/tensorflow/contrib/cmake/external/abseil_cpp.cmake
+++ b/tensorflow/contrib/cmake/external/abseil_cpp.cmake
@@ -61,7 +61,8 @@ else (systemlib_ABSEIL_CPP)
           ${abseil_cpp_BUILD}/absl/numeric/absl_int128.lib
           ${abseil_cpp_BUILD}/absl/strings/absl_strings.lib
           ${abseil_cpp_BUILD}/absl/strings/str_format_internal.lib
-          ${abseil_cpp_BUILD}/absl/types/absl_bad_optional_access.lib)
+          ${abseil_cpp_BUILD}/absl/types/absl_bad_optional_access.lib
+          ${abseil_cpp_BUILD}/absl/types/libabsl_variant.lib)
     endif()
   else()
     set(abseil_cpp_STATIC_LIBRARIES
@@ -76,7 +77,8 @@ else (systemlib_ABSEIL_CPP)
         ${abseil_cpp_BUILD}/absl/hash/libabsl_hash.a
         ${abseil_cpp_BUILD}/absl/hash/libabsl_internal_city.a
         ${abseil_cpp_BUILD}/absl/container/libabsl_container.a
-        ${abseil_cpp_BUILD}/absl/types/libabsl_bad_optional_access.a)
+        ${abseil_cpp_BUILD}/absl/types/libabsl_bad_optional_access.a
+        ${abseil_cpp_BUILD}/absl/types/libabsl_variant.a)
   endif()
 # libabsl_hash.a added to avoid undefined reference to `absl::hash_internal::CityHash64(char const*, unsigned long)'
 # libabsl_container.a added to avoid undefined reference to `absl::container_internal::ShouldInsertBackwards(unsigned long, signed char*)'

diff --git a/tensorflow/contrib/cmake/tf_shared_lib.cmake b/tensorflow/contrib/cmake/tf_shared_lib.cmake
index c520ce4115017325cb433fcfc3cb1990f7efc7e4..87c8ba0e2a59b1a2407cfaf3b22dcf34f4ccbbd8 100644 (file)
--- a/tensorflow/contrib/cmake/tf_shared_lib.cmake
+++ b/tensorflow/contrib/cmake/tf_shared_lib.cmake
@@ -91,7 +91,6 @@ target_link_libraries(tensorflow PRIVATE
     ${tf_core_gpu_kernels_lib}
     ${tensorflow_EXTERNAL_LIBRARIES}
     tf_protos_cc
-    absl::hash
 )
 
 # There is a bug in GCC 5 resulting in undefined reference to a __cpu_model function when