From cbe9574188eb6c6162255ab4054cb98855b73c2a Mon Sep 17 00:00:00 2001 From: MyungJoo Ham Date: Wed, 26 Jun 2019 18:17:17 +0900 Subject: [PATCH] WIP: ABSL Error and Array_ops Error Fixed Change-Id: I0e94da6128d841ca9c86cbbf264006cc2cb7035f Signed-off-by: MyungJoo Ham --- tensorflow/contrib/cmake/external/abseil_cpp.cmake | 6 ++++++ tensorflow/contrib/cmake/tf_core_cpu.cmake | 2 +- tensorflow/contrib/cmake/tf_python.cmake | 2 -- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tensorflow/contrib/cmake/external/abseil_cpp.cmake b/tensorflow/contrib/cmake/external/abseil_cpp.cmake index 1cb5da356a..a7859c142e 100644 --- a/tensorflow/contrib/cmake/external/abseil_cpp.cmake +++ b/tensorflow/contrib/cmake/external/abseil_cpp.cmake @@ -73,8 +73,14 @@ else (systemlib_ABSEIL_CPP) ${abseil_cpp_BUILD}/absl/numeric/libabsl_int128.a ${abseil_cpp_BUILD}/absl/strings/libabsl_strings.a ${abseil_cpp_BUILD}/absl/strings/libabsl_internal_str_format_internal.a + ${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) 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*)' +# libabsl_internal_city.c added to avoid undefined reference to `absl::hash_internal::CityHash64(char const*, unsigned long)' ExternalProject_Add(abseil_cpp PREFIX abseil_cpp diff --git a/tensorflow/contrib/cmake/tf_core_cpu.cmake b/tensorflow/contrib/cmake/tf_core_cpu.cmake index d8884d464f..47dd3dddd0 100644 --- a/tensorflow/contrib/cmake/tf_core_cpu.cmake +++ b/tensorflow/contrib/cmake/tf_core_cpu.cmake @@ -92,4 +92,4 @@ if (tensorflow_ENABLE_GPU) endif() add_library(tf_core_cpu OBJECT ${tf_core_cpu_srcs}) -add_dependencies(tf_core_cpu tf_core_framework) +add_dependencies(tf_core_cpu tf_core_framework tf_array_ops create_cc_ops_header_dir array_ops_gen_cc) diff --git a/tensorflow/contrib/cmake/tf_python.cmake b/tensorflow/contrib/cmake/tf_python.cmake index ad86d6aef3..8faccf8d55 100755 --- a/tensorflow/contrib/cmake/tf_python.cmake +++ b/tensorflow/contrib/cmake/tf_python.cmake @@ -365,8 +365,6 @@ GENERATE_PYTHON_OP_LIB("user_ops") GENERATE_PYTHON_OP_LIB("training_ops" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/python/training/gen_training_ops.py) GENERATE_PYTHON_OP_LIB("word2vec_ops") -target_link_libraries(word2vec_ops_gen_python PRIVATE ${abseil_cpp_STATIC_LIBRARIES}) -add_dependencies(word2vec_ops_gen_python abseil_cpp) GENERATE_PYTHON_OP_LIB("contrib_boosted_trees_model_ops" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/boosted_trees/python/ops/gen_model_ops.py) -- 2.34.1