mirror of
https://github.com/zebrajr/pytorch.git
synced 2025-12-06 12:20:52 +01:00
Use string(APPEND FOO " bar") instead of `set(FOO "${FOO} bar") (#42844)
Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/42844 Reviewed By: scintiller Differential Revision: D23067577 Pulled By: malfet fbshipit-source-id: e4380ce02fd6aca37c955a7bc24435222c5d8b19
This commit is contained in:
Nikita Shulga
Facebook GitHub Bot
parent
3d3752d716
commit
ea65a56854
130
CMakeLists.txt
130
CMakeLists.txt
|
|
@ -373,7 +373,7 @@ if(ANDROID OR IOS OR DEFINED ENV{BUILD_PYTORCH_MOBILE_WITH_HOST_TOOLCHAIN})
|
|||
if(DEFINED ENV{BUILD_PYTORCH_MOBILE_WITH_HOST_TOOLCHAIN})
|
||||
# C10_MOBILE is derived from Android/iOS toolchain macros in
|
||||
# c10/macros/Macros.h, so it needs to be explicitly set here.
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DC10_MOBILE")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -DC10_MOBILE")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
|
@ -391,7 +391,7 @@ endif()
|
|||
# TorchScript model, but doesn't contain not-yet-unified caffe2 ops;
|
||||
if(INTERN_BUILD_MOBILE AND NOT BUILD_CAFFE2_MOBILE)
|
||||
if(NOT BUILD_SHARED_LIBS AND NOT "${SELECTED_OP_LIST}" STREQUAL "")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNO_EXPORT")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -DNO_EXPORT")
|
||||
endif()
|
||||
set(BUILD_PYTHON OFF)
|
||||
set(BUILD_CAFFE2_OPS OFF)
|
||||
|
|
@ -472,31 +472,31 @@ endif()
|
|||
include(cmake/Dependencies.cmake)
|
||||
|
||||
if(USE_FBGEMM)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_FBGEMM")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -DUSE_FBGEMM")
|
||||
endif()
|
||||
|
||||
if(USE_QNNPACK)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_QNNPACK")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -DUSE_QNNPACK")
|
||||
endif()
|
||||
|
||||
if(USE_PYTORCH_QNNPACK)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_PYTORCH_QNNPACK")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -DUSE_PYTORCH_QNNPACK")
|
||||
endif()
|
||||
|
||||
if(USE_XNNPACK)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_XNNPACK")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -DUSE_XNNPACK")
|
||||
endif()
|
||||
|
||||
if(USE_VULKAN)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_VULKAN")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -DUSE_VULKAN")
|
||||
endif()
|
||||
|
||||
if(USE_VULKAN_WRAPPER)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_VULKAN_WRAPPER")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -DUSE_VULKAN_WRAPPER")
|
||||
endif()
|
||||
|
||||
if(USE_VULKAN_SHADERC_RUNTIME)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_VULKAN_SHADERC_RUNTIME")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -DUSE_VULKAN_SHADERC_RUNTIME")
|
||||
endif()
|
||||
|
||||
# ---[ Allowlist file if allowlist is specified
|
||||
|
|
@ -512,116 +512,116 @@ endif()
|
|||
set(CMAKE_C_STANDARD 11)
|
||||
set(CMAKE_CXX_STANDARD 14)
|
||||
if(NOT MSVC)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -fPIC")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-narrowing")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -O2 -fPIC")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-narrowing")
|
||||
# Eigen fails to build with some versions, so convert this to a warning
|
||||
# Details at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1459
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-type-limits")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-array-bounds")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-function")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-result")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-strict-overflow")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-strict-aliasing")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=deprecated-declarations")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wall")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wextra")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Werror=return-type")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-missing-field-initializers")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-type-limits")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-array-bounds")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-unknown-pragmas")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-sign-compare")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-unused-parameter")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-unused-variable")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-unused-function")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-unused-result")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-unused-local-typedefs")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-strict-overflow")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-strict-aliasing")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-error=deprecated-declarations")
|
||||
if(CMAKE_COMPILER_IS_GNUCXX AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0))
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-stringop-overflow")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-stringop-overflow")
|
||||
endif()
|
||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
||||
# Suppress "The ABI for passing parameters with 64-byte alignment has changed in GCC 4.6"
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-psabi")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-psabi")
|
||||
endif()
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=pedantic")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=redundant-decls")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=old-style-cast")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-error=pedantic")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-error=redundant-decls")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-error=old-style-cast")
|
||||
# These flags are not available in GCC-4.8.5. Set only when using clang.
|
||||
# Compared against https://gcc.gnu.org/onlinedocs/gcc-4.8.5/gcc/Option-Summary.html
|
||||
if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-partial-specialization")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-typedef-redefinition")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-private-field")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-inconsistent-missing-override")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-aligned-allocation-unavailable")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++14-extensions")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-constexpr-not-const")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-braces")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-invalid-partial-specialization")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-typedef-redefinition")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-unknown-warning-option")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-unused-private-field")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-inconsistent-missing-override")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-aligned-allocation-unavailable")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-c++14-extensions")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-constexpr-not-const")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-missing-braces")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Qunused-arguments")
|
||||
if(${COLORIZE_OUTPUT})
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -fcolor-diagnostics")
|
||||
endif()
|
||||
endif()
|
||||
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9)
|
||||
if(${COLORIZE_OUTPUT})
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -fdiagnostics-color=always")
|
||||
endif()
|
||||
endif()
|
||||
if((APPLE AND (NOT ("${CLANG_VERSION_STRING}" VERSION_LESS "9.0")))
|
||||
OR(CMAKE_COMPILER_IS_GNUCXX
|
||||
AND(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0 AND NOT APPLE)))
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -faligned-new")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -faligned-new")
|
||||
endif()
|
||||
if(WERROR)
|
||||
check_cxx_compiler_flag("-Werror" COMPILER_SUPPORT_WERROR)
|
||||
if(NOT COMPILER_SUPPORT_WERROR)
|
||||
set(WERROR FALSE)
|
||||
else()
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Werror")
|
||||
endif()
|
||||
endif(WERROR)
|
||||
if(NOT APPLE)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-variable")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-maybe-uninitialized")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-unused-but-set-variable")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-maybe-uninitialized")
|
||||
endif()
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -O0")
|
||||
set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_STATIC_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -O0")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-math-errno")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-trapping-math")
|
||||
string(APPEND CMAKE_CXX_FLAGS_DEBUG " -fno-omit-frame-pointer -O0")
|
||||
string(APPEND CMAKE_LINKER_FLAGS_DEBUG " -fno-omit-frame-pointer -O0")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -fno-math-errno")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -fno-trapping-math")
|
||||
check_cxx_compiler_flag("-Werror=format" HAS_WERROR_FORMAT)
|
||||
if(HAS_WERROR_FORMAT)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=format")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Werror=format")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(USE_ASAN)
|
||||
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address")
|
||||
set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_STATIC_LINKER_FLAGS_DEBUG} -fsanitize=address")
|
||||
string(APPEND CMAKE_CXX_FLAGS_DEBUG " -fsanitize=address")
|
||||
string(APPEND CMAKE_LINKER_FLAGS_DEBUG " -fsanitize=address")
|
||||
endif()
|
||||
|
||||
# invoke clang code coverage flags
|
||||
if(CLANG_CODE_COVERAGE)
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-instr-generate -fcoverage-mapping")
|
||||
string(APPEND CMAKE_C_FLAGS " -fprofile-instr-generate -fcoverage-mapping")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -fprofile-instr-generate -fcoverage-mapping")
|
||||
endif()
|
||||
|
||||
if(APPLE)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-private-field")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-braces")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++14-extensions")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-constexpr-not-const")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-unused-private-field")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-missing-braces")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-c++14-extensions")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-constexpr-not-const")
|
||||
endif()
|
||||
|
||||
if(EMSCRIPTEN)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-implicit-function-declaration -DEMSCRIPTEN -s DISABLE_EXCEPTION_CATCHING=0")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-implicit-function-declaration -DEMSCRIPTEN -s DISABLE_EXCEPTION_CATCHING=0")
|
||||
endif()
|
||||
|
||||
if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0.0)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-stringop-overflow")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-stringop-overflow")
|
||||
endif()
|
||||
|
||||
if(ANDROID AND (NOT ANDROID_DEBUG_SYMBOLS))
|
||||
if(CMAKE_COMPILER_IS_GNUCXX)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -s")
|
||||
else()
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s")
|
||||
string(APPEND CMAKE_EXE_LINKER_FLAGS " -s")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
|
|||
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
|
||||
|
||||
if(NOT MSVC)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-ignored-qualifiers")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-ignored-qualifiers")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-absolute-value")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-absolute-value")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-ignored-qualifiers")
|
||||
string(APPEND CMAKE_C_FLAGS " -Wno-ignored-qualifiers")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -Wno-absolute-value")
|
||||
string(APPEND CMAKE_C_FLAGS " -Wno-absolute-value")
|
||||
endif(NOT MSVC)
|
||||
|
||||
# Can be compiled standalone
|
||||
|
|
|
|||
|
|
@ -108,9 +108,9 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
|||
else()
|
||||
CHECK_CXX_COMPILER_AND_LINKER_FLAGS(HAS_LIBCPP "-stdlib=libc++" "-stdlib=libc++")
|
||||
if(HAS_LIBCPP)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -D_LIBCPP_VERSION")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
|
||||
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -stdlib=libc++")
|
||||
string(APPEND CMAKE_CXX_FLAGS " -stdlib=libc++ -D_LIBCPP_VERSION")
|
||||
string(APPEND CMAKE_EXE_LINKER_FLAGS " -stdlib=libc++")
|
||||
string(APPEND CMAKE_SHARED_LINKER_FLAGS " -stdlib=libc++")
|
||||
message(STATUS "TBB: using libc++.")
|
||||
else()
|
||||
message(STATUS "TBB: NOT using libc++.")
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user