diff --git a/CMakeLists.txt b/CMakeLists.txt index c4763032ae0..b7e721596e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,10 +19,9 @@ if(NOT CMAKE_SYSTEM_NAME MATCHES "Windows") endif() if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -O2 -Winconsistent-missing-override -Wno-user-defined-warnings \ - -Wno-return-std-move -Wno-unused-private-field -Wno-unused-lambda-capture -Wno-sign-compare \ - -Wno-overloaded-virtual -Wno-unneeded-internal-declaration -Wno-unused-variable -Wno-pessimizing-move \ - -Wno-inconsistent-missing-override -DHALF_ENABLE_CPP11_USER_LITERALS=0 -D_FORTIFY_SOURCE=2") + set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -O2 -Wno-inconsistent-missing-override \ + -Wno-unused-lambda-capture -Wno-unneeded-internal-declaration -Wno-unused-variable \ + -Wno-return-std-move -DHALF_ENABLE_CPP11_USER_LITERALS=0 -D_FORTIFY_SOURCE=2") elseif(ENABLE_SYM_FILE) set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -O2 -g -ggdb -Wl,--allow-shlib-undefined \ -DHALF_ENABLE_CPP11_USER_LITERALS=0 -D_FORTIFY_SOURCE=2") @@ -35,9 +34,16 @@ if(ENABLE_PYTHON) add_compile_definitions(ENABLE_PYTHON) endif() -set(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -O0 -g2 -ggdb -fno-inline-functions -fno-omit-frame-pointer \ - -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") +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -O0 -g2 -ggdb -fno-inline-functions -fno-omit-frame-pointer \ + -D_LIBCPP_INLINE_VISIBILITY='' -D_LIBCPP_DISABLE_EXTERN_TEMPLATE=1 -DHALF_ENABLE_CPP11_USER_LITERALS=0 \ + -D_FORTIFY_SOURCE=2 -Wno-cpp -Wno-inconsistent-missing-override -Wno-unused-lambda-capture \ + -Wno-unneeded-internal-declaration -Wno-unused-variable -Wno-return-std-move") +else() + set(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -O0 -g2 -ggdb -fno-inline-functions -fno-omit-frame-pointer \ + -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") +endif() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/local/include -std=c++17 \ -Werror -Wall -Wno-deprecated-declarations -fPIC") diff --git a/cmake/package_mac.cmake b/cmake/package_mac.cmake index 609b144c1d9..df154a72e77 100644 --- a/cmake/package_mac.cmake +++ b/cmake/package_mac.cmake @@ -198,6 +198,7 @@ install( ${CMAKE_SOURCE_DIR}/mindspore/python/mindspore/communication ${CMAKE_SOURCE_DIR}/mindspore/python/mindspore/profiler ${CMAKE_SOURCE_DIR}/mindspore/python/mindspore/compression + ${CMAKE_SOURCE_DIR}/mindspore/python/mindspore/rewrite ${CMAKE_SOURCE_DIR}/mindspore/python/mindspore/run_check DESTINATION ${INSTALL_PY_DIR} COMPONENT mindspore diff --git a/mindspore/ccsrc/plugin/device/cpu/kernel/fractional_max_pool_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/fractional_max_pool_cpu_kernel.cc index 3988d66eebf..d9918014a0a 100644 --- a/mindspore/ccsrc/plugin/device/cpu/kernel/fractional_max_pool_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fractional_max_pool_cpu_kernel.cc @@ -116,8 +116,7 @@ static std::vector GeneratePoolingSequenceRandom(size_t input_length, s for (size_t i = 0; i < num_random_spot; ++i) { diff[i] += 1; } - std::srand(seed); - random_shuffle(diff.begin(), diff.end()); + std::shuffle(diff.begin(), diff.end(), std::default_random_engine(seed)); return diff; } }