diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f43f7e820c..8269e16867f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,11 +80,22 @@ set(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -O0 -g2 -ggdb -fno-inline-functions -f -Wl,--allow-shlib-undefined -D_LIBCPP_INLINE_VISIBILITY='' -D_LIBCPP_DISABLE_EXTERN_TEMPLATE=1 \ -DHALF_ENABLE_CPP11_USER_LITERALS=0 -D_FORTIFY_SOURCE=2 -Wno-cpp") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/local/include -std=c++17 \ - -Wall -Wno-deprecated-declarations -fPIC") +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED TRUE) + +if(CUDA_VERSION VERSION_LESS 11.0) + set(CMAKE_CUDA_STANDARD 14) +else() + set(CMAKE_CUDA_STANDARD 17) +endif() +set(CMAKE_CUDA_STANDARD_REQUIRED TRUE) + +set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/local/include \ + -Wall -Wno-deprecated-declarations") set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -set(PYBIND11_CPP_STANDARD -std=c++17) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPTION_CXX_FLAGS}") if(ENABLE_AKG AND CMAKE_SYSTEM_NAME MATCHES "Linux") diff --git a/mindspore/ccsrc/CMakeLists.txt b/mindspore/ccsrc/CMakeLists.txt index 81dda1716a8..4d2dc4e790f 100644 --- a/mindspore/ccsrc/CMakeLists.txt +++ b/mindspore/ccsrc/CMakeLists.txt @@ -34,7 +34,9 @@ endif() if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") link_directories(${CMAKE_SOURCE_DIR}/build/mindspore/graphengine) else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 \ + set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED TRUE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \ -Wno-delete-non-abstract-non-virtual-dtor -Wno-unused-private-field -Wno-overloaded-virtual \ -Wno-unused-const-variable -Wno-pessimizing-move -Wno-range-loop-analysis -Wno-mismatched-tags \ -Wno-c++11-narrowing") @@ -136,15 +138,9 @@ if(ENABLE_GPU) list(APPEND GPU_SRC_LIST ${CMAKE_CURRENT_SOURCE_DIR}/plugin/device/gpu/hal/device/trt_loader.cc) endif() - set(NVCC_TMP_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) - if(${CUDA_VERSION} VERSION_LESS 11.0) - string(REPLACE "-std=c++17" "-std=c++11" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - else() - string(REPLACE "-std=c++17" "-std=c++14" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - endif() - set_property(SOURCE ${GPU_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) - cuda_add_library(gpu_cuda_lib STATIC ${GPU_SRC_LIST}) - set(CMAKE_CXX_FLAGS ${NVCC_TMP_CMAKE_CXX_FLAGS}) + set_source_files_properties(${GPU_SRC_LIST} PROPERTIES COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE + LANGUAGE CUDA) + add_library(gpu_cuda_lib STATIC ${GPU_SRC_LIST}) add_compile_definitions(ENABLE_GPU) add_subdirectory(plugin/device/gpu/kernel/cuda_impl/cuda_ops) diff --git a/mindspore/ccsrc/debug/CMakeLists.txt b/mindspore/ccsrc/debug/CMakeLists.txt index 1d782857133..ae0f5148a34 100644 --- a/mindspore/ccsrc/debug/CMakeLists.txt +++ b/mindspore/ccsrc/debug/CMakeLists.txt @@ -68,7 +68,7 @@ set_property(SOURCE ${_DEBUG_SRC_LIST} ${_RDR_SRC_LIST} PROPERTY COMPILE_DEFINIT add_library(_mindspore_debug_obj OBJECT ${_DEBUG_SRC_LIST} ${_RDR_SRC_LIST}) if(ENABLE_DEBUGGER) if(NOT CMAKE_SYSTEM_NAME MATCHES "Windows") - add_compile_options(-Wall -DOFFLINE_DBG_MODE -fPIC -O2) + add_compile_options(-Wall -DOFFLINE_DBG_MODE -O2) set_property(SOURCE ${_OFFLINE_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_OFFLINE_DEBUG) add_library(_mindspore_offline_debug SHARED ${_OFFLINE_SRC_LIST}) diff --git a/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/cmake/protobuf_arm.cmake b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/cmake/protobuf_arm.cmake index 6a1248c33b5..8e9ff54b577 100644 --- a/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/cmake/protobuf_arm.cmake +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/cmake/protobuf_arm.cmake @@ -1,4 +1,5 @@ set(protobuf_arm_USE_STATIC_LIBS ON) +set(_cmake_args) if(BUILD_LITE) if(MSVC) set(protobuf_arm_CXXFLAGS "${CMAKE_CXX_FLAGS}") @@ -6,24 +7,26 @@ if(BUILD_LITE) set(protobuf_arm_LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS}") set(_ms_tmp_CMAKE_STATIC_LIBRARY_PREFIX ${CMAKE_STATIC_LIBRARY_PREFIX}) set(CMAKE_STATIC_LIBRARY_PREFIX "lib") - else() + else() + list(APPEND _cmake_args -DCMAKE_CXX_VISIBILITY_PRESET=hidden -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE) set(protobuf_arm_CXXFLAGS "-fstack-protector-all -Wno-maybe-uninitialized -Wno-unused-parameter \ - -fPIC -fvisibility=hidden -D_FORTIFY_SOURCE=2 -O2") + -D_FORTIFY_SOURCE=2 -O2") if(NOT ENABLE_GLIBCXX) set(protobuf_arm_CXXFLAGS "${protobuf_arm_CXXFLAGS} -D_GLIBCXX_USE_CXX11_ABI=0") endif() set(protobuf_arm_LDFLAGS "-Wl,-z,relro,-z,now,-z,noexecstack") endif() else() + list(APPEND _cmake_args -DCMAKE_CXX_VISIBILITY_PRESET=hidden -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(protobuf_arm_CXXFLAGS "-fstack-protector-all -Wno-uninitialized -Wno-unused-parameter -fPIC \ - -fvisibility=hidden -D_FORTIFY_SOURCE=2 -O2") + set(protobuf_arm_CXXFLAGS "-fstack-protector-all -Wno-uninitialized -Wno-unused-parameter \ + -D_FORTIFY_SOURCE=2 -O2") elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows") set(protobuf_arm_CXXFLAGS "-fstack-protector-all -Wno-maybe-uninitialized -Wno-unused-parameter \ - -fPIC -fvisibility=hidden -D_FORTIFY_SOURCE=2 -O2") + -D_FORTIFY_SOURCE=2 -O2") else() set(protobuf_arm_CXXFLAGS "-fstack-protector-all -Wno-maybe-uninitialized -Wno-unused-parameter \ - -fPIC -fvisibility=hidden -D_FORTIFY_SOURCE=2 -O2") + -D_FORTIFY_SOURCE=2 -O2") if(NOT ENABLE_GLIBCXX) set(protobuf_arm_CXXFLAGS "${protobuf_arm_CXXFLAGS} -D_GLIBCXX_USE_CXX11_ABI=0") endif() @@ -51,6 +54,7 @@ mindspore_add_pkg(protobuf_arm MD5 ${MD5} CMAKE_PATH cmake/ CMAKE_OPTION + ${_cmake_args} -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release diff --git a/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cuda_ops/CMakeLists.txt b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cuda_ops/CMakeLists.txt index 00c5f64f834..25f332ec0a8 100644 --- a/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cuda_ops/CMakeLists.txt +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cuda_ops/CMakeLists.txt @@ -4,17 +4,11 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-delete-non-abstract-non-virtual-dtor -Wno-overloaded-virtual") endif() -if(${CUDA_VERSION} VERSION_LESS 11.0) - string(REPLACE "-std=c++17" "-std=c++11" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -else() - string(REPLACE "-std=c++17" "-std=c++14" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -endif() - set_property(SOURCE ${CUDA_OPS_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_KERNEL) if(ENABLE_GPU) add_library(cuda_common_obj OBJECT cuda_common.cc) - target_compile_options(cuda_common_obj PRIVATE "-std=c++17") - cuda_add_library(cuda_ops SHARED ${CUDA_OPS_SRC_LIST} $) + target_compile_features(cuda_common_obj PRIVATE cxx_std_17) + add_library(cuda_ops SHARED ${CUDA_OPS_SRC_LIST} $) message("add gpu lib to cuda_ops") target_link_libraries(cuda_ops mindspore_core cublas ${CUDA_PATH}/lib64/libcurand.so diff --git a/mindspore/lite/CMakeLists.txt b/mindspore/lite/CMakeLists.txt index 113419cd177..32f346c95ba 100644 --- a/mindspore/lite/CMakeLists.txt +++ b/mindspore/lite/CMakeLists.txt @@ -341,6 +341,19 @@ if(MSLITE_ENABLE_FP16 AND PLATFORM_ARM32 AND CMAKE_CXX_COMPILER_ID STREQUAL "Cla set(MSLITE_ENABLE_FP16 off) endif() +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED TRUE) + +if(CUDA_VERSIONk VERSION_LESS 11.0) + set(CMAKE_CUDA_STANDARD 14) +else() + set(CMAKE_CUDA_STANDARD 17) +endif() +set(CMAKE_CUDA_STANDARD_REQUIRED TRUE) + +set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) + + if(MSLITE_ENABLE_HIGH_PERFORMANCE) add_compile_definitions(ENABLE_HIGH_PERFORMANCE) endif() @@ -387,10 +400,6 @@ endif() add_compile_definitions(NO_DLIB) -if(NOT MSVC) - add_compile_options(-fPIC) -endif() - if(PLATFORM_ARM64) if(TARGET_HIMIX100 OR TARGET_MIX210 OR MACHINE_LINUX_ARM64) set(RUNTIME_COMPONENT_NAME "linux-aarch64") diff --git a/mindspore/lite/cmake/compile_link_option.cmake b/mindspore/lite/cmake/compile_link_option.cmake index 3ab0cef1ddd..e23c2f2b1a6 100644 --- a/mindspore/lite/cmake/compile_link_option.cmake +++ b/mindspore/lite/cmake/compile_link_option.cmake @@ -10,10 +10,13 @@ else() string(REPLACE "-g" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") string(REPLACE "-g" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED TRUE) + set(CMAKE_C_FLAGS "-D_FORTIFY_SOURCE=2 -O2 -Wall -Werror -Wno-attributes -Wno-deprecated-declarations \ -Wno-missing-braces ${SECURE_C_FLAGS} ${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "-D_FORTIFY_SOURCE=2 -O2 -Wall -Werror -Wno-attributes -Wno-deprecated-declarations \ - -Wno-missing-braces -std=c++17 ${SECURE_CXX_FLAGS} ${CMAKE_CXX_FLAGS}") + -Wno-missing-braces ${SECURE_CXX_FLAGS} ${CMAKE_CXX_FLAGS}") set(CMAKE_C_FLAGS_DEBUG "-DDebug -g -fvisibility=default") set(CMAKE_CXX_FLAGS_DEBUG "-DDebug -g -fvisibility=default") diff --git a/mindspore/lite/cmake/secure_option.cmake b/mindspore/lite/cmake/secure_option.cmake index 649cf35e470..2a451e82a39 100644 --- a/mindspore/lite/cmake/secure_option.cmake +++ b/mindspore/lite/cmake/secure_option.cmake @@ -14,8 +14,11 @@ if(MSVC) set(SECURE_EXE_LINKER_FLAGS "/SAFESEH ${CMAKE_EXE_LINKER_FLAGS}") endif() else() - set(SECURE_C_FLAGS "-fPIC -fPIE -fstack-protector-strong") - set(SECURE_CXX_FLAGS "-fPIC -fPIE -fstack-protector-strong") + include(CheckPIESupported) + check_pie_supported() + set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) + set(SECURE_C_FLAGS "-fstack-protector-strong") + set(SECURE_CXX_FLAGS "-fstack-protector-strong") if(WIN32) set(SECURE_SHARED_LINKER_FLAGS "-Wl,--nxcompat -Wl,--dynamicbase -s") set(SECURE_EXE_LINKER_FLAGS "-Wl,--nxcompat -Wl,--dynamicbase -s") diff --git a/mindspore/lite/examples/converter_extend/CMakeLists.txt b/mindspore/lite/examples/converter_extend/CMakeLists.txt index 27b184fd9c3..c5e814afc64 100644 --- a/mindspore/lite/examples/converter_extend/CMakeLists.txt +++ b/mindspore/lite/examples/converter_extend/CMakeLists.txt @@ -6,7 +6,8 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_L message(FATAL_ERROR "GCC version ${CMAKE_CXX_COMPILER_VERSION} must not be less than 7.3.0") endif() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED TRUE) # Add directory to include search path include_directories(${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/mindspore/lite/examples/runtime_cpp/CMakeLists.txt b/mindspore/lite/examples/runtime_cpp/CMakeLists.txt index 51a2a213603..d34fa0e7585 100644 --- a/mindspore/lite/examples/runtime_cpp/CMakeLists.txt +++ b/mindspore/lite/examples/runtime_cpp/CMakeLists.txt @@ -6,7 +6,8 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_L message(FATAL_ERROR "GCC version ${CMAKE_CXX_COMPILER_VERSION} must not be less than 7.3.0") endif() link_directories(${CMAKE_CURRENT_SOURCE_DIR}/lib) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED TRUE) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) file(GLOB_RECURSE RUNTIME_CPP ${CMAKE_CURRENT_SOURCE_DIR}/*.cc) diff --git a/mindspore/lite/examples/runtime_extend/CMakeLists.txt b/mindspore/lite/examples/runtime_extend/CMakeLists.txt index 36e744993ef..556b96c2dbc 100644 --- a/mindspore/lite/examples/runtime_extend/CMakeLists.txt +++ b/mindspore/lite/examples/runtime_extend/CMakeLists.txt @@ -5,7 +5,8 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_L message(FATAL_ERROR "GCC version ${CMAKE_CXX_COMPILER_VERSION} must not be less than 7.3.0") endif() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED TRUE) # Add directory to include search path include_directories(${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/mindspore/lite/examples/runtime_gpu_extend/CMakeLists.txt b/mindspore/lite/examples/runtime_gpu_extend/CMakeLists.txt index 5df86185f6e..fd746a4fc53 100644 --- a/mindspore/lite/examples/runtime_gpu_extend/CMakeLists.txt +++ b/mindspore/lite/examples/runtime_gpu_extend/CMakeLists.txt @@ -11,7 +11,8 @@ add_definitions(-DCL_TARGET_OPENCL_VERSION=200) add_definitions(-DCL_HPP_TARGET_OPENCL_VERSION=120) add_definitions(-DCL_HPP_MINIMUM_OPENCL_VERSION=120) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED TRUE) include(${CMAKE_CURRENT_SOURCE_DIR}/../../../../cmake/utils.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/../../../../cmake/external_libs/opencl.cmake) diff --git a/mindspore/lite/java/native/CMakeLists.txt b/mindspore/lite/java/native/CMakeLists.txt index 561408c997f..62d8e020296 100644 --- a/mindspore/lite/java/native/CMakeLists.txt +++ b/mindspore/lite/java/native/CMakeLists.txt @@ -28,7 +28,8 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMS_VERSION_MAJOR=${MS_VERSION_MAJOR} -DMS_ -DMS_VERSION_REVISION=${MS_VERSION_REVISION}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMS_VERSION_MAJOR=${MS_VERSION_MAJOR} -DMS_VERSION_MINOR=${MS_VERSION_MINOR} \ -DMS_VERSION_REVISION=${MS_VERSION_REVISION}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED TRUE) set(CMAKE_SKIP_BUILD_RPATH on) #set for cross-compiling toolchain diff --git a/mindspore/lite/minddata/CMakeLists.txt b/mindspore/lite/minddata/CMakeLists.txt index c4351546eaf..799dba04fef 100644 --- a/mindspore/lite/minddata/CMakeLists.txt +++ b/mindspore/lite/minddata/CMakeLists.txt @@ -16,7 +16,10 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror -Wno-return-std-move -Wno-unused-lambda-capture -Wno-sign-compare -Wno-overloaded-virtual -Wno-unneeded-internal-declaration \ -Wno-unused-variable -Wno-pessimizing-move -Wno-inconsistent-missing-override") -set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -I/usr/local/include -std=c++17 -Wall -fPIC") +set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -I/usr/local/include -Wall") +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED TRUE) +set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPTION_CXX_FLAGS}") @@ -29,10 +32,13 @@ else() set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -O2 -Wl,--allow-shlib-undefined -DHALF_ENABLE_CPP11_USER_LITERALS=0 \ -D_FORTIFY_SOURCE=2") endif() +include(CheckPIESupported) +check_pie_supported() +set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) -set(CMAKE_C_FLAGS "-fPIC -fPIE -D_FORTIFY_SOURCE=2 -O2 -Wall -Werror -fstack-protector-strong -Wno-attributes \ +set(CMAKE_C_FLAGS "-D_FORTIFY_SOURCE=2 -O2 -Wall -Werror -fstack-protector-strong -Wno-attributes \ -Wno-deprecated-declarations -Wno-missing-braces ${CMAKE_C_FLAGS}") -set(CMAKE_CXX_FLAGS "-fPIC -fPIE -D_FORTIFY_SOURCE=2 -O2 -Wall -Werror -fstack-protector-strong -Wno-attributes \ +set(CMAKE_CXX_FLAGS "-D_FORTIFY_SOURCE=2 -O2 -Wall -Werror -fstack-protector-strong -Wno-attributes \ -Wno-deprecated-declarations -Wno-missing-braces -Wno-overloaded-virtual ${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-non-virtual-dtor") diff --git a/mindspore/lite/minddata/example/CMakeLists.txt b/mindspore/lite/minddata/example/CMakeLists.txt index 7deb5e1a808..2e5956e2058 100644 --- a/mindspore/lite/minddata/example/CMakeLists.txt +++ b/mindspore/lite/minddata/example/CMakeLists.txt @@ -1,8 +1,10 @@ cmake_minimum_required(VERSION 3.14.1) project(testlenet) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -fPIC -std=c++17") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wno-sign-compare") +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED TRUE) +set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) set(MS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/mindspore-lite-1.5.0-linux-x64/runtime") set(LITECV_DIR "${CMAKE_CURRENT_SOURCE_DIR}/mindspore-lite-1.5.0-linux-x64/runtime/include/dataset") diff --git a/mindspore/lite/src/delegate/tensorrt/CMakeLists.txt b/mindspore/lite/src/delegate/tensorrt/CMakeLists.txt index 965d7ed7c2a..779275901f4 100644 --- a/mindspore/lite/src/delegate/tensorrt/CMakeLists.txt +++ b/mindspore/lite/src/delegate/tensorrt/CMakeLists.txt @@ -81,7 +81,4 @@ file(GLOB_RECURSE CUDA_KERNEL_SRC ${CMAKE_CURRENT_SOURCE_DIR}/cuda_impl/*.cu ) set_source_files_properties(${CUDA_KERNEL_SRC} PROPERTIES CUDA_SOURCE_PROPERTY_FORMAT OBJ) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGES} -std=c++14 -fPIC") -SET(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS};-std=c++14;) -cuda_add_library(cuda_kernel_mid STATIC ${CUDA_KERNEL_SRC}) - +add_library(cuda_kernel_mid STATIC ${CUDA_KERNEL_SRC}) diff --git a/mindspore/lite/tools/converter/micro/coder/generator/component/const_blocks/cmake_lists.cc b/mindspore/lite/tools/converter/micro/coder/generator/component/const_blocks/cmake_lists.cc index 455bc1e8d4c..81829a6f0ae 100644 --- a/mindspore/lite/tools/converter/micro/coder/generator/component/const_blocks/cmake_lists.cc +++ b/mindspore/lite/tools/converter/micro/coder/generator/component/const_blocks/cmake_lists.cc @@ -49,7 +49,8 @@ if(PLATFORM_ARM32) endif() set(CMAKE_C_FLAGS "${CMAKE_ENABLE_C99} ${CMAKE_C_FLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED TRUE) if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") message(STATUS "build benchmark with debug info") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDebug -g") @@ -57,10 +58,14 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=default") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default") else() + include(CheckPIESupported) + check_pie_supported() + set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) + message(STATUS "build benchmark release version") - set(CMAKE_C_FLAGS "-fPIC -fPIE -D_FORTIFY_SOURCE=2 -O3 -Wall -Werror -fstack-protector-strong -Wno-attributes \ + set(CMAKE_C_FLAGS "-D_FORTIFY_SOURCE=2 -O3 -Wall -Werror -fstack-protector-strong -Wno-attributes \ -Wno-deprecated-declarations -Wno-missing-braces ${CMAKE_C_FLAGS}") - set(CMAKE_CXX_FLAGS "-fPIC -fPIE -D_FORTIFY_SOURCE=2 -O3 -Wall -Werror -fstack-protector-strong -Wno-attributes \ + set(CMAKE_CXX_FLAGS "-D_FORTIFY_SOURCE=2 -O3 -Wall -Werror -fstack-protector-strong -Wno-attributes \ -Wno-deprecated-declarations -Wno-missing-braces -Wno-overloaded-virtual ${CMAKE_CXX_FLAGS}") string(REPLACE "-g" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") string(REPLACE "-g" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") @@ -132,7 +137,8 @@ if(PLATFORM_ARM32) endif() set(CMAKE_C_FLAGS "${CMAKE_ENABLE_C99} ${CMAKE_C_FLAGS}") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED TRUE) if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") message(STATUS "build net library with debug info") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDebug -g") @@ -140,10 +146,13 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=default") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=default") else() + include(CheckPIESupported) + check_pie_supported() + set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) message(STATUS "build net library release version") - set(CMAKE_C_FLAGS "-fPIC -fPIE -D_FORTIFY_SOURCE=2 -O3 -Wall -Werror -fstack-protector-strong -Wno-attributes \ + set(CMAKE_C_FLAGS "-D_FORTIFY_SOURCE=2 -O3 -Wall -Werror -fstack-protector-strong -Wno-attributes \ -Wno-deprecated-declarations -Wno-missing-braces ${CMAKE_C_FLAGS}") - set(CMAKE_CXX_FLAGS "-fPIC -fPIE -D_FORTIFY_SOURCE=2 -O3 -Wall -Werror -fstack-protector-strong -Wno-attributes \ + set(CMAKE_CXX_FLAGS "-D_FORTIFY_SOURCE=2 -O3 -Wall -Werror -fstack-protector-strong -Wno-attributes \ -Wno-deprecated-declarations -Wno-missing-braces -Wno-overloaded-virtual ${CMAKE_CXX_FLAGS}") string(REPLACE "-g" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") string(REPLACE "-g" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") diff --git a/mindspore/lite/tools/dataset/cropper/CMakeLists.txt b/mindspore/lite/tools/dataset/cropper/CMakeLists.txt index 217896854cb..697a246c0fe 100644 --- a/mindspore/lite/tools/dataset/cropper/CMakeLists.txt +++ b/mindspore/lite/tools/dataset/cropper/CMakeLists.txt @@ -2,7 +2,12 @@ cmake_minimum_required(VERSION 3.14.0) project(MinddataCropper) add_compile_definitions(_GLIBCXX_USE_CXX11_ABI=0) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -fPIE -fPIC -Wl,--allow-shlib-undefined -s") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--allow-shlib-undefined -s") +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED TRUE) +include(CheckPIESupported) +check_pie_supported() +set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) file(GLOB minddata_OBJ CONFIGURE_DEPENDS "tmp/*.o")