From 80993cc82764264b3809847029a2d3c563148590 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Wed, 12 Jun 2019 09:50:22 +0200 Subject: [PATCH 1/2] fix build options --- CMakeLists.txt | 2 +- setup.py | 2 -- tools/build_pytorch_libs.py | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 71f8b69..1585d77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,7 @@ option(BUILD_ATEN_MOBILE "Build ATen for Android and iOS" OFF) option(BUILD_ATEN_ONLY "Build only a subset focused on ATen only" OFF) option(BUILD_BINARY "Build C++ binaries" OFF) option(BUILD_DOCS "Build Caffe2 documentation" OFF) -option(BUILD_CUSTOM_PROTOBUF "Build and use Caffe2's own protobuf under third_party" ON) +option(BUILD_CUSTOM_PROTOBUF "Build and use Caffe2's own protobuf under third_party" OFF) option(BUILD_PYTHON "Build Python binaries" ON) option(BUILD_CAFFE2_OPS "Build Caffe2 operators" ON) option(BUILD_SHARED_LIBS "Build libcaffe2.so" ON) diff --git a/setup.py b/setup.py index b1faf3a..9536549 100644 --- a/setup.py +++ b/setup.py @@ -272,8 +272,6 @@ def build_deps(): check_file(os.path.join(third_party_path, 'cpuinfo', 'CMakeLists.txt')) check_file(os.path.join(third_party_path, 'onnx', 'CMakeLists.txt')) check_file(os.path.join(third_party_path, 'foxi', 'CMakeLists.txt')) - check_file(os.path.join(third_party_path, 'QNNPACK', 'CMakeLists.txt')) - check_file(os.path.join(third_party_path, 'fbgemm', 'CMakeLists.txt')) check_pydep('yaml', 'pyyaml') check_pydep('typing', 'typing') diff --git a/tools/build_pytorch_libs.py b/tools/build_pytorch_libs.py index 432fed3..257e9f2 100644 --- a/tools/build_pytorch_libs.py +++ b/tools/build_pytorch_libs.py @@ -190,7 +190,7 @@ def run_cmake(version, USE_QNNPACK=USE_QNNPACK, USE_TENSORRT=check_env_flag('USE_TENSORRT'), USE_FFMPEG=check_env_flag('USE_FFMPEG'), - USE_SYSTEM_EIGEN_INSTALL="OFF", + USE_SYSTEM_EIGEN_INSTALL=True, USE_MKLDNN=USE_MKLDNN, USE_NCCL=USE_NCCL, NCCL_EXTERNAL=USE_NCCL, -- 2.16.4