diff options
Diffstat (limited to 'sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch')
| -rw-r--r-- | sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch | 224 |
1 files changed, 224 insertions, 0 deletions
diff --git a/sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch b/sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch new file mode 100644 index 000000000000..a2771e3319d8 --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch @@ -0,0 +1,224 @@ +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -1557,7 +1557,6 @@ + if(NOT USE_SYSTEM_ONNX) + add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/onnx EXCLUDE_FROM_ALL) + endif() +- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/foxi EXCLUDE_FROM_ALL) + + add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE}) + if(NOT USE_SYSTEM_ONNX) +@@ -1850,7 +1849,6 @@ + # + set(TEMP_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) + set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE) +-add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/fmt) + + # Disable compiler feature checks for `fmt`. + # +@@ -1859,9 +1857,7 @@ + # CMAKE_CXX_FLAGS in ways that break feature checks. Since we already know + # `fmt` is compatible with a superset of the compilers that PyTorch is, it + # shouldn't be too bad to just disable the checks. +-set_target_properties(fmt-header-only PROPERTIES INTERFACE_COMPILE_FEATURES "") + +-list(APPEND Caffe2_DEPENDENCY_LIBS fmt::fmt-header-only) + set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE) + + # ---[ Kineto +--- a/c10/CMakeLists.txt ++++ b/c10/CMakeLists.txt +@@ -64,7 +64,7 @@ + if(${USE_GLOG}) + target_link_libraries(c10 PUBLIC glog::glog) + endif() +-target_link_libraries(c10 PRIVATE fmt::fmt-header-only) ++target_link_libraries(c10 PRIVATE fmt) + + find_package(Backtrace) + if(Backtrace_FOUND) +--- a/torch/CMakeLists.txt ++++ b/torch/CMakeLists.txt +@@ -66,15 +66,9 @@ + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/aten/src + ${CMAKE_BINARY_DIR}/caffe2/aten/src +- ${CMAKE_BINARY_DIR}/third_party +- ${CMAKE_BINARY_DIR}/third_party/onnx + +- ${TORCH_ROOT}/third_party/valgrind-headers + +- ${TORCH_ROOT}/third_party/gloo +- ${TORCH_ROOT}/third_party/onnx +- ${TORCH_ROOT}/third_party/flatbuffers/include +- ${TORCH_ROOT}/third_party/kineto/libkineto/include ++ /usr/include/kineto + + ${TORCH_SRC_DIR}/csrc + ${TORCH_SRC_DIR}/csrc/api/include +@@ -87,7 +81,6 @@ + python::python + pybind::pybind11 + shm +- fmt::fmt-header-only + ATEN_CPU_FILES_GEN_LIB) + + set(TORCH_PYTHON_COMPILE_DEFINITIONS) +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -817,13 +817,12 @@ + + # ---[ Build flags + if(NOT MSVC) +- string(APPEND CMAKE_CXX_FLAGS " -O2 -fPIC") ++ string(APPEND CMAKE_CXX_FLAGS " -fPIC") + string(APPEND CMAKE_CXX_FLAGS " -Wno-narrowing") + # Eigen fails to build with some versions, so convert this to a warning + # Details at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1459 + string(APPEND CMAKE_CXX_FLAGS " -Wall") + string(APPEND CMAKE_CXX_FLAGS " -Wextra") +- append_cxx_flag_if_supported("-Werror=return-type" CMAKE_CXX_FLAGS) + append_cxx_flag_if_supported("-Werror=non-virtual-dtor" CMAKE_CXX_FLAGS) + append_cxx_flag_if_supported("-Wno-missing-field-initializers" CMAKE_CXX_FLAGS) + append_cxx_flag_if_supported("-Wno-type-limits" CMAKE_CXX_FLAGS) +@@ -925,8 +924,6 @@ + string(APPEND CMAKE_LINKER_FLAGS_DEBUG " -fno-omit-frame-pointer -O0") + 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) + check_cxx_compiler_flag("-Werror=sign-compare" HAS_WERROR_SIGN_COMPARE) + # This doesn't work globally so we use the test on specific + # target_compile_options +--- a/cmake/public/utils.cmake ++++ b/cmake/public/utils.cmake +@@ -507,8 +507,6 @@ + endif() + + # Use -O2 for release builds (-O3 doesn't improve perf, and -Os results in perf regression) +- target_compile_options(${libname} PRIVATE +- $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<OR:$<CONFIG:Release>,$<CONFIG:RelWithDebInfo>>>:-O2>) + + endfunction() + +--- a/cmake/Codegen.cmake ++++ b/cmake/Codegen.cmake +@@ -57,7 +57,7 @@ + if(MSVC) + set(OPT_FLAG "/fp:strict ") + else(MSVC) +- set(OPT_FLAG "-O3 ") ++ set(OPT_FLAG " ") + if("${CMAKE_BUILD_TYPE}" MATCHES "Debug") + set(OPT_FLAG " ") + endif() +--- a/caffe2/CMakeLists.txt ++++ b/caffe2/CMakeLists.txt +@@ -111,7 +111,7 @@ + # Note: the folders that are being commented out have not been properly + # addressed yet. + +-if(NOT MSVC AND USE_XNNPACK) ++if(FALSE) + if(NOT TARGET fxdiv) + set(FXDIV_BUILD_TESTS OFF CACHE BOOL "") + set(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "") +@@ -537,7 +537,6 @@ + if(NOT MSVC) + set_source_files_properties(${TORCH_SRC_DIR}/csrc/jit/tensorexpr/llvm_jit.cpp PROPERTIES COMPILE_FLAGS -Wno-noexcept-type) + # Force -Werror on several files +- set_source_files_properties(${CMAKE_CURRENT_LIST_DIR}/../aten/src/ATen/native/mkldnn/Pooling.cpp PROPERTIES COMPILE_FLAGS "-Werror") + endif() + # Disable certain warnings for GCC-9.X + if(CMAKE_COMPILER_IS_GNUCXX AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0.0)) +@@ -825,7 +824,6 @@ + torch_compile_options(torch_cpu) # see cmake/public/utils.cmake + if(HAS_WERROR_SIGN_COMPARE AND WERROR) + # target_compile_options(torch_cpu PRIVATE "-Werror=sign-compare") +- set_property(SOURCE ${ATen_CORE_SRCS} ${ATen_CPU_SRCS} APPEND PROPERTY COMPILE_OPTIONS "-Werror=sign-compare") + endif() + + set_property(SOURCE ${ATen_CORE_SRCS} APPEND +@@ -1017,7 +1015,6 @@ + endif() + + if(NOT MSVC AND USE_XNNPACK) +- TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv) + endif() + + # ========================================================== +@@ -1136,8 +1133,7 @@ + target_include_directories(torch_cpu PRIVATE + ${TORCH_ROOT}/third_party/miniz-2.1.0) + +-target_include_directories(torch_cpu PRIVATE +- ${TORCH_ROOT}/third_party/kineto/libkineto/include) ++target_include_directories(torch_cpu PRIVATE /usr/include/kineto) + + if(USE_KINETO) + target_include_directories(torch_cpu PRIVATE +--- a/cmake/External/nnpack.cmake ++++ b/cmake/External/nnpack.cmake +@@ -58,7 +58,7 @@ + set(PTHREADPOOL_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/pthreadpool" CACHE STRING "pthreadpool source directory") + set(GOOGLETEST_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/googletest" CACHE STRING "Google Test source directory") + +- if(NOT TARGET nnpack) ++ if(FALSE) + if(NOT USE_SYSTEM_PTHREADPOOL AND USE_INTERNAL_PTHREADPOOL_IMPL) + set(NNPACK_CUSTOM_THREADPOOL ON CACHE BOOL "") + endif() +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -481,7 +481,7 @@ endif() + list(APPEND Caffe2_DEPENDENCY_LIBS cpuinfo) + + # ---[ QNNPACK +-if(USE_QNNPACK) ++if(FALSE) + set(CAFFE2_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party") + + if(NOT DEFINED QNNPACK_SOURCE_DIR) +@@ -537,7 +537,7 @@ if(USE_QNNPACK) + endif() + + # ---[ Caffe2 Int8 operators (enabled by USE_QNNPACK) depend on gemmlowp and neon2sse headers +-if(USE_QNNPACK) ++if(FALSE) + set(CAFFE2_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party") + include_directories(SYSTEM "${CAFFE2_THIRD_PARTY_ROOT}/gemmlowp") + include_directories(SYSTEM "${CAFFE2_THIRD_PARTY_ROOT}/neon2sse") +--- a/torch/csrc/Exceptions.cpp 2023-02-13 12:46:54.447013004 +0100 ++++ b/torch/csrc/Exceptions.cpp 2023-02-13 12:50:18.433791791 +0100 +@@ -1,11 +1,10 @@ + #include <torch/csrc/Exceptions.h> + #include <torch/csrc/python_headers.h> + ++#include <array> + #include <cstdarg> + #include <exception> +-#include <sstream> + #include <utility> +-#include <vector> + + #include <fmt/format.h> + #include <torch/csrc/THP.h> +@@ -259,15 +258,12 @@ + } else { + // Lets Python set the source location and puts the C++ warning + // location into the message. +- fmt::memory_buffer buf; +- fmt::format_to( +- buf, +- FMT_STRING("{} (Triggered internally at {}:{}.)"), ++ auto buf = fmt::format( ++ "{} (Triggered internally at {}:{}.)", + msg, + source_location.file, + source_location.line); +- buf.push_back('\0'); +- result = PyErr_WarnEx(PyExc_UserWarning, buf.data(), 1); ++ result = PyErr_WarnEx(PyExc_UserWarning, buf.c_str(), 1); + } + if (result < 0) { + if (in_exception_) { |