From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jul 2022 15:43:36 +0100 Subject: gentoo resync : 09.07.2022 --- sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch | 61 +++++++-- .../caffe2/files/caffe2-1.12.0-install-dirs.patch | 147 +++++++++++++++++++++ 2 files changed, 197 insertions(+), 11 deletions(-) create mode 100644 sci-libs/caffe2/files/caffe2-1.12.0-install-dirs.patch (limited to 'sci-libs/caffe2/files') diff --git a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch index ac74edadab35..505af5e6695c 100644 --- a/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch +++ b/sci-libs/caffe2/files/caffe2-1.11.0-gentoo.patch @@ -80,14 +80,53 @@ if("${CMAKE_BUILD_TYPE}" MATCHES "Debug") set(OPT_FLAG " ") endif() ---- a/c10/CMakeLists.txt 2022-06-19 09:57:16.776536871 +0200 -+++ b/c10/CMakeLists.txt 2022-06-19 09:58:51.663356075 +0200 -@@ -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/caffe2/CMakeLists.txt 2022-07-01 21:56:49.643490049 +0200 ++++ b/caffe2/CMakeLists.txt 2022-07-01 21:57:17.091489479 +0200 +@@ -109,7 +109,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 "") +@@ -967,7 +967,6 @@ + endif() + + if(NOT MSVC AND USE_XNNPACK) +- TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv) + endif() + + # ========================================================== +--- a/cmake/External/nnpack.cmake 2022-07-02 21:56:54.905696921 +0200 ++++ b/cmake/External/nnpack.cmake 2022-07-02 21:57:03.665696739 +0200 +@@ -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 new file mode 100644 index 000000000000..d9c403d5882e --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-1.12.0-install-dirs.patch @@ -0,0 +1,147 @@ +--- a/c10/CMakeLists.txt 2022-06-19 09:57:16.776536871 +0200 ++++ b/c10/CMakeLists.txt 2022-06-19 09:58:51.663356075 +0200 +@@ -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") +diff --git a/c10/cuda/CMakeLists.txt b/c10/cuda/CMakeLists.txt +index a95bd278e2..4a33b4e4ed 100644 +--- 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} ) +diff --git a/c10/hip/CMakeLists.txt b/c10/hip/CMakeLists.txt +index 6a0e0e41a1..7582c73919 100644 +--- 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") +diff --git a/modules/detectron/CMakeLists.txt b/modules/detectron/CMakeLists.txt +index bffc074e39..e1697e65f2 100644 +--- 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 $ 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 $ DESTINATION lib OPTIONAL) + endif() +diff --git a/modules/module_test/CMakeLists.txt b/modules/module_test/CMakeLists.txt +index f72120d535..c293ce025d 100644 +--- 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 $ DESTINATION lib OPTIONAL) + endif() +diff --git a/modules/observers/CMakeLists.txt b/modules/observers/CMakeLists.txt +index 050b8a1461..0309a273b7 100644 +--- 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 $ DESTINATION lib OPTIONAL) +diff --git a/modules/rocksdb/CMakeLists.txt b/modules/rocksdb/CMakeLists.txt +index 78651989aa..52bfd149a2 100644 +--- 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. +diff --git a/test/cpp/c10d/CMakeLists.txt b/test/cpp/c10d/CMakeLists.txt +index bf91460c4b..ebbd476fa9 100644 +--- 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() +diff --git a/test/cpp/jit/CMakeLists.txt b/test/cpp/jit/CMakeLists.txt +index 60b43b81fc..9cf34a1620 100644 +--- 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. +diff --git a/torch/csrc/deploy/CMakeLists.txt b/torch/csrc/deploy/CMakeLists.txt +index 61fe8c1bb8..28575979dd 100644 +--- 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}) -- cgit v1.2.3