forked from Lainports/opnsense-ports
57 lines
3.1 KiB
Text
57 lines
3.1 KiB
Text
--- CMakeLists.txt.orig 2023-12-15 02:03:27 UTC
|
|
+++ CMakeLists.txt
|
|
@@ -139,7 +139,7 @@ set(CPU_INTEL OFF)
|
|
set(CPU_AARCH64 OFF)
|
|
set(CPU_INTEL OFF)
|
|
|
|
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "(AMD64|x86_64)")
|
|
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "(amd64|x86_64)")
|
|
set(CPU_INTEL ON)
|
|
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64)")
|
|
set(CPU_AARCH64 ON)
|
|
@@ -164,7 +164,7 @@ option(BUILD_DOCS "Build Caffe2 documentation" OFF)
|
|
option(ATEN_NO_TEST "Do not build ATen test binaries" 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 "Master flag to build Caffe2" OFF)
|
|
option(BUILD_LITE_INTERPRETER "Master flag to build Lite Interpreter" OFF)
|
|
@@ -224,7 +224,7 @@ option(USE_LEVELDB "Use LEVELDB" OFF)
|
|
option(USE_GFLAGS "Use GFLAGS" OFF)
|
|
option(USE_GLOG "Use GLOG" OFF)
|
|
option(USE_LEVELDB "Use LEVELDB" OFF)
|
|
-option(USE_LITE_PROTO "Use lite protobuf instead of full." OFF)
|
|
+option(USE_LITE_PROTO "Use lite protobuf instead of full." ON) # use lite protobuf to workaround for protobuf-related failure described here: https://github.com/onnx/optimizer/issues/38
|
|
option(USE_LMDB "Use LMDB" OFF)
|
|
option(USE_MAGMA "Use MAGMA" ON)
|
|
option(USE_METAL "Use Metal for Caffe2 iOS build" ON)
|
|
@@ -408,15 +408,15 @@ option(USE_SYSTEM_CPUINFO "Use system-provided cpuinfo
|
|
# USE_SYSTEM_LIBS being "OFF".
|
|
option(USE_SYSTEM_LIBS "Use all available system-provided libraries." OFF)
|
|
option(USE_SYSTEM_CPUINFO "Use system-provided cpuinfo." OFF)
|
|
-option(USE_SYSTEM_SLEEF "Use system-provided sleef." OFF)
|
|
+option(USE_SYSTEM_SLEEF "Use system-provided sleef." ON)
|
|
option(USE_SYSTEM_GLOO "Use system-provided gloo." OFF)
|
|
option(USE_SYSTEM_FP16 "Use system-provided fp16." OFF)
|
|
-option(USE_SYSTEM_PYBIND11 "Use system-provided PyBind11." OFF)
|
|
+option(USE_SYSTEM_PYBIND11 "Use system-provided PyBind11." ON)
|
|
option(USE_SYSTEM_PTHREADPOOL "Use system-provided pthreadpool." OFF)
|
|
option(USE_SYSTEM_PSIMD "Use system-provided psimd." OFF)
|
|
option(USE_SYSTEM_FXDIV "Use system-provided fxdiv." OFF)
|
|
option(USE_SYSTEM_BENCHMARK "Use system-provided google benchmark." OFF)
|
|
-option(USE_SYSTEM_ONNX "Use system-provided onnx." OFF)
|
|
+option(USE_SYSTEM_ONNX "Use system-provided onnx." ON)
|
|
option(USE_SYSTEM_XNNPACK "Use system-provided xnnpack." OFF)
|
|
option(USE_SYSTEM_ZSTD "Use system-provided zstd." OFF)
|
|
option(USE_GOLD_LINKER "Use ld.gold to link" OFF)
|
|
@@ -918,7 +918,7 @@ if(NOT MSVC)
|
|
append_cxx_flag_if_supported("-fno-math-errno" CMAKE_CXX_FLAGS)
|
|
append_cxx_flag_if_supported("-fno-trapping-math" CMAKE_CXX_FLAGS)
|
|
append_cxx_flag_if_supported("-Werror=format" CMAKE_CXX_FLAGS)
|
|
- append_cxx_flag_if_supported("-Werror=cast-function-type" CMAKE_CXX_FLAGS)
|
|
+ #append_cxx_flag_if_supported("-Werror=cast-function-type" CMAKE_CXX_FLAGS) # workaround for https://github.com/pytorch/pytorch/issues/116416
|
|
else()
|
|
# skip unwanted includes from windows.h
|
|
add_compile_definitions(WIN32_LEAN_AND_MEAN)
|