aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/contrib/android
diff options
context:
space:
mode:
authorGravatar A. Unique TensorFlower <gardener@tensorflow.org>2017-08-17 14:56:25 -0700
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2017-08-17 15:03:24 -0700
commitb48cfaea2aea3707a33e60c10385a87e37101b95 (patch)
tree897738a42d520918efcc9bbece881c5c2fcce583 /tensorflow/contrib/android
parentd30537a10529a73b712d805a1f26fd39ce5be609 (diff)
Make tensorflow::mutex implement a shared (reader/writer) lock, using
open source nsync library. PiperOrigin-RevId: 165633487
Diffstat (limited to 'tensorflow/contrib/android')
-rw-r--r--tensorflow/contrib/android/cmake/CMakeLists.txt9
1 files changed, 8 insertions, 1 deletions
diff --git a/tensorflow/contrib/android/cmake/CMakeLists.txt b/tensorflow/contrib/android/cmake/CMakeLists.txt
index 5ae1a209b9..1f86288cf9 100644
--- a/tensorflow/contrib/android/cmake/CMakeLists.txt
+++ b/tensorflow/contrib/android/cmake/CMakeLists.txt
@@ -26,6 +26,10 @@ add_library(lib_proto STATIC IMPORTED )
set_target_properties(lib_proto PROPERTIES IMPORTED_LOCATION
${PREBUILT_DIR}/protobuf/lib/libprotobuf.a)
+add_library(lib_nsync STATIC IMPORTED )
+set_target_properties(lib_nsync PROPERTIES IMPORTED_LOCATION
+ ${TARGET_NSYNC_LIB})
+
add_library(lib_tf STATIC IMPORTED )
set_target_properties(lib_tf PROPERTIES IMPORTED_LOCATION
${PREBUILT_DIR}/lib/libtensorflow-core.a)
@@ -62,10 +66,13 @@ target_link_libraries(tensorflow_inference
m
z
lib_tf
- lib_proto)
+ lib_proto
+ lib_nsync)
+
include_directories(
${PREBUILT_DIR}/proto
${PREBUILT_DIR}/protobuf/include
+ ${PREBUILT_DIR}/nsync/public
${TENSORFLOW_ROOT_DIR}/tensorflow/contrib/makefile/downloads/eigen
${TENSORFLOW_ROOT_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/..)