diff options
Diffstat (limited to 'sci-libs/caffe2/files')
-rw-r--r-- | sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch | 168 | ||||
-rw-r--r-- | sci-libs/caffe2/files/caffe2-1.12.0-install-dirs.patch | 129 |
2 files changed, 0 insertions, 297 deletions
diff --git a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch deleted file mode 100644 index 67d4281c8b95..000000000000 --- a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch +++ /dev/null @@ -1,168 +0,0 @@ ---- a/cmake/Dependencies.cmake -+++ b/cmake/Dependencies.cmake -@@ -1523,7 +1523,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) -@@ -1821,7 +1820,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`. - # -@@ -1830,9 +1828,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 -@@ -62,7 +62,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 -@@ -86,7 +86,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 -@@ -777,7 +777,7 @@ - - # ---[ 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 -@@ -783,7 +783,6 @@ - # Details at http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1459 - string(APPEND CMAKE_CXX_FLAGS " -Wall") - string(APPEND CMAKE_CXX_FLAGS " -Wextra") -- string(APPEND CMAKE_CXX_FLAGS " -Werror=return-type") - string(APPEND CMAKE_CXX_FLAGS " -Wno-missing-field-initializers") - string(APPEND CMAKE_CXX_FLAGS " -Wno-type-limits") - string(APPEND CMAKE_CXX_FLAGS " -Wno-array-bounds") -@@ -883,11 +882,9 @@ - string(APPEND CMAKE_CXX_FLAGS " -fno-trapping-math") - check_cxx_compiler_flag("-Werror=format" HAS_WERROR_FORMAT) - if(HAS_WERROR_FORMAT) -- string(APPEND CMAKE_CXX_FLAGS " -Werror=format") - endif() - check_cxx_compiler_flag("-Werror=cast-function-type" HAS_WERROR_CAST_FUNCTION_TYPE) - if(HAS_WERROR_CAST_FUNCTION_TYPE) -- string(APPEND CMAKE_CXX_FLAGS " -Werror=cast-function-type") - endif() - check_cxx_compiler_flag("-Werror=sign-compare" HAS_WERROR_SIGN_COMPARE) - # This doesn't work globally so we use the test on specific ---- a/cmake/public/utils.cmake -+++ b/cmake/public/utils.cmake -@@ -510,8 +510,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 "") -@@ -557,7 +557,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() - - # ========================================================== ---- 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") diff --git a/sci-libs/caffe2/files/caffe2-1.12.0-install-dirs.patch b/sci-libs/caffe2/files/caffe2-1.12.0-install-dirs.patch deleted file mode 100644 index 078e33f45020..000000000000 --- a/sci-libs/caffe2/files/caffe2-1.12.0-install-dirs.patch +++ /dev/null @@ -1,129 +0,0 @@ ---- a/c10/CMakeLists.txt -+++ b/c10/CMakeLists.txt -@@ -107,7 +107,7 @@ - # Note: for now, we will put all export path into one single Caffe2Targets group - # to deal with the cmake deployment need. Inside the Caffe2Targets set, the - # individual libraries like libc10.so and libcaffe2.so are still self-contained. --install(TARGETS c10 EXPORT Caffe2Targets DESTINATION lib) -+install(TARGETS c10 EXPORT Caffe2Targets DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} - DESTINATION include - FILES_MATCHING PATTERN "*.h") ---- a/c10/cuda/CMakeLists.txt -+++ b/c10/cuda/CMakeLists.txt -@@ -63,7 +63,7 @@ add_subdirectory(test) - # Note: for now, we will put all export path into one single Caffe2Targets group - # to deal with the cmake deployment need. Inside the Caffe2Targets set, the - # individual libraries like libc10.so and libcaffe2.so are still self-contained. --install(TARGETS c10_cuda EXPORT Caffe2Targets DESTINATION lib) -+install(TARGETS c10_cuda EXPORT Caffe2Targets DESTINATION ${CMAKE_INSTALL_LIBDIR}) - foreach(file ${C10_CUDA_HEADERS}) - get_filename_component( dir ${file} DIRECTORY ) - install( FILES ${file} DESTINATION include/c10/cuda/${dir} ) ---- a/c10/hip/CMakeLists.txt -+++ b/c10/hip/CMakeLists.txt -@@ -55,7 +55,7 @@ target_include_directories( - add_subdirectory(test) - - # ---[ Installation --install(TARGETS c10_hip EXPORT Caffe2Targets DESTINATION lib) -+install(TARGETS c10_hip EXPORT Caffe2Targets DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR} - DESTINATION include - FILES_MATCHING PATTERN "*.h") ---- a/modules/detectron/CMakeLists.txt -+++ b/modules/detectron/CMakeLists.txt -@@ -17,7 +17,7 @@ if(BUILD_CAFFE2_OPS) - - torch_set_target_props(caffe2_detectron_ops_gpu) - target_link_libraries(caffe2_detectron_ops_gpu torch ${OpenMP_link}) -- install(TARGETS caffe2_detectron_ops_gpu DESTINATION lib) -+ install(TARGETS caffe2_detectron_ops_gpu DESTINATION ${CMAKE_INSTALL_LIBDIR}) - if(MSVC) - install(FILES $<TARGET_PDB_FILE:caffe2_detectron_ops_gpu> DESTINATION lib OPTIONAL) - endif() -@@ -31,7 +31,7 @@ if(BUILD_CAFFE2_OPS) - torch_set_target_props(caffe2_detectron_ops_hip) - target_compile_options(caffe2_detectron_ops_hip PRIVATE ${HIP_CXX_FLAGS}) - target_link_libraries(caffe2_detectron_ops_hip torch) -- install(TARGETS caffe2_detectron_ops_hip DESTINATION lib) -+ install(TARGETS caffe2_detectron_ops_hip DESTINATION ${CMAKE_INSTALL_LIBDIR}) - elseif(NOT IOS_PLATFORM) - add_library(caffe2_detectron_ops SHARED ${Detectron_CPU_SRCS}) - if(HAVE_SOVERSION) -@@ -40,7 +40,7 @@ if(BUILD_CAFFE2_OPS) - endif() - torch_set_target_props(caffe2_detectron_ops) - target_link_libraries(caffe2_detectron_ops torch ${OpenMP_link}) -- install(TARGETS caffe2_detectron_ops DESTINATION lib) -+ install(TARGETS caffe2_detectron_ops DESTINATION ${CMAKE_INSTALL_LIBDIR}) - if(MSVC) - install(FILES $<TARGET_PDB_FILE:caffe2_detectron_ops> DESTINATION lib OPTIONAL) - endif() ---- a/modules/module_test/CMakeLists.txt -+++ b/modules/module_test/CMakeLists.txt -@@ -16,7 +16,7 @@ if(BUILD_TEST AND NOT BUILD_LITE_INTERPRETER) - VERSION ${TORCH_VERSION} SOVERSION ${TORCH_SOVERSION}) - endif() - target_link_libraries(caffe2_module_test_dynamic torch_library) -- install(TARGETS caffe2_module_test_dynamic DESTINATION lib) -+ install(TARGETS caffe2_module_test_dynamic DESTINATION ${CMAKE_INSTALL_LIBDIR}) - if(MSVC AND BUILD_SHARED_LIBS) - install(FILES $<TARGET_PDB_FILE:caffe2_module_test_dynamic> DESTINATION lib OPTIONAL) - endif() ---- a/modules/observers/CMakeLists.txt -+++ b/modules/observers/CMakeLists.txt -@@ -21,7 +21,7 @@ endif() - target_link_libraries(caffe2_observers PUBLIC torch_library) - target_include_directories(caffe2_observers PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..) - target_compile_options(caffe2_observers PRIVATE "-DCAFFE2_BUILD_OBSERVER_LIB") --install(TARGETS caffe2_observers DESTINATION lib) -+install(TARGETS caffe2_observers DESTINATION ${CMAKE_INSTALL_LIBDIR}) - caffe2_interface_library(caffe2_observers caffe2_observers_library) - if(MSVC AND BUILD_SHARED_LIBS) - install(FILES $<TARGET_PDB_FILE:caffe2_observers> DESTINATION lib OPTIONAL) ---- a/modules/rocksdb/CMakeLists.txt -+++ b/modules/rocksdb/CMakeLists.txt -@@ -59,7 +59,7 @@ add_library(caffe2_rocksdb ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb.cc) - target_link_libraries(caffe2_rocksdb PUBLIC torch_library) - target_link_libraries(caffe2_rocksdb PRIVATE ${RocksDB_LIBRARIES}) - target_include_directories(caffe2_rocksdb PRIVATE ${RocksDB_INCLUDE_DIR}) --install(TARGETS caffe2_rocksdb DESTINATION lib) -+install(TARGETS caffe2_rocksdb DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - # ---[ Last, Append the library to Caffe2_MODULES, if we are building with - # the main repo. ---- a/test/cpp/c10d/CMakeLists.txt -+++ b/test/cpp/c10d/CMakeLists.txt -@@ -51,7 +51,7 @@ if(USE_CUDA) - if(INSTALL_TEST) - install(TARGETS ProcessGroupNCCLTest DESTINATION bin) - install(TARGETS ProcessGroupNCCLErrorsTest DESTINATION bin) -- install(TARGETS c10d_cuda_test DESTINATION lib) -+ install(TARGETS c10d_cuda_test DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - endif() - else() ---- a/test/cpp/jit/CMakeLists.txt -+++ b/test/cpp/jit/CMakeLists.txt -@@ -32,9 +32,9 @@ endif() - target_link_libraries(backend_with_compiler torch) - - if(INSTALL_TEST) -- install(TARGETS torchbind_test DESTINATION lib) -- install(TARGETS jitbackend_test DESTINATION lib) -- install(TARGETS backend_with_compiler DESTINATION lib) -+ install(TARGETS torchbind_test DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ install(TARGETS jitbackend_test DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ install(TARGETS backend_with_compiler DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - - # Build the cpp gtest binary containing the cpp-only tests. ---- a/torch/csrc/deploy/CMakeLists.txt -+++ b/torch/csrc/deploy/CMakeLists.txt -@@ -80,4 +80,4 @@ if(INSTALL_TEST) - install(TARGETS test_deploy_gpu DESTINATION bin) - endif() - --install(TARGETS torch_deploy DESTINATION lib) -+install(TARGETS torch_deploy DESTINATION ${CMAKE_INSTALL_LIBDIR}) |