Skip to content

Commit

Permalink
Update TF to v2.2.0-rc1, drop SYSTEM_PROTOBUF option (no effect)
Browse files Browse the repository at this point in the history
  • Loading branch information
FloopCZ committed Mar 21, 2020
1 parent e9ec45c commit c1520a0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 21 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tensorflow_cc
[![Build Status](http://ash.floop.cz:8080/buildStatus/icon?job=tensorflow_cc)](http://ash.floop.cz:8080/job/tensorflow_cc/)
[![TF version](https://img.shields.io/badge/TF%20version-2.2.0%20rc0-brightgreen.svg)]()
[![TF version](https://img.shields.io/badge/TF%20version-2.2.0%20rc1-brightgreen.svg)]()

This repository makes possible the usage of the [TensorFlow C++](https://www.tensorflow.org/api_docs/cc/) API from the outside of the TensorFlow source code folders and without the use of the [Bazel](https://bazel.build/) build system.

Expand Down
22 changes: 2 additions & 20 deletions tensorflow_cc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ project(
# If enabled, bazel has to be installed.
option(ALLOW_CUDA "Try to find and use CUDA." ON)
option(REQUIRE_CUDA "Make sure to find and use CUDA (implies ALLOW_CUDA)." OFF)
set(TENSORFLOW_TAG "v2.2.0-rc0" CACHE STRING "The tensorflow release tag to be checked out (default v2.2.0-rc0).")
# TODO use ${version} when not -rc0
option(SYSTEM_PROTOBUF "Use system protobuf instead of static protobuf from contrib/makefile." OFF)
set(TENSORFLOW_TAG "v2.2.0-rc1" CACHE STRING "The tensorflow release tag to be checked out (default v2.2.0-rc1).")
# TODO use ${version} when not -rc1
set(TARGET_CXX_STANDARD "cxx_std_11" CACHE STRING "C++ standard to be enforced when linking to TensorflowCC targets (e.g., cxx_std_11).")

# -------------
Expand All @@ -35,13 +34,6 @@ configure_file("cmake/build_tensorflow.sh.in" "build_tensorflow.sh" @ONLY)

include(TensorflowBase)

# ----------------------------------
# Define Shared Tensorflow Interface
# ----------------------------------
if(SYSTEM_PROTOBUF)
find_package(Protobuf REQUIRED)
endif()

# ------------------------------
# Define Tensorflow_CC Interface
# ------------------------------
Expand All @@ -59,16 +51,6 @@ target_link_libraries(
"${CMAKE_INSTALL_PREFIX}/lib/libtensorflow_cc.so.${PROJECT_VERSION_MAJOR}"
dl pthread
)
if(SYSTEM_PROTOBUF)
target_include_directories(
tensorflow_cc INTERFACE
"${Protobuf_INCLUDE_DIRS}"
)
target_link_libraries(
tensorflow_cc INTERFACE
"${Protobuf_LIBRARIES}"
)
endif()

# ----------------------------------------
# Configure CMake Config and Version Files
Expand Down

0 comments on commit c1520a0

Please sign in to comment.