From 36ab3cd1ef5a1fcf019da2ad4d598d4a8b90d506 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Dec 2023 17:00:43 +0000 Subject: gentoo auto-resync : 06:12:2023 - 17:00:43 --- sci-libs/Manifest.gz | Bin 45114 -> 45131 bytes sci-libs/caffe2/Manifest | 4 + sci-libs/caffe2/caffe2-2.1.1.ebuild | 210 +++++++++++++++++++++ sci-libs/caffe2/files/caffe2-2.1.1-cudaExtra.patch | 28 +++ sci-libs/caffe2/files/caffe2-2.1.1-gentoo.patch | 188 ++++++++++++++++++ sci-libs/kineto/Manifest | 3 + .../files/kineto-0.4.0_p20231031-gentoo.patch | 74 ++++++++ sci-libs/kineto/kineto-0.4.0_p20231031.ebuild | 51 +++++ 8 files changed, 558 insertions(+) create mode 100644 sci-libs/caffe2/caffe2-2.1.1.ebuild create mode 100644 sci-libs/caffe2/files/caffe2-2.1.1-cudaExtra.patch create mode 100644 sci-libs/caffe2/files/caffe2-2.1.1-gentoo.patch create mode 100644 sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch create mode 100644 sci-libs/kineto/kineto-0.4.0_p20231031.ebuild (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index b84c69b714d4..f9a3787d3f54 100644 Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest index 590db3c60973..278793a07d94 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -7,10 +7,14 @@ AUX caffe2-2.0.0-cudnn_include_fix.patch 526 BLAKE2B 63959783a94bfa2b02f78e36e75 AUX caffe2-2.0.0-gcc13.patch 1203 BLAKE2B df55608c6019802da32809cb210b60cf0debf38e8d7a20135e92465be28d3537f2d0b52c67a61b264e241539b64fa02aa99eefb856686a9f9e3c45291b8d6a70 SHA512 59e933c60abef3ac97a1e3b2cd7a9935f9fdde4bc3ed1c2c53c729af6d7ed735ffd38cbdac08d32c668cd2751f3f871cc833883efd19732c04a0f67fbb49c41d AUX caffe2-2.0.0-gentoo.patch 7081 BLAKE2B d2b8d411f6f2c19c5339053accd445606092d15fad78f793c9a2ba708156b9425607324b842bd78402e3a2009756249a13addb75241a593582e2c6711a702d1a SHA512 ff168df38fef53c7afd3abe2064e258248f7293e16f3fca757f714da41a094be18d18a9180759ebafd952896a9d06aa68927ff9215cab904926ba362eef79929 AUX caffe2-2.0.1-cudaExtra.patch 1294 BLAKE2B 2b7e43080d84ca47349274982f19b6b2eba456edeb78383cc56d0c0d8f409829e612c8e8e0afcece4155def7fe97f419ca08aed89fc3a77cc2a0f43ebf7d983a SHA512 6ad2466dc92c895098634b1016f4c7b3ce28b7bfac5fa0e122a0dfb979ec465e3849a6cf30a7909a382f9a98b3221a76e90ed0731cb5ab141a54fddfacaf5eea +AUX caffe2-2.1.1-cudaExtra.patch 1336 BLAKE2B f12d29a624f9345452227076108b9ded4c6c60051f10645340e03694b53765cf1c892e9a8797748cfba1fc416d84782a265b961c9c5e7ab1b0f367192287c891 SHA512 9c394305f99e377c5eec6d271c9c80b3c45eb0ccaeb96ad21feba93bc13ae562843c0ae055d11ddee63b8e2b180dc2a0e7a44b9772b0044ac3cd94a0ee4c3d67 +AUX caffe2-2.1.1-gentoo.patch 6329 BLAKE2B c002f1605888ac79bed292cf1967eedd4d177193947dbafea8443958e498b371865a8f7548cc7e2c572d7fff69418344286071d64f4742691e943e81b73d811c SHA512 8eb2b2f89de809ff93e0deaa4bd6116f73bed55642904e689ba97e5bf21ba5754935a8d0c1f632b1f262400f0c809398524056f7691f7787c154a5b7f6f1b7b2 DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B 75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3 SHA512 f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62 DIST pytorch-2.0.0.tar.gz 111327292 BLAKE2B 6d593a975c0ade714f0b189f7e3c4ff704b9a9a2377b5e441a9cefc202fa22779966d08948e63671912c6ea5a0eee124042155f4f57a654db34e19e42f013cc9 SHA512 4dd76160711c0d87f3026c8b7fa3ed149dd86b8ac0ee9ecea0eaf80d2e6ce8c29368392e77b9466d90b60634087b462b782495997a5d33367cc8ca9fe14c8a14 DIST pytorch-2.0.1.tar.gz 111335778 BLAKE2B 7a10cc2b2d5e2422aef7e060a0c3a62ca5c7460c6e0b9becade9b98939501975c74ed5a175a653731f43ca824d2c9bd31f41d1f633c2b139779ab23d5331e9ce SHA512 2309a22b3be3ccdb36d8d9781a59a7bdcc2fdb8d95ada205702ec77862480f0cbb12cd5d6b8cd3114d01a6e33b7743d0fe9de93debf37138ca5c14403cdb0c43 +DIST pytorch-2.1.1.tar.gz 116317162 BLAKE2B d9819256cba0b9951aabe95d86fb135e97d8bafa2c010d13162cd9b3373ca75f20d218e31279ace41981f3f76308721c522f9e53745a1ff9e6386fa10634f9ad SHA512 31b36e7732ee086ae7565a3811ab2d1b2869e79057bea7a4ffc4a3c95c544757e656a6d2289ee11fe7508828aca144e4220ef1e9ab1878e075e1259cf6ff9ca4 EBUILD caffe2-1.13.1-r6.ebuild 5221 BLAKE2B 64a0309f8601752187205d49629245ae8a3305d9fad0626eff293fa555e50c7c147bfa9879ada2bd0a076e41120a9f5f9667cd784a4a3418cee9a4711eb69b05 SHA512 d1162bb88a1ac0c412cc2fa828521f98be9eda5f55d63f4a5162c727940121db1a7ab8155bd151fe1a2b9985851ff82bb49e3f3e01c4e4f1fdc1f3f4444d56ce EBUILD caffe2-2.0.0-r5.ebuild 5365 BLAKE2B 40e36f5311786c6061ab73d75d0cb31324a46db64a083e68fa0ad394235895e4559ac3017a5bc7725a40d2b348c2bae6ad2f5ddcf08f5824a0d990bff7a2ea76 SHA512 c9747b9b53214ae3c8b70193ae055d36906eb08c3eb7f6af294ccc2c8bb8e4f6b81ed7a078baccdaf4093ec9c096d4dc8476064b64a02ae2de256976d9ea7dcc EBUILD caffe2-2.0.1-r5.ebuild 5845 BLAKE2B 86b484f6fa442af4a947d3bda8126da366cecce9ee2fe6c5794b58f74dd18de98f4367f8f0ec16ace2517b4bf8f9caf19c6ec6ea1bb57d1d33b72a6a9dfedd9c SHA512 3e44ef061b852799a02548105041d3d2cc6defd6879b102c3ff89b8c4179fbba126b99aeb886458cd396c5650695f45ac6134ca692aa64027216e7a6de57f7b3 +EBUILD caffe2-2.1.1.ebuild 5856 BLAKE2B b3066388b101145f8d23e2eb5ed44658d34dd10a644a8d85c68c75b67fccefd699a10ea5adb6a3f5199f4ad1d10b5e7e609c7b2b1679ad3735836e643a9cc39c SHA512 34996d4c30e7469b1b1c9007e06beedf35c59cff7d4441b86058dca73b1977d9c3751d312b28aa0e0087ade8faa996a1f4f91422e68a7350fa8d1a30a6e8300f MISC metadata.xml 1161 BLAKE2B af1b8f3ab7789f9aa5f635d5a3f1175bbdd7ccbf68f205bfc2769ccab2cb5c519f6fe62024759eb28f0e1353a04bed3216d222808b9f95100d3e0bb591f1d82b SHA512 1737d3dc8fa7786550930beb067ca4eca173a47095a88450ab5c913d3aed08f51fe21c875f484e5663542471a48ef55878cddc97881ff8be7648987b90b79126 diff --git a/sci-libs/caffe2/caffe2-2.1.1.ebuild b/sci-libs/caffe2/caffe2-2.1.1.ebuild new file mode 100644 index 000000000000..e5e9a71069cd --- /dev/null +++ b/sci-libs/caffe2/caffe2-2.1.1.ebuild @@ -0,0 +1,210 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit python-single-r1 cmake cuda flag-o-matic prefix + +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 distributed fbgemm ffmpeg gloo mpi nnpack +numpy opencl opencv openmp qnnpack tensorpipe xnnpack" +RESTRICT="test" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + ffmpeg? ( opencv ) + mpi? ( distributed ) + tensorpipe? ( distributed ) + distributed? ( tensorpipe ) + gloo? ( distributed ) +" # ?? ( cuda rocm ) + +# CUDA 12 not supported yet: https://github.com/pytorch/pytorch/issues/91122 +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 + =sci-libs/XNNPACK-2022.12.22 ) +" +DEPEND=" + ${RDEPEND} + dev-cpp/eigen + cuda? ( dev-libs/cutlass ) + dev-libs/psimd + dev-libs/FP16 + dev-libs/FXdiv + dev-libs/pocketfft + dev-libs/flatbuffers + >=sci-libs/kineto-0.4.0_p20231031 + $(python_gen_cond_dep ' + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + ') +" + +S="${WORKDIR}"/${MYP} + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${PN}-1.13.0-install-dirs.patch + "${FILESDIR}"/${PN}-1.12.0-glog-0.6.0.patch + "${FILESDIR}"/${PN}-1.13.1-tensorpipe.patch + "${FILESDIR}"/${PN}-2.0.0-gcc13.patch + "${FILESDIR}"/${PN}-2.0.0-cudnn_include_fix.patch + "${FILESDIR}"/${P}-cudaExtra.patch +) + +src_prepare() { + filter-lto #bug 862672 + sed -i \ + -e "/third_party\/gloo/d" \ + cmake/Dependencies.cmake \ + || die + cmake_src_prepare + pushd torch/csrc/jit/serialization || die + flatc --cpp --gen-mutable --scoped-enums mobile_bytecode.fbs || die + popd + # prefixify the hardcoded paths, after all patches are applied + hprefixify \ + aten/CMakeLists.txt \ + caffe2/CMakeLists.txt \ + cmake/Metal.cmake \ + cmake/Modules/*.cmake \ + cmake/Modules_CUDA_fix/FindCUDNN.cmake \ + cmake/Modules_CUDA_fix/upstream/FindCUDA/make2cmake.cmake \ + cmake/Modules_CUDA_fix/upstream/FindPackageHandleStandardArgs.cmake \ + cmake/public/LoadHIP.cmake \ + cmake/public/cuda.cmake \ + cmake/Dependencies.cmake \ + torch/CMakeLists.txt \ + CMakeLists.txt +} + +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}" + -DBUILD_NVFUSER=$(usex cuda) + -DUSE_DISTRIBUTED=$(usex distributed) + -DUSE_MPI=$(usex mpi) + -DUSE_FAKELOWP=OFF + -DUSE_FBGEMM=$(usex fbgemm) + -DUSE_FFMPEG=$(usex ffmpeg) + -DUSE_GFLAGS=ON + -DUSE_GLOG=ON + -DUSE_GLOO=$(usex gloo) + -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_TENSORPIPE=$(usex tensorpipe) + -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_UCC=OFF + -DUSE_VALGRIND=OFF + -DPYBIND11_PYTHON_VERSION="${EPYTHON#python}" + -DPYTHON_EXECUTABLE="${PYTHON}" + -DUSE_ITT=OFF + -DBLAS=Eigen # avoid the use of MKL, if found on the system + -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 + + -Wno-dev + -DTORCH_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir) + -DLIBSHM_INSTALL_LIB_SUBDIR="${EPREFIX}"/usr/$(get_libdir) + ) + + if use cuda; then + addpredict "/dev/nvidiactl" # bug 867706 + addpredict "/dev/char" + + mycmakeargs+=( + -DCMAKE_CUDA_FLAGS="$(cuda_gccdir -f | tr -d \")" + ) + fi + 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 + python_domodule python/caffe2 + python_domodule python/torch +} diff --git a/sci-libs/caffe2/files/caffe2-2.1.1-cudaExtra.patch b/sci-libs/caffe2/files/caffe2-2.1.1-cudaExtra.patch new file mode 100644 index 000000000000..f12623f2068a --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.1.1-cudaExtra.patch @@ -0,0 +1,28 @@ +--- a/third_party/nvfuser/CMakeLists.txt 2023-11-30 21:42:07.336946970 +0100 ++++ b/third_party/nvfuser/CMakeLists.txt 2023-11-30 21:46:35.101749250 +0100 +@@ -18,7 +18,7 @@ + set(NVFUSER_ROOT ${PROJECT_SOURCE_DIR}) + set(NVFUSER_SRCS_DIR "${NVFUSER_ROOT}/csrc") + set(TORCH_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../..") +-set(TORCH_INSTALL_LIB_DIR ${TORCH_ROOT}/torch/lib) ++set(TORCH_INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR}) + + # --- build nvfuser_codegen library + +@@ -218,7 +218,7 @@ + message(STATUS "somehow this is happening") + set_target_properties(${NVFUSER} PROPERTIES LINK_FLAGS ${TORCH_PYTHON_LINK_FLAGS}) + endif() +- install(TARGETS ${NVFUSER} EXPORT NvfuserTargets DESTINATION ${TORCH_ROOT}/nvfuser/) ++ install(TARGETS ${NVFUSER} EXPORT NvfuserTargets DESTINATION "${TORCH_INSTALL_LIB_DIR}") + + # install nvfuser python files + install(DIRECTORY "${NVFUSER_ROOT}/python/" +--- a/functorch/CMakeLists.txt 2023-11-30 20:30:45.805209036 +0100 ++++ b/functorch/CMakeLists.txt 2023-11-30 20:31:13.284766157 +0100 +@@ -35,4 +35,4 @@ + if(NOT ${TORCH_PYTHON_LINK_FLAGS} STREQUAL "") + set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS ${TORCH_PYTHON_LINK_FLAGS}) + endif() +-install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}") ++install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_INSTALL_LIBDIR}") diff --git a/sci-libs/caffe2/files/caffe2-2.1.1-gentoo.patch b/sci-libs/caffe2/files/caffe2-2.1.1-gentoo.patch new file mode 100644 index 000000000000..056ac9afe5b3 --- /dev/null +++ b/sci-libs/caffe2/files/caffe2-2.1.1-gentoo.patch @@ -0,0 +1,188 @@ +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -487,7 +487,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) +@@ -543,7 +543,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") +@@ -803,7 +803,7 @@ + endif() + + # ---[ FBGEMM +-if(USE_FBGEMM) ++if(FALSE) + set(CAFFE2_THIRD_PARTY_ROOT "${PROJECT_SOURCE_DIR}/third_party") + if(NOT DEFINED FBGEMM_SOURCE_DIR) + set(FBGEMM_SOURCE_DIR "${CAFFE2_THIRD_PARTY_ROOT}/fbgemm" CACHE STRING "FBGEMM source directory") +@@ -848,6 +848,7 @@ + endif() + + if(USE_FBGEMM) ++ list(APPEND Caffe2_DEPENDENCY_LIBS fbgemm) + caffe2_update_option(USE_FBGEMM ON) + else() + caffe2_update_option(USE_FBGEMM OFF) +@@ -1552,7 +1553,6 @@ + set_target_properties(onnx_proto PROPERTIES CXX_STANDARD 17) + endif() + endif() +- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/foxi EXCLUDE_FROM_ALL) + + add_definitions(-DONNX_NAMESPACE=${ONNX_NAMESPACE}) + if(NOT USE_SYSTEM_ONNX) +@@ -1831,7 +1831,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`. + # +@@ -1840,9 +1839,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 +@@ -87,7 +87,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 +@@ -63,15 +63,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 +@@ -84,7 +78,6 @@ + python::python + pybind::pybind11 + shm +- fmt::fmt-header-only + ATEN_CPU_FILES_GEN_LIB) + + if(USE_ASAN AND TARGET Sanitizer::address) +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -812,12 +812,11 @@ + + # ---[ Build flags + if(NOT MSVC) +- string(APPEND CMAKE_CXX_FLAGS " -O2 -fPIC") ++ string(APPEND CMAKE_CXX_FLAGS " -fPIC") + # 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("-Werror=braced-scalar-init" CMAKE_CXX_FLAGS) + append_cxx_flag_if_supported("-Werror=range-loop-construct" CMAKE_CXX_FLAGS) +@@ -917,8 +916,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) + else() + # skip unwanted includes from windows.h + add_compile_definitions(WIN32_LEAN_AND_MEAN) +--- a/cmake/public/utils.cmake ++++ b/cmake/public/utils.cmake +@@ -492,8 +492,6 @@ + endif() + + # Use -O2 for release builds (-O3 doesn't improve perf, and -Os results in perf regression) +- target_compile_options(${libname} PRIVATE +- $<$,$,$>>:-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 +@@ -107,7 +107,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 "") +@@ -1023,7 +1025,6 @@ + endif() + + if(NOT MSVC AND USE_XNNPACK) +- TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv) + endif() + + # ========================================================== +@@ -1143,8 +1146,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() diff --git a/sci-libs/kineto/Manifest b/sci-libs/kineto/Manifest index c420be582134..f5a8d6dee165 100644 --- a/sci-libs/kineto/Manifest +++ b/sci-libs/kineto/Manifest @@ -1,5 +1,8 @@ AUX kineto-0.4.0-gcc13.patch 255 BLAKE2B 5633abeae41fd306a6d66d4e0f72040abbcc27b052a9802c94235c4afcff5ed99f3ac0df9ed712c6d4a57345d666442ea89bcc84f9f7d333d2ec77be9246a1d5 SHA512 db55567e22355f7ca98959f6a385b103474b2aeed0684f48e0c2e043754defc888fbd6ae997c3e5909329777d662b2e4e1b85520192da7fcae32845798c4565d +AUX kineto-0.4.0_p20231031-gentoo.patch 2949 BLAKE2B 63604018359971d040211647cfdf599feb75a085fe90f28da9d440d073e4598508b0dcb26244a8daac87fd97c2fc951ec7837fef58cdecd584340a8ab866d058 SHA512 f5b545cf8b376ca7bb06b36424fac9afb7dd21cc38214785bbdc119c75dd9f5636d79715cfa4e026ba6935edf59ece0327fdac8702394a98f829dded09783461 AUX kineto-2021.11.17-gentoo.patch 2919 BLAKE2B 6b7dfe7aa1df3b797c71574233bb48c1f9d47c460bb5a80fc9bf1108eacb928fe70b009207bfb1570c074ea65e67960e18d82bb75aa295d911a57dca190da8f7 SHA512 55b8b4f714f99bba714ddec804904d08b2042b20f6649c0a049ecbe3027f4b5ee6800705ffa8ac3e7cc2af88e9f25a145714dfe1d2e49e81bb99b4e2171aa597 DIST kineto-0.4.0.tar.gz 8190627 BLAKE2B 015017096b6a01b2f2172580884aef6c57df0d33c3d8904c959acc7f7dcc36386f72acb9a672571fa25b7f74c1d2d763692b8cc5a634a73ac143819f811737df SHA512 4a3cbf2f29aa174b9a67f55d0f4e7b8d952ed5dba612f33d144a4d019055031e2a6ff8c98ef1971bf2508460cb871dace38bfc669c10c076cc42d685a1842d86 +DIST kineto-0.4.0_p20231031.tar.gz 8234532 BLAKE2B 11ff60f865a09f651facdb9752d9cb401f89d36d72f977b79fd35a128fe6666c6cba6aaaf8119a939d1e26b30dff55d8d30f484c7d9fb4ab626327f2bd574bf4 SHA512 48421d9a6f4487112f37222350b33a171fc0e2119fa4636380e6ecb6574300576325d5c21affc8ab3b9769264ab549918fa2c4e5fee2c2e24c09c1f3f87f3444 EBUILD kineto-0.4.0.ebuild 737 BLAKE2B 70cc19d80144d22bee4b7608573381b99f3f72af1428a527dbfc7c3099c12d4d3b0ad59de820078fece318fd6873a97ab6ba2fdb622c39af4276f39385662fea SHA512 38953a8d37ca465881997e49ea63b3bbf2fb77bee1c03801b2c5a1176ee4a2649b411abf26e683391aeacd85bf5ccb922f2234c34290b63415535a1fc882295a +EBUILD kineto-0.4.0_p20231031.ebuild 898 BLAKE2B 6af682ef678384ec5e69d328c6e335db8b42343bf127b698236fbcef36323edafb93955c04efb49d923f3b373f103ce586132ffd0ff2b06287cf9216dc0f81f4 SHA512 1a15b398ed9d2480965638fb0eb6c6aed076369ae3207f0a7e2ab3964acac81ad74cf3f1e7653d87edeeef1dfe0cf018ebe83772aec899597c009265bd76cbf4 MISC metadata.xml 327 BLAKE2B f48b87396bdfbc5a12b807941e162b596bbf760252fbfd08dc05ef8aeb9dcd8fc1b0ed3c8d4ec5f531da5a7315a041b8db7b0f6449c86fc52fba4f6d4476beb5 SHA512 9f6906e171f530b6f5de417338af00c26681fe757d823b4ab88cb9749506404c2d9baa96ea3c71c4fe523f6f5877a81e20f2378abe4a2e9895e501829e3fe85d diff --git a/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch b/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch new file mode 100644 index 000000000000..29804d93161c --- /dev/null +++ b/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch @@ -0,0 +1,74 @@ +--- a/CMakeLists.txt 2022-05-24 11:16:18.537610972 +0200 ++++ b/CMakeLists.txt 2022-05-24 11:19:15.011073535 +0200 +@@ -86,7 +86,8 @@ + CXX_STANDARD_REQUIRED YES + CXX_EXTENSIONS NO) + +-set(KINETO_COMPILE_OPTIONS "-DKINETO_NAMESPACE=libkineto") ++set(KINETO_COMPILE_OPTIONS "-DKINETO_NAMESPACE=libkineto" ++ ${CMAKE_SHARED_LIBRARY_C_FLAGS}) + list(APPEND KINETO_COMPILE_OPTIONS "-DFMT_HEADER_ONLY") + list(APPEND KINETO_COMPILE_OPTIONS "-DENABLE_IPC_FABRIC") + if(NOT MSVC) +@@ -111,7 +113,7 @@ + target_compile_options(kineto_base PRIVATE "${KINETO_COMPILE_OPTIONS}") + target_compile_options(kineto_api PRIVATE "${KINETO_COMPILE_OPTIONS}") + +-if(NOT TARGET fmt) ++if(FALSE) + if(NOT FMT_SOURCE_DIR) + set(FMT_SOURCE_DIR "${LIBKINETO_THIRDPARTY_DIR}/fmt" + CACHE STRING "fmt source directory from submodules") +@@ -129,9 +131,7 @@ + set(BUILD_SHARED_LIBS ${TEMP_BUILD_SHARED_LIBS} CACHE BOOL "Build shared libs" FORCE) + endif() + +-set(FMT_INCLUDE_DIR "${FMT_SOURCE_DIR}/include") + message(STATUS "Kineto: FMT_SOURCE_DIR = ${FMT_SOURCE_DIR}") +-message(STATUS "Kineto: FMT_INCLUDE_DIR = ${FMT_INCLUDE_DIR}") + if (NOT CUPTI_INCLUDE_DIR) + set(CUPTI_INCLUDE_DIR "${CUDA_SOURCE_DIR}/extras/CUPTI/include") + endif() +@@ -144,15 +144,14 @@ + set(ROCM_INCLUDE_DIRS "${ROCM_SOURCE_DIR}/include") + endif() + +-set(DYNOLOG_INCLUDE_DIR "${LIBKINETO_THIRDPARTY_DIR}/dynolog/") +-set(IPCFABRIC_INCLUDE_DIR "${DYNOLOG_INCLUDE_DIR}/dynolog/src/ipcfabric/") ++set(DYNOLOG_INCLUDE_DIR "/usr/include/dynolog/") ++set(IPCFABRIC_INCLUDE_DIR "/usr/include/dynolog/src/ipcfabric/") + + message(INFO " CUPTI_INCLUDE_DIR = ${CUPTI_INCLUDE_DIR}") + message(INFO " ROCTRACER_INCLUDE_DIR = ${ROCTRACER_INCLUDE_DIR}") + message(INFO " DYNOLOG_INCLUDE_DIR = ${DYNOLOG_INCLUDE_DIR}") + message(INFO " IPCFABRIC_INCLUDE_DIR = ${IPCFABRIC_INCLUDE_DIR}") + +-add_subdirectory("${IPCFABRIC_INCLUDE_DIR}") + target_link_libraries(kineto_base PRIVATE dynolog_ipcfabric_lib) + + target_include_directories(kineto_base PUBLIC +@@ -160,7 +159,6 @@ + $ + $ + $ +- $ + $ + $ + $ +@@ -168,7 +166,6 @@ + $) + + target_include_directories(kineto_api PUBLIC +- $ + $) + + if(KINETO_LIBRARY_TYPE STREQUAL "default") +@@ -202,8 +199,6 @@ + if(CUDA_nvperf_host_LIBRARY) + target_link_libraries(kineto "${CUDA_nvperf_host_LIBRARY}") + endif() +-target_link_libraries(kineto $) +-add_dependencies(kineto fmt::fmt-header-only) + + install(TARGETS kineto EXPORT kinetoLibraryConfig + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild b/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild new file mode 100644 index 000000000000..fb7e15a451db --- /dev/null +++ b/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild @@ -0,0 +1,51 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit python-any-r1 cmake + +CommitId=a30ca3f9509c2cfd28561abbca51328f0bdf9014 + +DESCRIPTION="part of the PyTorch Profiler" +HOMEPAGE="https://github.com/pytorch/kineto" +SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" + +RDEPEND=" + dev-libs/libfmt + dev-libs/dynolog +" +DEPEND="${RDEPEND}" +BDEPEND=" + test? ( dev-cpp/gtest ) + ${PYTHON_DEPS} +" +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${PN}-0.4.0-gcc13.patch +) + +S="${WORKDIR}"/${PN}-${CommitId} + +src_prepare() { + cd libkineto + cmake_src_prepare +} + +src_configure() { + cd libkineto + local mycmakeargs=( + -DLIBKINETO_THIRDPARTY_DIR=/usr/include/ + ) + + cmake_src_configure +} -- cgit v1.2.3