OSSForks/pytorch
1
0
Fork 0
mirror of https://github.com/zebrajr/pytorch.git synced 2025-12-06 12:20:52 +01:00
Code Issues Actions 38 Packages Projects Releases Wiki Activity

Fix Pytorch Mac build issues (#9283)

Browse Source 
Summary:
Breaking this out of #8338

This fixed Mac build issues after BUILD_CAFFE2 and BUILD_ATEN are removed.

cc orionr
Pull Request resolved: https://github.com/pytorch/pytorch/pull/9283

Reviewed By: orionr

Differential Revision: D8773459

Pulled By: mingzhe09088

fbshipit-source-id: 71942e8e6891a625e6b1a7dc0160e87444c64209
This commit is contained in:
Mingzhe Li 2018-07-09 15:34:11 -07:00 committed by Facebook Github Bot
parent 29b1c2cfce
commit 01a7ca3d64
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -219,9 +219,13 @@ if(NOT MSVC)
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")
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)))
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")
endif()
if ($ENV{WERROR})

2
caffe2/core/net_async_polling.h
View File

@ -37,7 +37,7 @@ class AsyncPollingNet : public AsyncNetBase {
// Polling
std::vector<EventStatus> status_;
void reset();
void reset() override;
std::atomic<bool> has_chain_failed_;
DISABLE_COPY_AND_ASSIGN(AsyncPollingNet);