diff options
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/Manifest.gz | bin | 43597 -> 43595 bytes | |||
-rw-r--r-- | sci-libs/caffe2/Manifest | 4 | ||||
-rw-r--r-- | sci-libs/caffe2/caffe2-1.13.0.ebuild | 168 | ||||
-rw-r--r-- | sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch | 224 | ||||
-rw-r--r-- | sci-libs/caffe2/files/caffe2-1.13.0-install-dirs.patch | 121 | ||||
-rw-r--r-- | sci-libs/pytorch/Manifest | 3 | ||||
-rw-r--r-- | sci-libs/pytorch/files/pytorch-1.13.0-setup.patch | 11 | ||||
-rw-r--r-- | sci-libs/pytorch/pytorch-1.13.0.ebuild | 63 |
8 files changed, 594 insertions, 0 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz Binary files differindex 648c8eaa40e5..ca5b7e4c741f 100644 --- a/sci-libs/Manifest.gz +++ b/sci-libs/Manifest.gz diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest index 467f0c7ac48f..3b6eb481eaf9 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -2,8 +2,12 @@ AUX caffe2-1.11.0-gentoo.patch 6098 BLAKE2B 5fbbfe3fbe4f0cf6c9e8e7ecb4b373552742 AUX caffe2-1.12.0-clang.patch 1727 BLAKE2B 04f3b63dde1da4670e762fb5c9127edd88c0b3ca518eacdfd5a951c23d4175451326321749ac94c982494def69aa23829f95ae546d16c196458b7a6d094c76ed SHA512 7b92545fe68b5cdc4a0336b9ff2d9604f20d1ecb0e67f349b65790e12d6cd361265a1b25a6e922148ec1b5977ea527cc3c32a2c1614597e098f88a86c52cbecd AUX caffe2-1.12.0-glog-0.6.0.patch 959 BLAKE2B eb0c18a34a2c5a1b68a420b9001eac5c8ff65ef9ca9ea1e5ad93ecef3cbaa595808105bbf6c8d3dcb9047559d23bc0398cda5922fb41e29a7588644c90c90fd8 SHA512 5873f11930ae5947c7dfbb19d0377d5535e395fcc1ab213e3c65c77b2e3bd911efc11cde2ca3e7134e9e7798ca7a483910113f331c0a23b73a5546aaaded40c5 AUX caffe2-1.12.0-install-dirs.patch 6145 BLAKE2B 80ffd3cde9d25951156b1f8b476f19925ec408236c1a9f59205841d82a596fe3de75f896b8d554e091f7b23bf1090a4f7c19d39d5b60924127031da9958ad89c SHA512 37e3e1927a8ada047cee16d4d850433f028ffbe8feaccb91ad329c3ecc7b0a13fe43005e612023f5f90f094e5ed6080c9315d2b63418b118504c0904f4e81c03 +AUX caffe2-1.13.0-gentoo.patch 8000 BLAKE2B a11a6bccac970ce8658041db20f90814183a8eef45571565512bafa9f172348f08ccdb67f5e543c8f9e236a6283f2d50a608cfc671e18886319a82dc84cd95e5 SHA512 20a43490cb80174fc688f7a773ac332362a5a013885a7cfdfdfe89996bc3e2483ad4b29149d71730213174d27d8534707813e825bdf4ea3e3bc7b664bad39953 +AUX caffe2-1.13.0-install-dirs.patch 5737 BLAKE2B 10b10e3a29976344c7596e1c4e7a604856c66d91cb7518308422f7ffac82ffe183dc81becab27866814c06e321e97458ab6a6908aa01379299c7fdf8fdccf153 SHA512 1e2e4f646cec24b5373872865522a909d1c154623e232c06e3da361e4d29b8d7520c446f53fbf42aab5f00bab05d1f278ce9425e506a9a5ac73cbb10570bd325 DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7 SHA512 c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7 DIST pytorch-1.12.1.tar.gz 106311625 BLAKE2B e8ca19d0e1987449c33ad4c36722a3a467f7f8a9f90be2a7f2de643cbd665038f6802b5ff1f1d3da09b6253d8f29e11549a24295de013d97f73affe538c84c99 SHA512 afeb551904ebd9b5901ae623a98eadbb3045115247cedf8006a940742cfad04e5ce24cfaf363336a9ed88d7ce6a4ac53dbb6a5c690aef6efdf20477c3a22c7ca +DIST pytorch-1.13.0.tar.gz 108276317 BLAKE2B 8149775dea06d8e4027b741c828169d33f768a96aef58cd2f86daa3bbad5bf36143454e26b683a992aca34e7fb52e6483c46168b698db48ff6978c9605d7a3d2 SHA512 5a0e8c589bdf552ccf682511a8860c754ab6f5844f51e568c5034793f787b97707af4340b338b9b8606dd27a6ced6ef50091f0cc514458b3021a2220409d7f20 EBUILD caffe2-1.12.0-r1.ebuild 4381 BLAKE2B fad2f6e2eef68f2dfca24511580bcf2de32e04e60d610cf4ba9b1e57299bc126c80af87124a5b3b3db2de3a80af8c7ae238c44ed98d6fdfaa063f8d9a98f97f0 SHA512 6a2c7316f077d1ef56721b82ae558a17190cf6c1ecbcdf22ff996afde22c1d95b2be3fbfaecd1bf2c7436bfc84d82485f6a84d08d115a0f9048813b2b144a607 EBUILD caffe2-1.12.1.ebuild 4397 BLAKE2B 04a3885842bd361078748bc5e1f7b8dac784b874978f6eebf9f233ff4938ec28113ec025d8b1799f8677c5fc86820250aa255ff8691d4ec5566a2fed6d2895bc SHA512 0cbd35bd21e1b1cdb7ecbb1b1c57233ff993c5e430503f737b9ac127a9a7ae91c27679b0ffd0ae8d5032a361d9cd79cf4f963409ce88ab9c102586cf5bc49f5b +EBUILD caffe2-1.13.0.ebuild 4459 BLAKE2B 6f1d5ed6a4bd43582fc6629b5912557f5c3c8f003cad60ac4be41e9329e06fb4eaec3d563edfa39aa522695d829ce1bfd4e77a9d09baa733e624c83253208487 SHA512 d1246b5bbf89dabbd708b8bcf265067778482ef7b23831923b1bffb93b19482f885e04362c81c8158de243f50a0ecf61aff1245fe58a997e33160ccff4ad34d1 MISC metadata.xml 961 BLAKE2B 7e0924bce6c952cf8b5e997a50e11aad18d572060087ab877d9600399712a6e46f7bee9938aef6b7af142de21046c1cbe541302a68a20072d1040e7b084b202c SHA512 9ff387a4d11eb83799665e38690f0c668ea6147ab92cc8fd68d4fb60590e51863d4530b885f71bd660429c6d38e573a2a7d8fca5e0139b82111ab05cb61b67d9 diff --git a/sci-libs/caffe2/caffe2-1.13.0.ebuild b/sci-libs/caffe2/caffe2-1.13.0.ebuild new file mode 100644 index 000000000000..f77c5dd01c55 --- /dev/null +++ b/sci-libs/caffe2/caffe2-1.13.0.ebuild @@ -0,0 +1,168 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..10} ) +inherit python-single-r1 cmake flag-o-matic + +MYPN=pytorch +MYP=${MYPN}-${PV} + +DESCRIPTION="A deep learning framework" +HOMEPAGE="https://pytorch.org/" +SRC_URI="https://github.com/pytorch/${MYPN}/archive/refs/tags/v${PV}.tar.gz + -> ${MYP}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack" +RESTRICT="test" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ffmpeg? ( opencv ) +" # ?? ( cuda rocm ) + +RDEPEND=" + ${PYTHON_DEPS} + dev-cpp/gflags:= + >=dev-cpp/glog-0.5.0 + dev-libs/cpuinfo + dev-libs/libfmt + dev-libs/protobuf:= + dev-libs/pthreadpool + dev-libs/sleef + sci-libs/lapack + >=sci-libs/onnx-1.12.0 + sci-libs/foxi + cuda? ( + =dev-libs/cudnn-8* + dev-libs/cudnn-frontend:0/8 + dev-util/nvidia-cuda-toolkit:=[profiler] + ) + ffmpeg? ( media-video/ffmpeg:= ) + nnpack? ( sci-libs/NNPACK ) + numpy? ( $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') ) + opencl? ( virtual/opencl ) + opencv? ( media-libs/opencv:= ) + qnnpack? ( sci-libs/QNNPACK ) + xnnpack? ( sci-libs/XNNPACK ) +" +DEPEND=" + ${RDEPEND} + dev-cpp/eigen + dev-libs/psimd + dev-libs/FP16 + dev-libs/FXdiv + dev-libs/pocketfft + dev-libs/flatbuffers + $(python_gen_cond_dep ' + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + ') +" + +S="${WORKDIR}"/${MYP} + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-install-dirs.patch + "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch + "${FILESDIR}"/${PN}-1.12.0-clang.patch +) + +src_prepare() { + filter-lto #bug 862672 + cmake_src_prepare + pushd torch/csrc/jit/serialization || die + flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die + popd +} + +src_configure() { + if use cuda && [[ -z ${TORCH_CUDA_ARCH_LIST} ]]; then + ewarn "WARNING: caffe2 is being built with its default CUDA compute capabilities: 3.5 and 7.0." + ewarn "These may not be optimal for your GPU." + ewarn "" + ewarn "To configure caffe2 with the CUDA compute capability that is optimal for your GPU," + ewarn "set TORCH_CUDA_ARCH_LIST in your make.conf, and re-emerge caffe2." + ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TORCH_CUDA_ARCH_LIST=7.5,3.5" + ewarn "For a Maxwell model GPU, an example value would be: TORCH_CUDA_ARCH_LIST=Maxwell" + ewarn "" + ewarn "You can look up your GPU's CUDA compute capability at https://developer.nvidia.com/cuda-gpus" + ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'" + fi + + local mycmakeargs=( + -DBUILD_CUSTOM_PROTOBUF=OFF + -DBUILD_SHARED_LIBS=ON + + -DUSE_CCACHE=OFF + -DUSE_CUDA=$(usex cuda) + -DUSE_CUDNN=$(usex cuda) + -DUSE_FAST_NVCC=$(usex cuda) + -DTORCH_CUDA_ARCH_LIST="${TORCH_CUDA_ARCH_LIST:-3.5 7.0}" + -DUSE_DISTRIBUTED=OFF + -DUSE_FAKELOWP=OFF + -DUSE_FBGEMM=OFF # TODO + -DUSE_FFMPEG=$(usex ffmpeg) + -DUSE_GFLAGS=ON + -DUSE_GLOG=ON + -DUSE_GLOO=OFF + -DUSE_KINETO=OFF # TODO + -DUSE_LEVELDB=OFF + -DUSE_MAGMA=OFF # TODO: In GURU as sci-libs/magma + -DUSE_MKLDNN=OFF + -DUSE_NCCL=OFF # TODO: NVIDIA Collective Communication Library + -DUSE_NNPACK=$(usex nnpack) + -DUSE_QNNPACK=$(usex qnnpack) + -DUSE_XNNPACK=$(usex xnnpack) + -DUSE_SYSTEM_XNNPACK=$(usex xnnpack) + -DUSE_PYTORCH_QNNPACK=OFF + -DUSE_NUMPY=$(usex numpy) + -DUSE_OPENCL=$(usex opencl) + -DUSE_OPENCV=$(usex opencv) + -DUSE_OPENMP=$(usex openmp) + -DUSE_ROCM=OFF # TODO + -DUSE_SYSTEM_CPUINFO=ON + -DUSE_SYSTEM_PYBIND11=ON + -DUSE_VALGRIND=OFF + -DPYBIND11_PYTHON_VERSION="${EPYTHON#python}" + -DPYTHON_EXECUTABLE="${PYTHON}" + -DUSE_ITT=OFF + -DUSE_SYSTEM_EIGEN_INSTALL=ON + -DUSE_SYSTEM_PTHREADPOOL=ON + -DUSE_SYSTEM_FXDIV=ON + -DUSE_SYSTEM_FP16=ON + -DUSE_SYSTEM_GLOO=ON + -DUSE_SYSTEM_ONNX=ON + -DUSE_SYSTEM_SLEEF=ON + -DUSE_TENSORPIPE=OFF + + -Wno-dev + -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir) + -DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir) + ) + + use cuda && addpredict "/dev/nvidiactl" # bug 867706 + cmake_src_configure +} + +src_install() { + cmake_src_install + + insinto "/var/lib/${PN}" + doins "${BUILD_DIR}"/CMakeCache.txt + + rm -rf python + mkdir -p python/torch/include || die + mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die + mv "${ED}"/usr/include/torch python/torch/include || die + cp torch/version.py python/torch/ || die + rm -r "${ED}"/var/tmp || die + python_domodule python/caffe2 + python_domodule python/torch +} 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_) { diff --git a/sci-libs/caffe2/files/caffe2-1.13.0-install-dirs.patch b/sci-libs/caffe2/files/caffe2-1.13.0-install-dirs.patch new file mode 100644 index 000000000000..299c9f88a173 --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-1.13.0-install-dirs.patch @@ -0,0 +1,121 @@ +--- a/c10/CMakeLists.txt ++++ b/c10/CMakeLists.txt +@@ -112,7 +112,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 +@@ -64,7 +64,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 +@@ -20,7 +20,7 @@ + if(USE_MKLDNN) + target_link_libraries(caffe2_detectron_ops_gpu PRIVATE caffe2::mkldnn) + endif() +- 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() +@@ -37,7 +37,7 @@ + target_link_libraries(caffe2_detectron_ops_hip PRIVATE caffe2::mkldnn) + endif() + target_link_libraries(caffe2_detectron_ops_hip PRIVATE 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) +@@ -49,7 +49,7 @@ + if(USE_MKLDNN) + target_link_libraries(caffe2_detectron_ops PRIVATE caffe2::mkldnn) + endif() +- 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 +@@ -63,7 +63,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() + if(USE_UCC AND USE_C10D_UCC) +--- 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/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest index 6a1f93daf492..5d03df76ecf7 100644 --- a/sci-libs/pytorch/Manifest +++ b/sci-libs/pytorch/Manifest @@ -1,10 +1,13 @@ AUX 0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch 599 BLAKE2B 4ad99f05d69f53336e6c874b7783c5fb9e800808c6adf588263af215eda865ddf215df8fa803e48220b879fd2f90d71139a6e38bbdc947abc7854cab88a756ad SHA512 fd0e3db9cb68e14d3d90a613d91511acc752c1d764bada85e6dace59b45fe2cf42bca6b77c281084bd04de88d5fefbb5d81be165d288ed3da251e7b0d4c6e86e AUX pytorch-1.12.0-CVE-2022-45907.patch 2368 BLAKE2B b1d5bb1983ab01f325d27bdd1212d16d1b814cbc06d8e8df86b15fd39ec1d9ba65e4dda151efcd17599a69292a79b465f377b381c6e329945ccce745fea3d0ab SHA512 2a7d22642f0c49fbed3a728b5e9185621f46fa9f1355774f9cdcb13c1212b717289e929e34143d49be6b7026a007d7c23e921ed84ed8f5ec19de1804ea901732 +AUX pytorch-1.13.0-setup.patch 357 BLAKE2B 9741c5285353ac09581f54a823e77b069afbe5d9165a6545bd50a2b020298a358783d61fc5923188ddf7fec0929ec92eabeefc8c3be329793f12326aef5f89c5 SHA512 4632b0ea06704122e86dd27836d96ee59fc1ea236e69031fc65a21b2c9eafae21fc9344e55f17ee0c6374e3368f7ad1e3cec3b2be1af5e21bd10902684c72161 AUX pytorch-1.6.0-global-dlopen.patch 592 BLAKE2B a5e3742fcb0cf2286a9406e11bade1eea43a11e1982853cf07531cdf7b2c62c3619b8973ead1059faae35e64d3c3ed3ea53407bc9e61e597a828ed8d79c12137 SHA512 28e22b5321cf6e894828bb33a94a3fff14999470fffe941dcb515cd3701630ece41676bbb2d2509bbe8904c5a7016a109770c6192d7c787365184770de933390 AUX pytorch-1.7.1-torch_shm_manager.patch 441 BLAKE2B 28b87353a0afa0ef25c8ab00e204998b4fb3472fbbb5bb2b300a3fb22d864846d51ccef652ce331484c7a522f7d74e6674c1ceaf26d0a4956d1c8b57b29a7428 SHA512 08f2e5f35768e70713a1432797d9fbe0b133a80ae7dff2898e4b9b51ab398f88bce90a0698b3c9f77bf8a4c5c054911c22931d0684276a0b6d4f2afb69633088 AUX pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch 1063 BLAKE2B c93cb4c1ff40ef332cd518474a397e9b61d310f4cbdb8701c18749f103533a69e4a3e892f1e3613113cc97ae320951dacb956025ba6be694c5275448d2af3a78 SHA512 7931a220068a36b15ee0f282161f23422acdbef32990bd1eafeab55e06131748f5b4ad93e6a0dc7a4f92e7ebd0595a97835c768b46dd7139f626df666642ce18 DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7 SHA512 c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7 DIST pytorch-1.12.1.tar.gz 106311625 BLAKE2B e8ca19d0e1987449c33ad4c36722a3a467f7f8a9f90be2a7f2de643cbd665038f6802b5ff1f1d3da09b6253d8f29e11549a24295de013d97f73affe538c84c99 SHA512 afeb551904ebd9b5901ae623a98eadbb3045115247cedf8006a940742cfad04e5ce24cfaf363336a9ed88d7ce6a4ac53dbb6a5c690aef6efdf20477c3a22c7ca +DIST pytorch-1.13.0.tar.gz 108276317 BLAKE2B 8149775dea06d8e4027b741c828169d33f768a96aef58cd2f86daa3bbad5bf36143454e26b683a992aca34e7fb52e6483c46168b698db48ff6978c9605d7a3d2 SHA512 5a0e8c589bdf552ccf682511a8860c754ab6f5844f51e568c5034793f787b97707af4340b338b9b8606dd27a6ced6ef50091f0cc514458b3021a2220409d7f20 EBUILD pytorch-1.12.0-r2.ebuild 1490 BLAKE2B 4453c84ab9d97b5cc1155e7593adb23787736866b08ec369958c4ba6830a6bdf3545dca8e47fde12838417487eccbdb67786c320465a1ed87a3a2efd3f97f7d8 SHA512 fa3df152625bc1ae314079f91f54c40fbbd635841c52c1cb495e2558f20d5c4873f215de0d6c37bce4d83b6051b59d1647294c60b817aae8831a5540c16483db EBUILD pytorch-1.12.1.ebuild 1490 BLAKE2B 4453c84ab9d97b5cc1155e7593adb23787736866b08ec369958c4ba6830a6bdf3545dca8e47fde12838417487eccbdb67786c320465a1ed87a3a2efd3f97f7d8 SHA512 fa3df152625bc1ae314079f91f54c40fbbd635841c52c1cb495e2558f20d5c4873f215de0d6c37bce4d83b6051b59d1647294c60b817aae8831a5540c16483db +EBUILD pytorch-1.13.0.ebuild 1525 BLAKE2B 6f63abca973e2a191a965e876a054ad3307fe9c7c65a3fea2bad0f1d80d3fd3a4c28c5a04cf45cba1b59ccbe8d71987ebba891ddd96bea3c017168cbb3c2e2cb SHA512 d2cdd4b50b9c8074846e76d9246627cf3581a91f08470eaee78e8ab8537521ad9faa9a5086a9322aa82843128dd2ae0151a1de342bf9707e32bf45856ce54509 MISC metadata.xml 328 BLAKE2B f49c6d62ac88dfffe497ed05b1f727941a94acb87a809611dda8aedbd87508fdfdf94ec0e025cac2a649b0881b600236289943b4be0f6ca44fc105b6d8fbe97c SHA512 16c29d2c1177a89026235191ea3e33870c2e6b63f029b7febd4dbd2e99f598fab4b4fd2fa7a801ffd88393663a00752300e6e2cc847a83690b715bcc481d9dc2 diff --git a/sci-libs/pytorch/files/pytorch-1.13.0-setup.patch b/sci-libs/pytorch/files/pytorch-1.13.0-setup.patch new file mode 100644 index 000000000000..bc5721e5b932 --- /dev/null +++ b/sci-libs/pytorch/files/pytorch-1.13.0-setup.patch @@ -0,0 +1,11 @@ +--- a/setup.py 2023-02-14 19:34:56.327571750 +0100 ++++ b/setup.py 2023-02-14 19:35:31.073020464 +0100 +@@ -234,6 +234,8 @@ + import time + import sysconfig + ++sys.path[:0] = os.getcwd() ++ + from tools.build_pytorch_libs import build_caffe2 + from tools.setup_helpers.env import (IS_WINDOWS, IS_DARWIN, IS_LINUX, + build_type) diff --git a/sci-libs/pytorch/pytorch-1.13.0.ebuild b/sci-libs/pytorch/pytorch-1.13.0.ebuild new file mode 100644 index 000000000000..7cde7f7262bb --- /dev/null +++ b/sci-libs/pytorch/pytorch-1.13.0.ebuild @@ -0,0 +1,63 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9,10} ) +DISTUTILS_SINGLE_IMPL=1 +inherit distutils-r1 + +DESCRIPTION="Tensors and Dynamic neural networks in Python" +HOMEPAGE="https://pytorch.org/" +SRC_URI="https://github.com/pytorch/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +RESTRICT="test" + +REQUIRED_USE=${PYTHON_REQUIRED_USE} +RDEPEND=" + ${PYTHON_DEPS} + ~sci-libs/caffe2-${PV}[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-python/typing-extensions[${PYTHON_USEDEP}] + ') +" +DEPEND="${RDEPEND} + $(python_gen_cond_dep ' + dev-python/pyyaml[${PYTHON_USEDEP}] + ') +" + +src_prepare() { + eapply \ + "${FILESDIR}"/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch \ + "${FILESDIR}"/pytorch-1.9.0-Change-library-directory-according-to-CMake-build.patch \ + "${FILESDIR}"/${PN}-1.6.0-global-dlopen.patch \ + "${FILESDIR}"/pytorch-1.7.1-torch_shm_manager.patch \ + "${FILESDIR}"/${P}-setup.patch \ + "${FILESDIR}"/pytorch-1.12.0-CVE-2022-45907.patch + + # Set build dir for pytorch's setup + sed -i \ + -e "/BUILD_DIR/s|build|/var/lib/caffe2/|" \ + tools/setup_helpers/env.py \ + || die + distutils-r1_src_prepare +} + +src_compile() { + PYTORCH_BUILD_VERSION=${PV} \ + PYTORCH_BUILD_NUMBER=0 \ + USE_SYSTEM_LIBS=ON \ + CMAKE_BUILD_DIR="${BUILD_DIR}" \ + BUILD_DIR= \ + distutils-r1_src_compile +} + +src_install() { + USE_SYSTEM_LIBS=ON distutils-r1_src_install +} |