From 31c53f9418c6dc13d89a78da4ada42d8c378a0ca Mon Sep 17 00:00:00 2001 From: Liu Yiqun Date: Thu, 12 Oct 2017 11:16:17 +0000 Subject: [PATCH 1/5] Remove unused cmake files and statements. --- cmake/FindGflags.cmake | 582 ---------------------------- cmake/FindGlog.cmake | 24 -- cmake/external/glog.cmake | 1 - paddle/framework/lod_tensor.cc | 2 - paddle/framework/lod_tensor.h | 1 - paddle/framework/lod_tensor_test.cu | 1 + paddle/framework/tensor_array.cc | 1 - paddle/operators/cond_op.h | 1 - paddle/operators/lstm_unit_op.h | 1 - paddle/platform/CMakeLists.txt | 4 +- 10 files changed, 3 insertions(+), 615 deletions(-) delete mode 100644 cmake/FindGflags.cmake delete mode 100644 cmake/FindGlog.cmake diff --git a/cmake/FindGflags.cmake b/cmake/FindGflags.cmake deleted file mode 100644 index 6587089ba382d..0000000000000 --- a/cmake/FindGflags.cmake +++ /dev/null @@ -1,582 +0,0 @@ -# Ceres Solver - A fast non-linear least squares minimizer -# Copyright 2015 Google Inc. All rights reserved. -# http://ceres-solver.org/ -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# * Neither the name of Google Inc. nor the names of its contributors may be -# used to endorse or promote products derived from this software without -# specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -# Author: alexs.mac@gmail.com (Alex Stewart) -# - -# FindGflags.cmake - Find Google gflags logging library. -# -# This module will attempt to find gflags, either via an exported CMake -# configuration (generated by gflags >= 2.1 which are built with CMake), or -# by performing a standard search for all gflags components. The order of -# precedence for these two methods of finding gflags is controlled by: -# GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION. -# -# This module defines the following variables: -# -# GFLAGS_FOUND: TRUE iff gflags is found. -# GFLAGS_INCLUDE_DIRS: Include directories for gflags. -# GFLAGS_LIBRARIES: Libraries required to link gflags. -# GFLAGS_NAMESPACE: The namespace in which gflags is defined. In versions of -# gflags < 2.1, this was google, for versions >= 2.1 it is -# by default gflags, although can be configured when building -# gflags to be something else (i.e. google for legacy -# compatibility). -# -# The following variables control the behaviour of this module when an exported -# gflags CMake configuration is not found. -# -# GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION: TRUE/FALSE, iff TRUE then -# then prefer using an exported CMake configuration -# generated by gflags >= 2.1 over searching for the -# gflags components manually. Otherwise (FALSE) -# ignore any exported gflags CMake configurations and -# always perform a manual search for the components. -# Default: TRUE iff user does not define this variable -# before we are called, and does NOT specify either -# GFLAGS_INCLUDE_DIR_HINTS or GFLAGS_LIBRARY_DIR_HINTS -# otherwise FALSE. -# GFLAGS_INCLUDE_DIR_HINTS: List of additional directories in which to -# search for gflags includes, e.g: /timbuktu/include. -# GFLAGS_LIBRARY_DIR_HINTS: List of additional directories in which to -# search for gflags libraries, e.g: /timbuktu/lib. -# -# The following variables are also defined by this module, but in line with -# CMake recommended FindPackage() module style should NOT be referenced directly -# by callers (use the plural variables detailed above instead). These variables -# do however affect the behaviour of the module via FIND_[PATH/LIBRARY]() which -# are NOT re-called (i.e. search for library is not repeated) if these variables -# are set with valid values _in the CMake cache_. This means that if these -# variables are set directly in the cache, either by the user in the CMake GUI, -# or by the user passing -DVAR=VALUE directives to CMake when called (which -# explicitly defines a cache variable), then they will be used verbatim, -# bypassing the HINTS variables and other hard-coded search locations. -# -# GFLAGS_INCLUDE_DIR: Include directory for gflags, not including the -# include directory of any dependencies. -# GFLAGS_LIBRARY: gflags library, not including the libraries of any -# dependencies. - -# Reset CALLERS_CMAKE_FIND_LIBRARY_PREFIXES to its value when FindGflags was -# invoked, necessary for MSVC. -macro(GFLAGS_RESET_FIND_LIBRARY_PREFIX) - if (MSVC) - set(CMAKE_FIND_LIBRARY_PREFIXES "${CALLERS_CMAKE_FIND_LIBRARY_PREFIXES}") - endif (MSVC) -endmacro(GFLAGS_RESET_FIND_LIBRARY_PREFIX) - -# Called if we failed to find gflags or any of it's required dependencies, -# unsets all public (designed to be used externally) variables and reports -# error message at priority depending upon [REQUIRED/QUIET/] argument. -macro(GFLAGS_REPORT_NOT_FOUND REASON_MSG) - unset(GFLAGS_FOUND) - unset(GFLAGS_INCLUDE_DIRS) - unset(GFLAGS_LIBRARIES) - # Do not use unset, as we want to keep GFLAGS_NAMESPACE in the cache, - # but simply clear its value. - set(GFLAGS_NAMESPACE "" CACHE STRING - "gflags namespace (google or gflags)" FORCE) - - # Make results of search visible in the CMake GUI if gflags has not - # been found so that user does not have to toggle to advanced view. - mark_as_advanced(CLEAR GFLAGS_INCLUDE_DIR - GFLAGS_LIBRARY - GFLAGS_NAMESPACE) - - gflags_reset_find_library_prefix() - - # Note _FIND_[REQUIRED/QUIETLY] variables defined by FindPackage() - # use the camelcase library name, not uppercase. - if (Gflags_FIND_QUIETLY) - message(STATUS "Failed to find gflags - " ${REASON_MSG} ${ARGN}) - elseif (Gflags_FIND_REQUIRED) - message(FATAL_ERROR "Failed to find gflags - " ${REASON_MSG} ${ARGN}) - else() - # Neither QUIETLY nor REQUIRED, use no priority which emits a message - # but continues configuration and allows generation. - message("-- Failed to find gflags - " ${REASON_MSG} ${ARGN}) - endif () - return() -endmacro(GFLAGS_REPORT_NOT_FOUND) - -# Verify that all variable names passed as arguments are defined (can be empty -# but must be defined) or raise a fatal error. -macro(GFLAGS_CHECK_VARS_DEFINED) - foreach(CHECK_VAR ${ARGN}) - if (NOT DEFINED ${CHECK_VAR}) - message(FATAL_ERROR "Ceres Bug: ${CHECK_VAR} is not defined.") - endif() - endforeach() -endmacro(GFLAGS_CHECK_VARS_DEFINED) - -# Use check_cxx_source_compiles() to compile trivial test programs to determine -# the gflags namespace. This works on all OSs except Windows. If using Visual -# Studio, it fails because msbuild forces check_cxx_source_compiles() to use -# CMAKE_BUILD_TYPE=Debug for the test project, which usually breaks detection -# because MSVC requires that the test project use the same build type as gflags, -# which would normally be built in Release. -# -# Defines: GFLAGS_NAMESPACE in the caller's scope with the detected namespace, -# which is blank (empty string, will test FALSE is CMake conditionals) -# if detection failed. -function(GFLAGS_CHECK_GFLAGS_NAMESPACE_USING_TRY_COMPILE) - # Verify that all required variables are defined. - gflags_check_vars_defined( - GFLAGS_INCLUDE_DIR GFLAGS_LIBRARY) - # Ensure that GFLAGS_NAMESPACE is always unset on completion unless - # we explicitly set if after having the correct namespace. - set(GFLAGS_NAMESPACE "" PARENT_SCOPE) - - include(CheckCXXSourceCompiles) - # Setup include path & link library for gflags for CHECK_CXX_SOURCE_COMPILES. - set(CMAKE_REQUIRED_INCLUDES ${GFLAGS_INCLUDE_DIR}) - set(CMAKE_REQUIRED_LIBRARIES ${GFLAGS_LIBRARY} ${GFLAGS_LINK_LIBRARIES}) - # First try the (older) google namespace. Note that the output variable - # MUST be unique to the build type as otherwise the test is not repeated as - # it is assumed to have already been performed. - check_cxx_source_compiles( - "#include - int main(int argc, char * argv[]) { - google::ParseCommandLineFlags(&argc, &argv, true); - return 0; - }" - GFLAGS_IN_GOOGLE_NAMESPACE) - if (GFLAGS_IN_GOOGLE_NAMESPACE) - set(GFLAGS_NAMESPACE google PARENT_SCOPE) - return() - endif() - - # Try (newer) gflags namespace instead. Note that the output variable - # MUST be unique to the build type as otherwise the test is not repeated as - # it is assumed to have already been performed. - set(CMAKE_REQUIRED_INCLUDES ${GFLAGS_INCLUDE_DIR}) - set(CMAKE_REQUIRED_LIBRARIES ${GFLAGS_LIBRARY} ${GFLAGS_LINK_LIBRARIES}) - check_cxx_source_compiles( - "#include - int main(int argc, char * argv[]) { - gflags::ParseCommandLineFlags(&argc, &argv, true); - return 0; - }" - GFLAGS_IN_GFLAGS_NAMESPACE) - if (GFLAGS_IN_GFLAGS_NAMESPACE) - set(GFLAGS_NAMESPACE gflags PARENT_SCOPE) - return() - endif (GFLAGS_IN_GFLAGS_NAMESPACE) -endfunction(GFLAGS_CHECK_GFLAGS_NAMESPACE_USING_TRY_COMPILE) - -# Use regex on the gflags headers to attempt to determine the gflags namespace. -# Checks both gflags.h (contained namespace on versions < 2.1.2) and -# gflags_declare.h, which contains the namespace on versions >= 2.1.2. -# In general, this method should only be used when -# GFLAGS_CHECK_GFLAGS_NAMESPACE_USING_TRY_COMPILE() cannot be used, or has -# failed. -# -# Defines: GFLAGS_NAMESPACE in the caller's scope with the detected namespace, -# which is blank (empty string, will test FALSE is CMake conditionals) -# if detection failed. -function(GFLAGS_CHECK_GFLAGS_NAMESPACE_USING_REGEX) - # Verify that all required variables are defined. - gflags_check_vars_defined(GFLAGS_INCLUDE_DIR) - # Ensure that GFLAGS_NAMESPACE is always undefined on completion unless - # we explicitly set if after having the correct namespace. - set(GFLAGS_NAMESPACE "" PARENT_SCOPE) - - # Scan gflags.h to identify what namespace gflags was built with. On - # versions of gflags < 2.1.2, gflags.h was configured with the namespace - # directly, on >= 2.1.2, gflags.h uses the GFLAGS_NAMESPACE #define which - # is defined in gflags_declare.h, we try each location in turn. - set(GFLAGS_HEADER_FILE ${GFLAGS_INCLUDE_DIR}/gflags/gflags.h) - if (NOT EXISTS ${GFLAGS_HEADER_FILE}) - gflags_report_not_found( - "Could not find file: ${GFLAGS_HEADER_FILE} " - "containing namespace information in gflags install located at: " - "${GFLAGS_INCLUDE_DIR}.") - endif() - file(READ ${GFLAGS_HEADER_FILE} GFLAGS_HEADER_FILE_CONTENTS) - - string(REGEX MATCH "namespace [A-Za-z]+" - GFLAGS_NAMESPACE "${GFLAGS_HEADER_FILE_CONTENTS}") - string(REGEX REPLACE "namespace ([A-Za-z]+)" "\\1" - GFLAGS_NAMESPACE "${GFLAGS_NAMESPACE}") - - if (NOT GFLAGS_NAMESPACE) - gflags_report_not_found( - "Failed to extract gflags namespace from header file: " - "${GFLAGS_HEADER_FILE}.") - endif (NOT GFLAGS_NAMESPACE) - - if (GFLAGS_NAMESPACE STREQUAL "google" OR - GFLAGS_NAMESPACE STREQUAL "gflags") - # Found valid gflags namespace from gflags.h. - set(GFLAGS_NAMESPACE "${GFLAGS_NAMESPACE}" PARENT_SCOPE) - return() - endif() - - # Failed to find gflags namespace from gflags.h, gflags is likely a new - # version, check gflags_declare.h, which in newer versions (>= 2.1.2) contains - # the GFLAGS_NAMESPACE #define, which is then referenced in gflags.h. - set(GFLAGS_DECLARE_FILE ${GFLAGS_INCLUDE_DIR}/gflags/gflags_declare.h) - if (NOT EXISTS ${GFLAGS_DECLARE_FILE}) - gflags_report_not_found( - "Could not find file: ${GFLAGS_DECLARE_FILE} " - "containing namespace information in gflags install located at: " - "${GFLAGS_INCLUDE_DIR}.") - endif() - file(READ ${GFLAGS_DECLARE_FILE} GFLAGS_DECLARE_FILE_CONTENTS) - - string(REGEX MATCH "#define GFLAGS_NAMESPACE [A-Za-z]+" - GFLAGS_NAMESPACE "${GFLAGS_DECLARE_FILE_CONTENTS}") - string(REGEX REPLACE "#define GFLAGS_NAMESPACE ([A-Za-z]+)" "\\1" - GFLAGS_NAMESPACE "${GFLAGS_NAMESPACE}") - - if (NOT GFLAGS_NAMESPACE) - gflags_report_not_found( - "Failed to extract gflags namespace from declare file: " - "${GFLAGS_DECLARE_FILE}.") - endif (NOT GFLAGS_NAMESPACE) - - if (GFLAGS_NAMESPACE STREQUAL "google" OR - GFLAGS_NAMESPACE STREQUAL "gflags") - # Found valid gflags namespace from gflags.h. - set(GFLAGS_NAMESPACE "${GFLAGS_NAMESPACE}" PARENT_SCOPE) - return() - endif() -endfunction(GFLAGS_CHECK_GFLAGS_NAMESPACE_USING_REGEX) - -# ----------------------------------------------------------------- -# By default, if the user has expressed no preference for using an exported -# gflags CMake configuration over performing a search for the installed -# components, and has not specified any hints for the search locations, then -# prefer a gflags exported configuration if available. -if (NOT DEFINED GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION - AND NOT GFLAGS_INCLUDE_DIR_HINTS - AND NOT GFLAGS_LIBRARY_DIR_HINTS) - message(STATUS "No preference for use of exported gflags CMake configuration " - "set, and no hints for include/library directories provided. " - "Defaulting to preferring an installed/exported gflags CMake configuration " - "if available.") - set(GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION TRUE) -endif() - -if (GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION) - # Try to find an exported CMake configuration for gflags, as generated by - # gflags versions >= 2.1. - # - # We search twice, s/t we can invert the ordering of precedence used by - # find_package() for exported package build directories, and installed - # packages (found via CMAKE_SYSTEM_PREFIX_PATH), listed as items 6) and 7) - # respectively in [1]. - # - # By default, exported build directories are (in theory) detected first, and - # this is usually the case on Windows. However, on OS X & Linux, the install - # path (/usr/local) is typically present in the PATH environment variable - # which is checked in item 4) in [1] (i.e. before both of the above, unless - # NO_SYSTEM_ENVIRONMENT_PATH is passed). As such on those OSs installed - # packages are usually detected in preference to exported package build - # directories. - # - # To ensure a more consistent response across all OSs, and as users usually - # want to prefer an installed version of a package over a locally built one - # where both exist (esp. as the exported build directory might be removed - # after installation), we first search with NO_CMAKE_PACKAGE_REGISTRY which - # means any build directories exported by the user are ignored, and thus - # installed directories are preferred. If this fails to find the package - # we then research again, but without NO_CMAKE_PACKAGE_REGISTRY, so any - # exported build directories will now be detected. - # - # To prevent confusion on Windows, we also pass NO_CMAKE_BUILDS_PATH (which - # is item 5) in [1]), to not preferentially use projects that were built - # recently with the CMake GUI to ensure that we always prefer an installed - # version if available. - # - # [1] http://www.cmake.org/cmake/help/v2.8.11/cmake.html#command:find_package - find_package(gflags QUIET - NO_MODULE - NO_CMAKE_PACKAGE_REGISTRY - NO_CMAKE_BUILDS_PATH) - if (gflags_FOUND) - message(STATUS "Found installed version of gflags: ${gflags_DIR}") - else(gflags_FOUND) - # Failed to find an installed version of gflags, repeat search allowing - # exported build directories. - message(STATUS "Failed to find installed gflags CMake configuration, " - "searching for gflags build directories exported with CMake.") - # Again pass NO_CMAKE_BUILDS_PATH, as we know that gflags is exported and - # do not want to treat projects built with the CMake GUI preferentially. - find_package(gflags QUIET - NO_MODULE - NO_CMAKE_BUILDS_PATH) - if (gflags_FOUND) - message(STATUS "Found exported gflags build directory: ${gflags_DIR}") - endif(gflags_FOUND) - endif(gflags_FOUND) - - set(FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION ${gflags_FOUND}) - - # gflags v2.1 - 2.1.2 shipped with a bug in their gflags-config.cmake [1] - # whereby gflags_LIBRARIES = "gflags", but there was no imported target - # called "gflags", they were called: gflags[_nothreads]-[static/shared]. - # As this causes linker errors when gflags is not installed in a location - # on the current library paths, detect if this problem is present and - # fix it. - # - # [1] https://github.com/gflags/gflags/issues/110 - if (gflags_FOUND) - # NOTE: This is not written as additional conditions in the outer - # if (gflags_FOUND) as the NOT TARGET "${gflags_LIBRARIES}" - # condition causes problems if gflags is not found. - if (${gflags_VERSION} VERSION_LESS 2.1.3 AND - NOT TARGET "${gflags_LIBRARIES}") - message(STATUS "Detected broken gflags install in: ${gflags_DIR}, " - "version: ${gflags_VERSION} <= 2.1.2 which defines gflags_LIBRARIES = " - "${gflags_LIBRARIES} which is not an imported CMake target, see: " - "https://github.com/gflags/gflags/issues/110. Attempting to fix by " - "detecting correct gflags target.") - # Ordering here expresses preference for detection, specifically we do not - # want to use the _nothreads variants if the full library is available. - list(APPEND CHECK_GFLAGS_IMPORTED_TARGET_NAMES - gflags-shared gflags-static - gflags_nothreads-shared gflags_nothreads-static) - foreach(CHECK_GFLAGS_TARGET ${CHECK_GFLAGS_IMPORTED_TARGET_NAMES}) - if (TARGET ${CHECK_GFLAGS_TARGET}) - message(STATUS "Found valid gflags target: ${CHECK_GFLAGS_TARGET}, " - "updating gflags_LIBRARIES.") - set(gflags_LIBRARIES ${CHECK_GFLAGS_TARGET}) - break() - endif() - endforeach() - if (NOT TARGET ${gflags_LIBRARIES}) - message(STATUS "Failed to fix detected broken gflags install in: " - "${gflags_DIR}, version: ${gflags_VERSION} <= 2.1.2, none of the " - "imported targets for gflags: ${CHECK_GFLAGS_IMPORTED_TARGET_NAMES} " - "are defined. Will continue with a manual search for gflags " - "components. We recommend you build/install a version of gflags > " - "2.1.2 (or master).") - set(FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION FALSE) - endif() - endif() - endif() - - if (FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION) - message(STATUS "Detected gflags version: ${gflags_VERSION}") - set(GFLAGS_FOUND ${gflags_FOUND}) - set(GFLAGS_INCLUDE_DIR ${gflags_INCLUDE_DIR}) - set(GFLAGS_LIBRARY ${gflags_LIBRARIES}) - - # gflags does not export the namespace in their CMake configuration, so - # use our function to determine what it should be, as it can be either - # gflags or google dependent upon version & configuration. - # - # NOTE: We use the regex method to determine the namespace here, as - # check_cxx_source_compiles() will not use imported targets, which - # is what gflags will be in this case. - gflags_check_gflags_namespace_using_regex() - - if (NOT GFLAGS_NAMESPACE) - gflags_report_not_found( - "Failed to determine gflags namespace using regex for gflags " - "version: ${gflags_VERSION} exported here: ${gflags_DIR} using CMake.") - endif (NOT GFLAGS_NAMESPACE) - else (FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION) - message(STATUS "Failed to find an installed/exported CMake configuration " - "for gflags, will perform search for installed gflags components.") - endif (FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION) -endif(GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION) - -if (NOT GFLAGS_FOUND) - # Either failed to find an exported gflags CMake configuration, or user - # told us not to use one. Perform a manual search for all gflags components. - - # Handle possible presence of lib prefix for libraries on MSVC, see - # also GFLAGS_RESET_FIND_LIBRARY_PREFIX(). - if (MSVC) - # Preserve the caller's original values for CMAKE_FIND_LIBRARY_PREFIXES - # s/t we can set it back before returning. - set(CALLERS_CMAKE_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES}") - # The empty string in this list is important, it represents the case when - # the libraries have no prefix (shared libraries / DLLs). - set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "" "${CMAKE_FIND_LIBRARY_PREFIXES}") - endif (MSVC) - - # Search user-installed locations first, so that we prefer user installs - # to system installs where both exist. - list(APPEND GFLAGS_CHECK_INCLUDE_DIRS - /usr/local/include - /usr/local/homebrew/include # Mac OS X - /opt/local/var/macports/software # Mac OS X. - /opt/local/include - /usr/include) - list(APPEND GFLAGS_CHECK_PATH_SUFFIXES - gflags/include # Windows (for C:/Program Files prefix). - gflags/Include ) # Windows (for C:/Program Files prefix). - - list(APPEND GFLAGS_CHECK_LIBRARY_DIRS - /usr/local/lib - /usr/local/homebrew/lib # Mac OS X. - /opt/local/lib - /usr/lib) - list(APPEND GFLAGS_CHECK_LIBRARY_SUFFIXES - gflags/lib # Windows (for C:/Program Files prefix). - gflags/Lib ) # Windows (for C:/Program Files prefix). - - # Search supplied hint directories first if supplied. - find_path(GFLAGS_INCLUDE_DIR - NAMES gflags/gflags.h - PATHS ${GFLAGS_INCLUDE_DIR_HINTS} - ${GFLAGS_CHECK_INCLUDE_DIRS} - PATH_SUFFIXES ${GFLAGS_CHECK_PATH_SUFFIXES}) - if (NOT GFLAGS_INCLUDE_DIR OR - NOT EXISTS ${GFLAGS_INCLUDE_DIR}) - gflags_report_not_found( - "Could not find gflags include directory, set GFLAGS_INCLUDE_DIR " - "to directory containing gflags/gflags.h") - endif (NOT GFLAGS_INCLUDE_DIR OR - NOT EXISTS ${GFLAGS_INCLUDE_DIR}) - - find_library(GFLAGS_LIBRARY NAMES gflags - PATHS ${GFLAGS_LIBRARY_DIR_HINTS} - ${GFLAGS_CHECK_LIBRARY_DIRS} - PATH_SUFFIXES ${GFLAGS_CHECK_LIBRARY_SUFFIXES}) - if (NOT GFLAGS_LIBRARY OR - NOT EXISTS ${GFLAGS_LIBRARY}) - gflags_report_not_found( - "Could not find gflags library, set GFLAGS_LIBRARY " - "to full path to libgflags.") - endif (NOT GFLAGS_LIBRARY OR - NOT EXISTS ${GFLAGS_LIBRARY}) - - # gflags typically requires a threading library (which is OS dependent), note - # that this defines the CMAKE_THREAD_LIBS_INIT variable. If we are able to - # detect threads, we assume that gflags requires it. - find_package(Threads QUIET) - set(GFLAGS_LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) - # On Windows (including MinGW), the Shlwapi library is used by gflags if - # available. - if (WIN32) - include(CheckIncludeFileCXX) - check_include_file_cxx("shlwapi.h" HAVE_SHLWAPI) - if (HAVE_SHLWAPI) - list(APPEND GFLAGS_LINK_LIBRARIES shlwapi.lib) - endif(HAVE_SHLWAPI) - endif (WIN32) - - # Mark internally as found, then verify. GFLAGS_REPORT_NOT_FOUND() unsets - # if called. - set(GFLAGS_FOUND TRUE) - - # Identify what namespace gflags was built with. - if (GFLAGS_INCLUDE_DIR AND NOT GFLAGS_NAMESPACE) - # To handle Windows peculiarities / CMake bugs on MSVC we try two approaches - # to detect the gflags namespace: - # - # 1) Try to use check_cxx_source_compiles() to compile a trivial program - # with the two choices for the gflags namespace. - # - # 2) [In the event 1) fails] Use regex on the gflags headers to try to - # determine the gflags namespace. Whilst this is less robust than 1), - # it does avoid any interaction with msbuild. - gflags_check_gflags_namespace_using_try_compile() - - if (NOT GFLAGS_NAMESPACE) - # Failed to determine gflags namespace using check_cxx_source_compiles() - # method, try and obtain it using regex on the gflags headers instead. - message(STATUS "Failed to find gflags namespace using using " - "check_cxx_source_compiles(), trying namespace regex instead, " - "this is expected on Windows.") - gflags_check_gflags_namespace_using_regex() - - if (NOT GFLAGS_NAMESPACE) - gflags_report_not_found( - "Failed to determine gflags namespace either by " - "check_cxx_source_compiles(), or namespace regex.") - endif (NOT GFLAGS_NAMESPACE) - endif (NOT GFLAGS_NAMESPACE) - endif (GFLAGS_INCLUDE_DIR AND NOT GFLAGS_NAMESPACE) - - # Make the GFLAGS_NAMESPACE a cache variable s/t the user can view it, and could - # overwrite it in the CMake GUI. - set(GFLAGS_NAMESPACE "${GFLAGS_NAMESPACE}" CACHE STRING - "gflags namespace (google or gflags)" FORCE) - - # gflags does not seem to provide any record of the version in its - # source tree, thus cannot extract version. - - # Catch case when caller has set GFLAGS_NAMESPACE in the cache / GUI - # with an invalid value. - if (GFLAGS_NAMESPACE AND - NOT GFLAGS_NAMESPACE STREQUAL "google" AND - NOT GFLAGS_NAMESPACE STREQUAL "gflags") - gflags_report_not_found( - "Caller defined GFLAGS_NAMESPACE:" - " ${GFLAGS_NAMESPACE} is not valid, not google or gflags.") - endif () - # Catch case when caller has set GFLAGS_INCLUDE_DIR in the cache / GUI and - # thus FIND_[PATH/LIBRARY] are not called, but specified locations are - # invalid, otherwise we would report the library as found. - if (GFLAGS_INCLUDE_DIR AND - NOT EXISTS ${GFLAGS_INCLUDE_DIR}/gflags/gflags.h) - gflags_report_not_found( - "Caller defined GFLAGS_INCLUDE_DIR:" - " ${GFLAGS_INCLUDE_DIR} does not contain gflags/gflags.h header.") - endif (GFLAGS_INCLUDE_DIR AND - NOT EXISTS ${GFLAGS_INCLUDE_DIR}/gflags/gflags.h) - # TODO: This regex for gflags library is pretty primitive, we use lowercase - # for comparison to handle Windows using CamelCase library names, could - # this check be better? - string(TOLOWER "${GFLAGS_LIBRARY}" LOWERCASE_GFLAGS_LIBRARY) - if (GFLAGS_LIBRARY AND - NOT "${LOWERCASE_GFLAGS_LIBRARY}" MATCHES ".*gflags[^/]*") - gflags_report_not_found( - "Caller defined GFLAGS_LIBRARY: " - "${GFLAGS_LIBRARY} does not match gflags.") - endif (GFLAGS_LIBRARY AND - NOT "${LOWERCASE_GFLAGS_LIBRARY}" MATCHES ".*gflags[^/]*") - - gflags_reset_find_library_prefix() - -endif(NOT GFLAGS_FOUND) - -# Set standard CMake FindPackage variables if found. -if (GFLAGS_FOUND) - set(GFLAGS_INCLUDE_DIRS ${GFLAGS_INCLUDE_DIR}) - set(GFLAGS_LIBRARIES ${GFLAGS_LIBRARY} ${GFLAGS_LINK_LIBRARIES}) -endif (GFLAGS_FOUND) - -# Handle REQUIRED / QUIET optional arguments. -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Gflags DEFAULT_MSG - GFLAGS_INCLUDE_DIRS GFLAGS_LIBRARIES GFLAGS_NAMESPACE) - -# Only mark internal variables as advanced if we found gflags, otherwise -# leave them visible in the standard GUI for the user to set manually. -if (GFLAGS_FOUND) - mark_as_advanced(FORCE GFLAGS_INCLUDE_DIR - GFLAGS_LIBRARY - GFLAGS_NAMESPACE - gflags_DIR) # Autogenerated by find_package(gflags) -endif (GFLAGS_FOUND) diff --git a/cmake/FindGlog.cmake b/cmake/FindGlog.cmake deleted file mode 100644 index 142e2ca96ba76..0000000000000 --- a/cmake/FindGlog.cmake +++ /dev/null @@ -1,24 +0,0 @@ -# -# Find libglog -# -# LIBGLOG_INCLUDE_DIR - where to find glog/logging.h, etc. -# LIBGLOG_LIBRARY - List of libraries when using libglog. -# LIBGLOG_FOUND - True if libglog found. -# -# from https://github.com/facebook/hhvm/blob/master/CMake/FindGlog.cmake - -IF (LIBGLOG_INCLUDE_DIR) - # Already in cache, be silent - SET(LIBGLOG_FIND_QUIETLY TRUE) -ENDIF () - -FIND_PATH(LIBGLOG_INCLUDE_DIR glog/logging.h) - -FIND_LIBRARY(LIBGLOG_LIBRARY glog) - -# handle the QUIETLY and REQUIRED arguments and set LIBGLOG_FOUND to TRUE if -# all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBGLOG DEFAULT_MSG LIBGLOG_LIBRARY LIBGLOG_INCLUDE_DIR) - -MARK_AS_ADVANCED(LIBGLOG_LIBRARY LIBGLOG_INCLUDE_DIR) \ No newline at end of file diff --git a/cmake/external/glog.cmake b/cmake/external/glog.cmake index b3fef738ccc0b..ee2ca4773bdcc 100644 --- a/cmake/external/glog.cmake +++ b/cmake/external/glog.cmake @@ -54,7 +54,6 @@ ExternalProject_Add( ADD_LIBRARY(glog STATIC IMPORTED GLOBAL) SET_PROPERTY(TARGET glog PROPERTY IMPORTED_LOCATION ${GLOG_LIBRARIES}) ADD_DEPENDENCIES(glog extern_glog gflags) -LINK_LIBRARIES(glog gflags) LIST(APPEND external_project_dependencies glog) diff --git a/paddle/framework/lod_tensor.cc b/paddle/framework/lod_tensor.cc index 5b7badf89c171..df0f19bffb309 100644 --- a/paddle/framework/lod_tensor.cc +++ b/paddle/framework/lod_tensor.cc @@ -14,8 +14,6 @@ #include "paddle/framework/lod_tensor.h" -#include - namespace paddle { namespace framework { diff --git a/paddle/framework/lod_tensor.h b/paddle/framework/lod_tensor.h index 4db36ee76609a..d753dcd11852b 100644 --- a/paddle/framework/lod_tensor.h +++ b/paddle/framework/lod_tensor.h @@ -21,7 +21,6 @@ #include #endif -#include #include "paddle/framework/ddim.h" #include "paddle/framework/tensor.h" #include "paddle/platform/enforce.h" diff --git a/paddle/framework/lod_tensor_test.cu b/paddle/framework/lod_tensor_test.cu index 647d07536dd07..0f274a28ed72d 100644 --- a/paddle/framework/lod_tensor_test.cu +++ b/paddle/framework/lod_tensor_test.cu @@ -16,6 +16,7 @@ #include "paddle/framework/lod_tensor.h" #include "paddle/platform/assert.h" +#include #include __global__ void test(size_t* a, int size) { diff --git a/paddle/framework/tensor_array.cc b/paddle/framework/tensor_array.cc index 7ae16e99cdb8a..c22acf5e80176 100644 --- a/paddle/framework/tensor_array.cc +++ b/paddle/framework/tensor_array.cc @@ -16,7 +16,6 @@ #include "paddle/framework/tensor_array.h" -#include #include #include diff --git a/paddle/operators/cond_op.h b/paddle/operators/cond_op.h index 93121fb31be28..6c6916eabb757 100644 --- a/paddle/operators/cond_op.h +++ b/paddle/operators/cond_op.h @@ -14,7 +14,6 @@ limitations under the License. */ #pragma once #include -#include "glog/logging.h" #include "paddle/framework/ddim.h" #include "paddle/framework/eigen.h" #include "paddle/framework/operator.h" diff --git a/paddle/operators/lstm_unit_op.h b/paddle/operators/lstm_unit_op.h index a0ff498c1d3ed..17fbda62afcbd 100644 --- a/paddle/operators/lstm_unit_op.h +++ b/paddle/operators/lstm_unit_op.h @@ -13,7 +13,6 @@ limitations under the License. */ #pragma once -#include "glog/logging.h" #include "paddle/framework/op_registry.h" namespace paddle { diff --git a/paddle/platform/CMakeLists.txt b/paddle/platform/CMakeLists.txt index daf519b91d623..ba2567b5071de 100644 --- a/paddle/platform/CMakeLists.txt +++ b/paddle/platform/CMakeLists.txt @@ -1,7 +1,7 @@ -cc_library(cpu_info SRCS cpu_info.cc DEPS gflags glog) +cc_library(cpu_info SRCS cpu_info.cc DEPS gflags) cc_test(cpu_info_test SRCS cpu_info_test.cc DEPS cpu_info) -nv_library(gpu_info SRCS gpu_info.cc DEPS gflags glog) +nv_library(gpu_info SRCS gpu_info.cc DEPS gflags) cc_library(place SRCS place.cc) cc_test(place_test SRCS place_test.cc DEPS place glog gflags) From a7cc73a3cb5b041a562284f942001222878c2247 Mon Sep 17 00:00:00 2001 From: Liu Yiqun Date: Mon, 16 Oct 2017 09:45:52 +0000 Subject: [PATCH 2/5] Remove duplicate DEPS. --- cmake/generic.cmake | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/cmake/generic.cmake b/cmake/generic.cmake index c311783aa3187..2dcd680d2daab 100644 --- a/cmake/generic.cmake +++ b/cmake/generic.cmake @@ -91,9 +91,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) if(NOT APPLE AND NOT ANDROID) - find_package(Threads REQUIRED) - link_libraries(${CMAKE_THREAD_LIBS_INIT}) - set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -ldl -lrt") + find_package(Threads REQUIRED) + link_libraries(${CMAKE_THREAD_LIBS_INIT}) + set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -ldl -lrt") endif(NOT APPLE AND NOT ANDROID) function(merge_static_libs TARGET_NAME) @@ -180,12 +180,13 @@ function(cc_library TARGET_NAME) set(multiValueArgs SRCS DEPS) cmake_parse_arguments(cc_library "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) if (cc_library_SRCS) - if (cc_library_SHARED OR cc_library_shared) # build *.so + if(cc_library_SHARED OR cc_library_shared) # build *.so add_library(${TARGET_NAME} SHARED ${cc_library_SRCS}) else() add_library(${TARGET_NAME} STATIC ${cc_library_SRCS}) endif() - if (cc_library_DEPS) + if(cc_library_DEPS) + list(REMOVE_DUPLICATES cc_library_DEPS) add_dependencies(${TARGET_NAME} ${cc_library_DEPS}) target_link_libraries(${TARGET_NAME} ${cc_library_DEPS}) endif() @@ -226,6 +227,9 @@ function(cc_test TARGET_NAME) set(oneValueArgs "") set(multiValueArgs SRCS DEPS) cmake_parse_arguments(cc_test "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + if(cc_test_DEPS) + list(REMOVE_DUPLICATES cc_test_DEPS) + endif() add_executable(${TARGET_NAME} ${cc_test_SRCS}) target_link_libraries(${TARGET_NAME} ${cc_test_DEPS} gtest gtest_main) add_dependencies(${TARGET_NAME} ${cc_test_DEPS} gtest gtest_main) @@ -240,12 +244,13 @@ function(nv_library TARGET_NAME) set(multiValueArgs SRCS DEPS) cmake_parse_arguments(nv_library "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) if(nv_library_SRCS) - if (nv_library_SHARED OR nv_library_shared) # build *.so + if(nv_library_SHARED OR nv_library_shared) # build *.so cuda_add_library(${TARGET_NAME} SHARED ${nv_library_SRCS}) else() - cuda_add_library(${TARGET_NAME} STATIC ${nv_library_SRCS}) + cuda_add_library(${TARGET_NAME} STATIC ${nv_library_SRCS}) endif() - if (nv_library_DEPS) + if(nv_library_DEPS) + list(REMOVE_DUPLICATES nv_library_DEPS) add_dependencies(${TARGET_NAME} ${nv_library_DEPS}) target_link_libraries(${TARGET_NAME} ${nv_library_DEPS}) endif() @@ -268,7 +273,7 @@ function(nv_library TARGET_NAME) endfunction(nv_library) function(nv_binary TARGET_NAME) - if (WITH_GPU) + if(WITH_GPU) set(options "") set(oneValueArgs "") set(multiValueArgs SRCS DEPS) @@ -282,11 +287,14 @@ function(nv_binary TARGET_NAME) endfunction(nv_binary) function(nv_test TARGET_NAME) - if (WITH_GPU AND WITH_TESTING) + if(WITH_GPU AND WITH_TESTING) set(options "") set(oneValueArgs "") set(multiValueArgs SRCS DEPS) cmake_parse_arguments(nv_test "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + if(nv_test_DEPS) + list(REMOVE_DUPLICATES nv_test_DEPS) + endif() cuda_add_executable(${TARGET_NAME} ${nv_test_SRCS}) target_link_libraries(${TARGET_NAME} ${nv_test_DEPS} gtest gtest_main) add_dependencies(${TARGET_NAME} ${nv_test_DEPS} gtest gtest_main) @@ -402,10 +410,10 @@ function(paddle_protobuf_generate_cpp SRCS HDRS) set(${SRCS}) set(${HDRS}) - if (MOBILE_INFERENCE) - set(EXTRA_FLAG "lite:") + if(MOBILE_INFERENCE) + set(EXTRA_FLAG "lite:") else() - set(EXTRA_FLAG "") + set(EXTRA_FLAG "") endif() foreach(FIL ${ARGN}) @@ -420,14 +428,13 @@ function(paddle_protobuf_generate_cpp SRCS HDRS) add_custom_command( OUTPUT "${_protobuf_protoc_src}" "${_protobuf_protoc_hdr}" - COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}" - COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} - -I${CMAKE_CURRENT_SOURCE_DIR} - --cpp_out "${EXTRA_FLAG}${CMAKE_CURRENT_BINARY_DIR}" ${ABS_FIL} + COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} + -I${CMAKE_CURRENT_SOURCE_DIR} + --cpp_out "${EXTRA_FLAG}${CMAKE_CURRENT_BINARY_DIR}" ${ABS_FIL} DEPENDS ${ABS_FIL} protoc COMMENT "Running C++ protocol buffer compiler on ${FIL}" - VERBATIM ) + VERBATIM) endforeach() set_source_files_properties(${${SRCS}} ${${HDRS}} PROPERTIES GENERATED TRUE) From 46e79bc6e924950945ee4ad88e52cb41ccd8be9a Mon Sep 17 00:00:00 2001 From: Liu Yiqun Date: Tue, 17 Oct 2017 10:46:22 +0800 Subject: [PATCH 3/5] Remove duplicated links on Mac and iOS. --- cmake/cross_compiling/ios.cmake | 8 +++++--- cmake/util.cmake | 8 +------- paddle/math/tests/test_FPException.cpp | 3 +++ paddle/utils/Excepts.h | 1 + paddle/utils/tests/test_StringUtils.cpp | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cmake/cross_compiling/ios.cmake b/cmake/cross_compiling/ios.cmake index 0b38943952f7f..dc746987d31c1 100644 --- a/cmake/cross_compiling/ios.cmake +++ b/cmake/cross_compiling/ios.cmake @@ -247,7 +247,8 @@ endif() set(IOS_COMPILER_FLAGS "${XCODE_IOS_PLATFORM_VERSION_FLAGS} ${XCODE_IOS_BITCODE_FLAGS}") -# Hidden visibilty is required for cxx on iOS +# Hidden visibilty is required for c++ on iOS. +# Remove -fvisibility=hidden because warp-ctc failed with it. set(CMAKE_C_FLAGS "${IOS_COMPILER_FLAGS} ${CMAKE_C_FLAGS}" CACHE STRING "C flags") set(CMAKE_CXX_FLAGS "${IOS_COMPILER_FLAGS} -fvisibility-inlines-hidden ${CMAKE_CXX_FLAGS}" CACHE STRING "CXX flags") @@ -266,10 +267,10 @@ if(IOS_USE_VECLIB_FOR_BLAS) if(VECLIB_FOUND) if(VECLIB_INC_DIR MATCHES "^/System/Library/Frameworks/vecLib.framework.*") - set(IOS_LINK_FLAGS ${IOS_LINK_FLAGS} -lcblas "-framework vecLib") + set(IOS_LINK_FLAGS "${IOS_LINK_FLAGS} -framework vecLib") message(STATUS "Found standalone vecLib.framework") else() - set(IOS_LINK_FLAGS ${IOS_LINK_FLAGS} -lcblas "-framework Accelerate") + set(IOS_LINK_FLAGS "${IOS_LINK_FLAGS} -framework Accelerate") message(STATUS "Found vecLib as part of Accelerate.framework") endif() @@ -278,6 +279,7 @@ endif() set(CMAKE_C_LINK_FLAGS "${IOS_LINK_FLAGS} ${CMAKE_C_LINK_FLAGS}") set(CMAKE_CXX_LINK_FLAGS "${IOS_LINK_FLAGS} ${CMAKE_CXX_LINK_FLAGS}") +set(CMAKE_EXE_LINKER_FLAGS "${IOS_LINK_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}") set(CMAKE_PLATFORM_HAS_INSTALLNAME 1) if(NOT IOS_ENABLE_BITCODE) diff --git a/cmake/util.cmake b/cmake/util.cmake index 117ab7f49cdf4..4e8719f050a40 100644 --- a/cmake/util.cmake +++ b/cmake/util.cmake @@ -9,7 +9,6 @@ function(target_circle_link_libraries TARGET_NAME) if(APPLE) set(LIBS) set(inArchive OFF) - set(libsInArgn) foreach(arg ${ARGN}) if(${arg} STREQUAL "ARCHIVE_START") @@ -21,7 +20,6 @@ function(target_circle_link_libraries TARGET_NAME) list(APPEND LIBS "-Wl,-force_load") endif() list(APPEND LIBS ${arg}) - list(APPEND libsInArgn ${arg}) endif() endforeach() if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") @@ -29,11 +27,7 @@ function(target_circle_link_libraries TARGET_NAME) list(APPEND LIBS "-undefined dynamic_lookup") endif() endif() - list(REVERSE libsInArgn) - target_link_libraries(${TARGET_NAME} - ${LIBS} - ${libsInArgn}) - + target_link_libraries(${TARGET_NAME} ${LIBS}) else() # LINUX set(LIBS) diff --git a/paddle/math/tests/test_FPException.cpp b/paddle/math/tests/test_FPException.cpp index 3836f7fc0fe57..583fd333cf3cf 100644 --- a/paddle/math/tests/test_FPException.cpp +++ b/paddle/math/tests/test_FPException.cpp @@ -88,6 +88,9 @@ int main(int argc, char** argv) { testing::InitGoogleTest(&argc, argv); initMain(argc, argv); +#if !defined(__arm__) && !defined(__aarch64__) + // TODO(liuyiqun) : implement the iOS version feenableexcept(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW); +#endif return RUN_ALL_TESTS(); } diff --git a/paddle/utils/Excepts.h b/paddle/utils/Excepts.h index 0add66da74642..f4cfa608c6c62 100644 --- a/paddle/utils/Excepts.h +++ b/paddle/utils/Excepts.h @@ -20,6 +20,7 @@ limitations under the License. */ #if (defined(__APPLE__) || defined(__OSX__)) && !defined(__arm__) && \ !defined(__aarch64__) +// TODO(liuyiqun): implement the iOS version int fegetexcept(void); int feenableexcept(unsigned int excepts); int fedisableexcept(unsigned int excepts); diff --git a/paddle/utils/tests/test_StringUtils.cpp b/paddle/utils/tests/test_StringUtils.cpp index fdc914d1bcc3c..248f58a7f26e2 100644 --- a/paddle/utils/tests/test_StringUtils.cpp +++ b/paddle/utils/tests/test_StringUtils.cpp @@ -18,6 +18,6 @@ limitations under the License. */ TEST(StringUtil, to) { ASSERT_NEAR(paddle::str::to("12.45"), 12.45, 1e-5); - ASSERT_DEATH(paddle::str::to("12.45x23"), ".*"); - ASSERT_DEATH(paddle::str::to(""), ".*"); + ASSERT_DEATH_IF_SUPPORTED(paddle::str::to("12.45x23"), ".*"); + ASSERT_DEATH_IF_SUPPORTED(paddle::str::to(""), ".*"); } From 5a8a81c2618a3f1a7eed9d2f50e5b11dc5618967 Mon Sep 17 00:00:00 2001 From: Liu Yiqun Date: Fri, 27 Oct 2017 15:02:36 +0800 Subject: [PATCH 4/5] Add the global link of gflags and glog back, because so many modules depend them but not add them to DEPS. --- cmake/external/glog.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/external/glog.cmake b/cmake/external/glog.cmake index fffc8634e37c9..08bdc1e1623b0 100644 --- a/cmake/external/glog.cmake +++ b/cmake/external/glog.cmake @@ -55,6 +55,7 @@ ExternalProject_Add( ADD_LIBRARY(glog STATIC IMPORTED GLOBAL) SET_PROPERTY(TARGET glog PROPERTY IMPORTED_LOCATION ${GLOG_LIBRARIES}) ADD_DEPENDENCIES(glog extern_glog gflags) +LINK_LIBRARIES(glog gflags) LIST(APPEND external_project_dependencies glog) From 14059a6cd4a16156eb954d8dcfc014517819fc16 Mon Sep 17 00:00:00 2001 From: Liu Yiqun Date: Fri, 27 Oct 2017 15:45:36 +0800 Subject: [PATCH 5/5] Refine the ambiguity comment in ios.cmake. --- cmake/cross_compiling/ios.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/cross_compiling/ios.cmake b/cmake/cross_compiling/ios.cmake index dc746987d31c1..069c790121e01 100644 --- a/cmake/cross_compiling/ios.cmake +++ b/cmake/cross_compiling/ios.cmake @@ -247,8 +247,8 @@ endif() set(IOS_COMPILER_FLAGS "${XCODE_IOS_PLATFORM_VERSION_FLAGS} ${XCODE_IOS_BITCODE_FLAGS}") -# Hidden visibilty is required for c++ on iOS. -# Remove -fvisibility=hidden because warp-ctc failed with it. +# FIXME(liuyiqun01): Hidden visibilty is required for c++ on iOS, +# but with -fvisibility=hidden external library warp-ctc fails, so remove it temporarily. set(CMAKE_C_FLAGS "${IOS_COMPILER_FLAGS} ${CMAKE_C_FLAGS}" CACHE STRING "C flags") set(CMAKE_CXX_FLAGS "${IOS_COMPILER_FLAGS} -fvisibility-inlines-hidden ${CMAKE_CXX_FLAGS}" CACHE STRING "CXX flags")