From 6c169675dd21d25ad82ab0560f3d5b1e714219b6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 23 Mar 2024 01:00:42 +0000 Subject: gentoo auto-resync : 23:03:2024 - 01:00:42 --- sci-libs/Manifest.gz | Bin 45137 -> 45142 bytes sci-libs/caffe2/Manifest | 8 - sci-libs/caffe2/caffe2-1.13.1-r6.ebuild | 194 ----------------- sci-libs/caffe2/caffe2-2.0.1-r5.ebuild | 211 ------------------ sci-libs/caffe2/files/caffe2-1.12.0-clang.patch | 42 ---- sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch | 239 --------------------- sci-libs/caffe2/files/caffe2-2.0.0-gentoo.patch | 204 ------------------ sci-libs/caffe2/files/caffe2-2.0.1-cudaExtra.patch | 28 --- sci-libs/cgnslib/Manifest | 2 +- sci-libs/cgnslib/cgnslib-4.4.0-r1.ebuild | 96 +++++++++ sci-libs/cgnslib/cgnslib-4.4.0.ebuild | 96 --------- sci-libs/pytorch/Manifest | 8 - ...-t-build-libtorch-again-for-PyTorch-1.7.1.patch | 18 -- .../pytorch/files/pytorch-1.13.1-emptyso.patch | 15 -- .../files/pytorch-1.13.1-global-dlopen.patch | 23 -- sci-libs/pytorch/files/pytorch-2.0.0-emptyso.patch | 15 -- sci-libs/pytorch/pytorch-1.13.1-r2.ebuild | 63 ------ sci-libs/pytorch/pytorch-2.0.1-r1.ebuild | 67 ------ 18 files changed, 97 insertions(+), 1232 deletions(-) delete mode 100644 sci-libs/caffe2/caffe2-1.13.1-r6.ebuild delete mode 100644 sci-libs/caffe2/caffe2-2.0.1-r5.ebuild delete mode 100644 sci-libs/caffe2/files/caffe2-1.12.0-clang.patch delete mode 100644 sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch delete mode 100644 sci-libs/caffe2/files/caffe2-2.0.0-gentoo.patch delete mode 100644 sci-libs/caffe2/files/caffe2-2.0.1-cudaExtra.patch create mode 100644 sci-libs/cgnslib/cgnslib-4.4.0-r1.ebuild delete mode 100644 sci-libs/cgnslib/cgnslib-4.4.0.ebuild delete mode 100644 sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch delete mode 100644 sci-libs/pytorch/files/pytorch-1.13.1-emptyso.patch delete mode 100644 sci-libs/pytorch/files/pytorch-1.13.1-global-dlopen.patch delete mode 100644 sci-libs/pytorch/files/pytorch-2.0.0-emptyso.patch delete mode 100644 sci-libs/pytorch/pytorch-1.13.1-r2.ebuild delete mode 100644 sci-libs/pytorch/pytorch-2.0.1-r1.ebuild (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index 19ef543a27e3..3448b4707cb2 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 7c25a5549d10..888eeaa49e02 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -1,24 +1,16 @@ -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.13.0-gentoo.patch 8399 BLAKE2B 6664f20013743801eb9cc899e8e451995f2d77fab837923ae9fe959ab1b323bf3c2785ff622cc0bf332ce09126617e3e7a166d8d528ee48e13a15f018f3b4874 SHA512 6b09d74c4962126ac06cc53a2eccecf692810127ddf824a7692981ea675e8c3c65a259ca7a627797b8d6b6106b9ee69789537b8b9bc56419d75aebddba81b8d2 AUX caffe2-1.13.0-install-dirs.patch 5737 BLAKE2B 10b10e3a29976344c7596e1c4e7a604856c66d91cb7518308422f7ffac82ffe183dc81becab27866814c06e321e97458ab6a6908aa01379299c7fdf8fdccf153 SHA512 1e2e4f646cec24b5373872865522a909d1c154623e232c06e3da361e4d29b8d7520c446f53fbf42aab5f00bab05d1f278ce9425e506a9a5ac73cbb10570bd325 AUX caffe2-1.13.1-tensorpipe.patch 374 BLAKE2B 46d45aae88f99c213f0da039bad5aa0c470a6c505ed1d28088ecb8dd445547e52a6d2c087c52c15b20da31808cd9213c1e672880e9bf4afe9c487358b4d4cd9d SHA512 d7315408b3ad4630715c18fff853b07e589ae78f5fcc8eef7f8791202fca459a3b23481856a50a5d432aec26482eb33adf37ba0a37d45f719ceb29081449345d AUX caffe2-2.0.0-cudnn_include_fix.patch 526 BLAKE2B 63959783a94bfa2b02f78e36e754ef6c54d9f3dfb0bfdedd0fb9ef6553204b54b2dfb1676312689bbc3eace897d5f0441faf9af376f27c3c831c3ffcece31e5d SHA512 ff2ba61a4c69620bb1078aa7235b015a6165bc0df65e5e4ec04d4f3515f80dc865cc904d279fefbc90784b571f41d82441ce8045a27947ae7d3d52505e813b3c 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 AUX caffe2-2.1.2-fix-openmp-link.patch 483 BLAKE2B dfe9ae0978b71449486d12f769c3c962001c138bc53b0605ed6f2215fe732356da90c5084488bc4d9f54c88aab2a426b8c935543f7ba0890783bb58da30a5cb4 SHA512 a9cee8ae2a8477a21e92bd4ef286af68efd90283593db7ed4641a826b19b4266bcab9c131c93be2b6c2f13d5cd545c766612791cf2e23cff9a731a03f3ad7648 AUX caffe2-2.1.2-fix-rpath.patch 510 BLAKE2B 6585e8089acc6e7fe69713ad04a64263ab2e9d2d5cf6d3a844dbbc917383e4b7a0688ebdfb3142e3c42108c8c14a6435f48ae4ce3adee8db338286d60ed7b503 SHA512 ede770559b487fff736aded0cf4b077d8308c2b85c5cd139150b04bcb8b72a0d78af6a2b74fbb153b75acff71df0832d8f139231d1c18558f5b5479af348e6a0 AUX caffe2-2.1.2-rocm-fix-std-cpp17.patch 3485 BLAKE2B 38f07fa876e1b628f1709dc35669ee62bbd5b00e23880800a0c430c72365799da86213ba76d344e9b46559ec1a4c98e1be6b46466bee8ebbf484976c597bb5ba SHA512 8dffee073c7744c3eba62f22b5f11d1f5db980fd7e9ac593ae44b489fe1eded532739db397f4599b8cda1b75c26e493dff81c2862056f62823570ab94a8f3389 AUX caffe2-2.2.1-gentoo.patch 6765 BLAKE2B 924338e5823825d18220c33e9168f96b5987350cf47ad26824c660dfe953f54c415a4a709d9d7bab6901687f41f8477c0615ab76773e0e689ecf91e9a7f2ef64 SHA512 e9a20bc83a1c0349927205fc3675b1ad832cb86acca3a8d2f68a3dd33f2c1fa39fb53616b603023dce217d0a29fef34e6abb6315201690a8568d2419bcb9d895 -DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B 75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3 SHA512 f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62 -DIST pytorch-2.0.1.tar.gz 111335778 BLAKE2B 7a10cc2b2d5e2422aef7e060a0c3a62ca5c7460c6e0b9becade9b98939501975c74ed5a175a653731f43ca824d2c9bd31f41d1f633c2b139779ab23d5331e9ce SHA512 2309a22b3be3ccdb36d8d9781a59a7bdcc2fdb8d95ada205702ec77862480f0cbb12cd5d6b8cd3114d01a6e33b7743d0fe9de93debf37138ca5c14403cdb0c43 DIST pytorch-2.1.2.tar.gz 116316469 BLAKE2B c5a55ee264bc3477d3556ba6376b5591117e992e56e0dd0c9ba93d12526e2727f7840f6f1e0730a38223b6492c9556840c4ebf22ffd220e97225c2abff303747 SHA512 a8961d78ad785b13c959a0612563a60e0de17a7c8bb9822ddea9a24072796354d07e81c47b6cc8761b21a6448845b088cf80e1661d9e889b0ed5474d3dc76756 DIST pytorch-2.2.1.tar.gz 116370903 BLAKE2B 7d08e80f91bad76fba1751c30a34bebfe7145058b7758c0d47112702263a80666f70687a8860744725c6aa995e854f766a5bfa4644c23e5635e7e08c8d63a6e9 SHA512 f19ebcf59d183c3348946ba7cfcab2bc4ca93785863b8edc39dba5772083a7b0425ccb4f92a8df4dc0d18246c75e8ff812993161467fbf9dc48d7fb28a1e26f1 -EBUILD caffe2-1.13.1-r6.ebuild 5244 BLAKE2B d7f5f16e1f1122604a6df64f16c62552fb8b4b0de67bd231036b4835a5a71c58da02f0e1df64f3bd22c2a282a150d7f5a803c87cdf792e3e97ec8f518e055191 SHA512 58b1a09e5e3814d9475d4fe0e46aa837477843e09ed1b0c803c2ac3190e5c819d4216e33e3003652194e90a9f3f35146657eb25f30a4419bf16b2067e5a4b027 -EBUILD caffe2-2.0.1-r5.ebuild 5868 BLAKE2B c17450d01ff68d42188c9da9e9c7a6d6469fe5c8b72c91e4ea4456eb4fe9d08cf30619fbb06f3dae21add641329f3ce8ced24bca93eb05900340639c042a1cdb SHA512 d32fa4c194c51efb76b143f22f783efa7a1415902b03ddea1d3f145d632455ebfe672a1b05b1203f2ba752f3331831455ae631a66bb409f45d6c695c68f39c3b EBUILD caffe2-2.1.2-r7.ebuild 7921 BLAKE2B b05ff1d2ec0ba18f0f97ddb1633bf62c52d70fbe6762dd11788d3c13787d74daa737a77c9b24ece013b18108274b9865104b2fdd283fb01e80ea8daf2d119d27 SHA512 3bd6cedaaf74e73e27f87dbb15843f0de8d146dfdb9b4c9c85f98ce8534312a6f09c168186dc42d580ed4da170c2d21e059d4704f87c9906d6440e5139a3627f EBUILD caffe2-2.2.1-r1.ebuild 7393 BLAKE2B 6bd0948a559ec0183366625467d07ad39142ee9644504b753e5108e0a46cbdcdea4838810c31c8a8b5dd71e6200b282973d318ae51a5ef3fcb05df4417650817 SHA512 be767aba07657eda925564c4596cb969a493bd449933fc202df3991a476e83fad6677311c14bca3035e412ab056e4ed64a7d2d233abd5e572153da96137ab876 MISC metadata.xml 1222 BLAKE2B f7224dcb5025c7979dc9060a6fcf26d1f5b724a266cec61b8244c9b7c5f223abc5f00d89ffef1011096c754e418b0ff041b67306b8b68b58c38ea9da56fb5a3c SHA512 7d2d04905fd85d3a5857327f9f9274fee9d262ea2cba4eabd42716a231abd1207118c141df65b3fe86956ef77c55440625d660a0a4b27cdaa573d25d2931d1de diff --git a/sci-libs/caffe2/caffe2-1.13.1-r6.ebuild b/sci-libs/caffe2/caffe2-1.13.1-r6.ebuild deleted file mode 100644 index 1a1184178b12..000000000000 --- a/sci-libs/caffe2/caffe2-1.13.1-r6.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# 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 - -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 ) - 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 - -Date: Wed, 21 Dec 2022 11:19:58 +0000 -Subject: [PATCH] Compile fix for Clang + libc++ (#91212) - -Summary: -LLVM 15 has a compile issue with the deprecated __has_trivial_copy. Update the GCC ifdef logic to exclude Clang + libc++. - -``` -caffe2/c10/util/Optional.h:536:13: error: builtin __has_trivial_copy is deprecated; use __is_trivially_copyable instead [-Werror,-Wdeprecated-builtins] - C10_IS_TRIVIALLY_COPYABLE(T) && - ^ -caffe2/c10/macros/Macros.h:438:38: note: expanded from macro 'C10_IS_TRIVIALLY_COPYABLE' -#define C10_IS_TRIVIALLY_COPYABLE(T) __has_trivial_copy(T) -``` - -Test Plan: CI - -Reviewed By: kit1980 - -Differential Revision: D42180203 - -Pull Request resolved: https://github.com/pytorch/pytorch/pull/91212 -Approved by: https://github.com/kit1980, https://github.com/soumith ---- - c10/macros/Macros.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/c10/macros/Macros.h b/c10/macros/Macros.h -index 9098a294228f4..09e57ca0a4d6a 100644 ---- a/c10/macros/Macros.h -+++ b/c10/macros/Macros.h -@@ -434,7 +434,8 @@ __device__ __attribute__((noinline)) __attribute__((weak)) void __assert_fail( - // Warning: __has_trivial_copy for GCC may not always detect the non-POD - // correctly. For example, T = std::unique_ptr may evaluate to true and be - // treated as POD. This can cause unexpected behavior. --#if defined(__GNUG__) && __GNUC__ < 5 -+#if defined(__GNUG__) && __GNUC__ < 5 && \ -+ !(defined(__clang__) && defined(_LIBCPP_VERSION)) - #define C10_IS_TRIVIALLY_COPYABLE(T) __has_trivial_copy(T) - #else - #define C10_IS_TRIVIALLY_COPYABLE(T) std::is_trivially_copyable::value diff --git a/sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch b/sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch deleted file mode 100644 index f72d44f475fa..000000000000 --- a/sci-libs/caffe2/files/caffe2-1.13.0-gentoo.patch +++ /dev/null @@ -1,239 +0,0 @@ ---- 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") -@@ -789,7 +789,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") -@@ -834,6 +834,7 @@ - endif() - - if(USE_FBGEMM) -+ list(APPEND Caffe2_DEPENDENCY_LIBS fbgemm) - caffe2_update_option(USE_FBGEMM ON) - else() - caffe2_update_option(USE_FBGEMM OFF) -@@ -1557,7 +1558,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 +1850,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 +1858,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 -- $<$,$,$>>:-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/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 - #include - -+#include - #include - #include --#include - #include --#include - - #include - #include -@@ -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-2.0.0-gentoo.patch b/sci-libs/caffe2/files/caffe2-2.0.0-gentoo.patch deleted file mode 100644 index fce7a395023e..000000000000 --- a/sci-libs/caffe2/files/caffe2-2.0.0-gentoo.patch +++ /dev/null @@ -1,204 +0,0 @@ ---- a/cmake/Dependencies.cmake -+++ b/cmake/Dependencies.cmake -@@ -486,7 +486,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) -@@ -542,7 +542,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") -@@ -802,7 +802,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") -@@ -847,6 +847,7 @@ - endif() - - if(USE_FBGEMM) -+ list(APPEND Caffe2_DEPENDENCY_LIBS fbgemm) - caffe2_update_option(USE_FBGEMM ON) - else() - caffe2_update_option(USE_FBGEMM OFF) -@@ -1554,7 +1555,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) -@@ -1819,7 +1819,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`. - # -@@ -1828,9 +1827,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 -@@ -65,7 +65,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 -@@ -799,12 +799,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) -@@ -912,8 +911,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) - endif() - - if(USE_ASAN) ---- 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 -- $<$,$,$>>:-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 -@@ -106,7 +106,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 "") -@@ -533,7 +533,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)) -@@ -811,7 +812,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 -@@ -975,7 +977,6 @@ - endif() - - if(NOT MSVC AND USE_XNNPACK) -- TARGET_LINK_LIBRARIES(torch_cpu PRIVATE fxdiv) - endif() - - # ========================================================== -@@ -1095,8 +1098,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/caffe2/files/caffe2-2.0.1-cudaExtra.patch b/sci-libs/caffe2/files/caffe2-2.0.1-cudaExtra.patch deleted file mode 100644 index 2366c04c1b40..000000000000 --- a/sci-libs/caffe2/files/caffe2-2.0.1-cudaExtra.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 - -@@ -213,7 +213,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}") - endif() - - # --- generate runtime files ---- 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/cgnslib/Manifest b/sci-libs/cgnslib/Manifest index d78be7b277d8..4991ae8ce801 100644 --- a/sci-libs/cgnslib/Manifest +++ b/sci-libs/cgnslib/Manifest @@ -1,5 +1,5 @@ DIST cgnslib-4.3.0.tar.gz 1472044 BLAKE2B 8fa59eb2c13b163553c03991af1886d2162295367094937c3b7bbbc687f098e736a927fb6835fabb43ecfbe59edcf0e58e8977e89eeb1ef12b26568fbdc78e2c SHA512 5db97b8df8cb5b108a65513e20774881c1dfa790dd96bec46119883d934db18e3f88450d287690cb785e0875af87a3ec32b6c4665c54edb623161122ee85aa93 DIST cgnslib-4.4.0.tar.gz 1979828 BLAKE2B 1bf7a5eb8a69a488707da6e945228e053486cdfc64508ae6362ca84777bb5c22a7238676f24ca453cc8b5e2825482d473a2b84c1648849bb6f853fc0aa0a9100 SHA512 86c16d40b524519362645c553c91bade9bb7e4bffde7bf4de96a7f471ae3779a15781efa91efa059b2af0b127f08a560d2e903df6b45e1c79eaec6061db226e9 EBUILD cgnslib-4.3.0-r2.ebuild 2066 BLAKE2B 10a9064f30e3c2af9d17f06144d003f3d92390cb49ec45c80eaee799bbe6385c1d88f8b6097736d91cb6227435d02015d77e542465be17eafa8801cb77928df2 SHA512 e428d30c5403f230753ee655d8494df261c005dd0ee8a5820ba451e00dd7bbb229b5670a843bb5fdadebf0c7a144cfa23472fd3a5f558b69de80f2d95efd227d -EBUILD cgnslib-4.4.0.ebuild 2067 BLAKE2B 93aa8f8a98ec7e550f6e4eaae4cbdfb82e594f9f650e3dfd8f80b847db83643a86d6dae13536f5f49fd433399e06cfbe2aa45b3be266ca24f7d5c7c8fe8db687 SHA512 f075ae9b6861375bd0e5d586f4d33a7e8fc4ace531e691b2e31ee8c7095a50f655277818328c170163adeb7840894f930d2035387614777bdf26f0aa9bc52d5f +EBUILD cgnslib-4.4.0-r1.ebuild 2080 BLAKE2B 0ec63200766a71e8da91b5510e90757ca58eb5ab7ad79cfb822429a5512dd16d03a493152cf950b1948aedbb18b3d9f119e93a2bfad920bf28981c3e587c9fb4 SHA512 9bd670108e4da827a4c85729be586daafcb5d5cea3a58bf2924fc5969e1ada058d22079ad56e5ba7f64b6d0c2be0a1a30faf60c5bbec0b8928248c79a0575a9d MISC metadata.xml 1273 BLAKE2B 05b98760182f6ab2586a969e7cd49a56b077f3c0f208460967b5b240cde12c3b62655223947646d48c743cb706b81e59693c693fbcdf703c75642958491d5902 SHA512 af36842f7cefc358474fd6b3646dda0974c0ee443d56babc48955340be64719b1c4548e952c93898265d6950f32bfb7db87472ca196b290ca13a8c20ed2244c2 diff --git a/sci-libs/cgnslib/cgnslib-4.4.0-r1.ebuild b/sci-libs/cgnslib/cgnslib-4.4.0-r1.ebuild new file mode 100644 index 000000000000..e3836dc84986 --- /dev/null +++ b/sci-libs/cgnslib/cgnslib-4.4.0-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +FORTRAN_NEEDED="fortran" +FORTRAN_STANDARD="90 2003" + +inherit cmake flag-o-matic fortran-2 + +DESCRIPTION="CFD General Notation System standard library" +HOMEPAGE=" + https://cgns.github.io/ + https://github.com/CGNS/CGNS +" +SRC_URI="https://github.com/CGNS/CGNS/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/CGNS-${PV}" + +LICENSE="ZLIB" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +IUSE="base-scope debug examples fortran hdf5 legacy mpi scoping szip test tools" + +RDEPEND=" + hdf5? ( sci-libs/hdf5:=[mpi=,szip=] ) + tools? ( + dev-lang/tcl:= + dev-lang/tk:= + x11-libs/libXmu:= + virtual/glu + virtual/opengl + ) +" +DEPEND="${RDEPEND}" + +RESTRICT=" + fortran? ( test ) + !test? ( test ) +" +REQUIRED_USE=" + mpi? ( hdf5 ) + szip? ( hdf5 ) +" + +pkg_setup() { + use fortran && fortran-2_pkg_setup +} + +src_prepare() { + # gentoo libdir + sed \ + -e 's|/lib|/'$(get_libdir)'|' \ + -e '/DESTINATION/s|lib|'$(get_libdir)'|g' \ + -i src/CMakeLists.txt || die + cmake_src_prepare +} + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/862684 + # https://github.com/CGNS/CGNS/issues/758 + filter-lto + + local mycmakeargs=( + -DCGNS_BUILD_SHARED=ON + -DCGNS_USE_SHARED=ON + + -DCGNS_BUILD_CGNSTOOLS="$(usex tools)" + -DCGNS_ENABLE_BASE_SCOPE="$(usex base-scope)" + -DCGNS_ENABLE_FORTRAN="$(usex fortran)" + -DCGNS_ENABLE_HDF5="$(usex hdf5)" + -DCGNS_ENABLE_LEGACY="$(usex legacy)" + -DCGNS_ENABLE_SCOPING="$(usex scoping)" + -DCGNS_ENABLE_MEM_DEBUG="$(usex debug)" + -DCGNS_ENABLE_TESTS="$(usex test)" + ) + + if use mpi; then + mycmakeargs+=( + -DHDF5_NEED_MPI="$(usex mpi)" + -DHDF5_NEED_SZIP="$(usex szip)" + -DHDF5_NEED_ZLIB="$(usex szip)" + ) + fi + + cmake_src_configure +} + +src_install() { + cmake_src_install + dodoc README.md release_docs/{HISTORY,RELEASE,changes_from_2.5}.txt + rm "${ED}/usr/$(get_libdir)/libcgns.a" || die + dodoc release_docs/*.pdf + docompress -x /usr/share/doc/${PF}/examples + use examples && dodoc -r src/examples +} diff --git a/sci-libs/cgnslib/cgnslib-4.4.0.ebuild b/sci-libs/cgnslib/cgnslib-4.4.0.ebuild deleted file mode 100644 index efb68a32697b..000000000000 --- a/sci-libs/cgnslib/cgnslib-4.4.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -FORTRAN_NEEDED="fortran" -FORTRAN_STANDARD="90 2003" - -inherit cmake flag-o-matic fortran-2 - -DESCRIPTION="CFD General Notation System standard library" -HOMEPAGE=" - https://cgns.github.io/ - https://github.com/CGNS/CGNS -" -SRC_URI="https://github.com/CGNS/CGNS/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/CGNS-${PV}" - -LICENSE="ZLIB" -SLOT="0/4" -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" -IUSE="base-scope debug examples fortran hdf5 legacy mpi scoping szip test tools" - -RDEPEND=" - hdf5? ( sci-libs/hdf5:=[mpi=,szip=] ) - tools? ( - dev-lang/tcl:= - dev-lang/tk:= - x11-libs/libXmu:= - virtual/glu - virtual/opengl - ) -" -DEPEND="${RDEPEND}" - -RESTRICT=" - fortran? ( test ) - !test? ( test ) -" -REQUIRED_USE=" - mpi? ( hdf5 ) - szip? ( hdf5 ) -" - -pkg_setup() { - use fortran && fortran-2_pkg_setup -} - -src_prepare() { - # gentoo libdir - sed \ - -e 's|/lib|/'$(get_libdir)'|' \ - -e '/DESTINATION/s|lib|'$(get_libdir)'|g' \ - -i src/CMakeLists.txt || die - cmake_src_prepare -} - -src_configure() { - # -Werror=lto-type-mismatch - # https://bugs.gentoo.org/862684 - # https://github.com/CGNS/CGNS/issues/758 - filter-lto - - local mycmakeargs=( - -DCGNS_BUILD_SHARED=ON - -DCGNS_USE_SHARED=ON - - -DCGNS_BUILD_CGNSTOOLS="$(usex tools)" - -DCGNS_ENABLE_BASE_SCOPE="$(usex base-scope)" - -DCGNS_ENABLE_FORTRAN="$(usex fortran)" - -DCGNS_ENABLE_HDF5="$(usex hdf5)" - -DCGNS_ENABLE_LEGACY="$(usex legacy)" - -DCGNS_ENABLE_SCOPING="$(usex scoping)" - -DCGNS_ENABLE_MEM_DEBUG="$(usex debug)" - -DCGNS_ENABLE_TESTS="$(usex test)" - ) - - if use mpi; then - mycmakeargs+=( - -DHDF5_NEED_MPI="$(usex mpi)" - -DHDF5_NEED_SZIP="$(usex szip)" - -DHDF5_NEED_ZLIB="$(usex szip)" - ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - dodoc README.md release_docs/{HISTORY,RELEASE,changes_from_2.5}.txt - rm "${ED}/usr/$(get_libdir)/libcgns.a" || die - dodoc release_docs/*.pdf - docompress -x /usr/share/doc/${PF}/examples - use examples && dodoc -r src/examples -} diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest index 69d7de88a98a..24253bf81936 100644 --- a/sci-libs/pytorch/Manifest +++ b/sci-libs/pytorch/Manifest @@ -1,20 +1,12 @@ -AUX 0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch 599 BLAKE2B 4ad99f05d69f53336e6c874b7783c5fb9e800808c6adf588263af215eda865ddf215df8fa803e48220b879fd2f90d71139a6e38bbdc947abc7854cab88a756ad SHA512 fd0e3db9cb68e14d3d90a613d91511acc752c1d764bada85e6dace59b45fe2cf42bca6b77c281084bd04de88d5fefbb5d81be165d288ed3da251e7b0d4c6e86e AUX pytorch-1.13.0-setup.patch 357 BLAKE2B 9741c5285353ac09581f54a823e77b069afbe5d9165a6545bd50a2b020298a358783d61fc5923188ddf7fec0929ec92eabeefc8c3be329793f12326aef5f89c5 SHA512 4632b0ea06704122e86dd27836d96ee59fc1ea236e69031fc65a21b2c9eafae21fc9344e55f17ee0c6374e3368f7ad1e3cec3b2be1af5e21bd10902684c72161 -AUX pytorch-1.13.1-emptyso.patch 490 BLAKE2B 97de7ab941aaf1d21714654a26ddd52247b7ab57f18364ef85a7086628c0cb7f36f681bc4f54a832462c24ac0b96c33773d3843203c64fde93cde63e7784f8a2 SHA512 e4795fcc870f5968370ec00dcee7b474059d8f1a0de468daf01edcc417bbdbc6af7d1c945e70d6a00f3c709e62f474b80792fe30baed66e49b198b893ad92998 -AUX pytorch-1.13.1-global-dlopen.patch 961 BLAKE2B 215e85440efef71df0e96c1014c8922237016e433c639ae3b002266a43e01da8686bd89d1e50ed0164ac29bbde902ff3df9abdfff304cfede856ebd125bb1c58 SHA512 b924ec573f8225bd2655f7c6c5e344909754a5330ce0a78d5cf00620884e15b23698ca99125fd74bcb12f300161aa3dd881a921fd51b2caa974709a81e8a2ee9 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 -AUX pytorch-2.0.0-emptyso.patch 522 BLAKE2B 8c0dd836c19bf64846bc2fc401b917494f01080b1a8ab8f6c284658f35d6d647070f536e33adae8bc77de1c36ebc4d54aa90ca6b6992decd3b68dd95c273b931 SHA512 5432165bc5cd5e428a086a05581bedace5487b48b093ece843c8d4756580b0b0387f213b0ca92ceeca700fa6605b432e0442ecb4ef9f9248ee3d7ae1a576ac22 AUX pytorch-2.0.0-global-dlopen.patch 834 BLAKE2B da3ddd29124ab345e50acd4b42cb310d75d7c9b13005ee41051a1a2b702958b81677fe4f7e76dcd678dd439c89114de2e568f4330380e6e621d2975957293921 SHA512 fa0156229d7cd20e0f3949913750ecf3d8c2f0e872c8dc272cb0144427e079938588c7d4d3fec087b6cfd7846ed6844fbaa3c5510e9be8890be926ba854f7833 AUX pytorch-2.1.1-dontbuildagain.patch 443 BLAKE2B 67cc940ae5be4d3a0a5ef6670a72de4f3419582b59bb7e905d4ee704c928c353f1ef03a446ac97f0718d24e5a88fc656c8e58e26f869c6eeef5d21b918308f36 SHA512 4acf9dfca8e998a5ec1f6eebb7ffd5833f065dd995ef735c50ce34fb2553bbacc974c13eeaf07962d00de0f795fd4366a1866d1bb834ed93098217400db9dc6c AUX pytorch-2.1.1-emptyso.patch 527 BLAKE2B 104352b254b1f6a2e7b842265f9796d93c7fb23d4681961aad53ebcea8a7068a2ea9799d466555fa00db52db0136cb74d87853835e25f678c5ba641f8a76b8a0 SHA512 35aae74a0c95e9967909756af5c486e4c3555536016c2d4a37b9048e503c70f490cbf75c1d7814adcbbfeb3ba08a1e8ffac5507d8c964b28c0452f6eab03ca5b AUX pytorch-2.2.1-emptyso.patch 464 BLAKE2B 8c93245f36218a63a910ddf41e1181c83306485ae788cc47ad191641dfed13b2f0ce8b492c9e377279a2ee8ed83c2aaac25e1ba8b4cad3d5a07c7bbc95d60063 SHA512 1f5cbd5937d20411a74812347a2a02111d80fcc73453717eb136d8e3ffc94f839234713b77c2c89b07f87404a132fd0a1d345666df8d6a3ba01284cc0b752fc2 -DIST pytorch-1.13.1.tar.gz 108279745 BLAKE2B 75de03b74dfdaf8d8fb5ea743fcc0c1b0e408a714ad4160c487921220a7b1755e5fa6e587e6bbc8c9f34dd75e096d2e6dd69c80d24821835fff6c833314434d3 SHA512 f16f89d027efade11d057245cad5b69a390e88b458398310ae30de2dbff7c8fd7f1165be7b8da7ea989c81ac3f5a66c5cb9050610e441a97c83fb8aa28c0bd62 -DIST pytorch-2.0.1.tar.gz 111335778 BLAKE2B 7a10cc2b2d5e2422aef7e060a0c3a62ca5c7460c6e0b9becade9b98939501975c74ed5a175a653731f43ca824d2c9bd31f41d1f633c2b139779ab23d5331e9ce SHA512 2309a22b3be3ccdb36d8d9781a59a7bdcc2fdb8d95ada205702ec77862480f0cbb12cd5d6b8cd3114d01a6e33b7743d0fe9de93debf37138ca5c14403cdb0c43 DIST pytorch-2.1.2.tar.gz 116316469 BLAKE2B c5a55ee264bc3477d3556ba6376b5591117e992e56e0dd0c9ba93d12526e2727f7840f6f1e0730a38223b6492c9556840c4ebf22ffd220e97225c2abff303747 SHA512 a8961d78ad785b13c959a0612563a60e0de17a7c8bb9822ddea9a24072796354d07e81c47b6cc8761b21a6448845b088cf80e1661d9e889b0ed5474d3dc76756 DIST pytorch-2.2.1.tar.gz 116370903 BLAKE2B 7d08e80f91bad76fba1751c30a34bebfe7145058b7758c0d47112702263a80666f70687a8860744725c6aa995e854f766a5bfa4644c23e5635e7e08c8d63a6e9 SHA512 f19ebcf59d183c3348946ba7cfcab2bc4ca93785863b8edc39dba5772083a7b0425ccb4f92a8df4dc0d18246c75e8ff812993161467fbf9dc48d7fb28a1e26f1 -EBUILD pytorch-1.13.1-r2.ebuild 1523 BLAKE2B 718a7d93fd6b59802e9f3e4033b7674f46197427214586f821939ca34f1aeb5c6a941aea35c4a0c7d6eb25c0d652d6bbbaf710d81bc1ffbc704665e4a65ec32e SHA512 aaa8f78c6e0156e7e2d9b23b0a2e3c21cbcead4540b59a3c75bc7da3968d7cdf7bbc4b6cf318aa647b039d915241a99977396c7f9a092a4d8ca51450d0979970 -EBUILD pytorch-2.0.1-r1.ebuild 1651 BLAKE2B 634eb7914dd4cde80754ac182c44103ed9e2669538c8ea20b3975c7fe39a1bac22cc480b4003d23f950ff6edc667f26e6368c88a54f6f968fb709b0b4f9df908 SHA512 40db1eac8fc2fb0a3e7ed179fed59f19ce27f8888af3782074e3e41d2e8f51a9aa38babebc67a2add6e31b13df53d8b90e95599163c6d00406f6d21b8ebfe6b6 EBUILD pytorch-2.1.2-r1.ebuild 1616 BLAKE2B 5dc0bf21d5dde0c7f47afa6502ac550e84679f22a7030749e83e9ee145d96d4cc3a2779a063613674df43b6f186a6c09bdbead2bed10b564694913bb492717da SHA512 0936ee5f59dac44a9547be6bc3a20706f565016f7b6965de4d5b8f73c9e533b788851f8a5260a633ac0dec90d16f12f3e3212620336986ee10fe42645381f27c EBUILD pytorch-2.2.1.ebuild 1608 BLAKE2B 83d8d7bf3fbfaf1c87d6fa500f66f574119d49e6c324b89259f53e61dd4fdad458e262790f097851a3be18aed7d621830be028f954de7d5a48e9a13481566dc8 SHA512 22bdcb0bbb600a86341b9b557de41921e29dc509c3f5940d8ec963b84d1d1c883e760b16297dd9e13998226e38427d736976eee54ceacf693398b22ccec49878 MISC metadata.xml 328 BLAKE2B f49c6d62ac88dfffe497ed05b1f727941a94acb87a809611dda8aedbd87508fdfdf94ec0e025cac2a649b0881b600236289943b4be0f6ca44fc105b6d8fbe97c SHA512 16c29d2c1177a89026235191ea3e33870c2e6b63f029b7febd4dbd2e99f598fab4b4fd2fa7a801ffd88393663a00752300e6e2cc847a83690b715bcc481d9dc2 diff --git a/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch b/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch deleted file mode 100644 index 640d061fcc59..000000000000 --- a/sci-libs/pytorch/files/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/setup.py b/setup.py -index 2db381644c..2241a33015 100644 ---- a/setup.py -+++ b/setup.py -@@ -363,13 +363,6 @@ def build_deps(): - check_submodules() - check_pydep('yaml', 'pyyaml') - -- build_caffe2(version=version, -- cmake_python_library=cmake_python_library, -- build_python=True, -- rerun_cmake=RERUN_CMAKE, -- cmake_only=CMAKE_ONLY, -- cmake=cmake) -- - if CMAKE_ONLY: - report('Finished running cmake. Run "ccmake build" or ' - '"cmake-gui build" to adjust build options and ' diff --git a/sci-libs/pytorch/files/pytorch-1.13.1-emptyso.patch b/sci-libs/pytorch/files/pytorch-1.13.1-emptyso.patch deleted file mode 100644 index 1479354b7f7a..000000000000 --- a/sci-libs/pytorch/files/pytorch-1.13.1-emptyso.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/setup.py 2023-03-24 22:36:50.361860100 +0100 -+++ b/setup.py 2023-03-24 22:36:57.384752383 +0100 -@@ -922,12 +922,6 @@ - name=str('caffe2.python.caffe2_pybind11_state_hip'), - sources=[]), - ) -- if cmake_cache_vars['BUILD_FUNCTORCH']: -- extensions.append( -- Extension( -- name=str('functorch._C'), -- sources=[]), -- ) - - cmdclass = { - 'bdist_wheel': wheel_concatenate, diff --git a/sci-libs/pytorch/files/pytorch-1.13.1-global-dlopen.patch b/sci-libs/pytorch/files/pytorch-1.13.1-global-dlopen.patch deleted file mode 100644 index 4f414be67a29..000000000000 --- a/sci-libs/pytorch/files/pytorch-1.13.1-global-dlopen.patch +++ /dev/null @@ -1,23 +0,0 @@ -Don't hardcode the library path. Leave it to the dynamic loader. - -Index: pytorch-1.13.1/torch/__init__.py -=================================================================== ---- a/torch/__init__.py 2023-02-15 20:27:51.747853677 +0100 -+++ b/torch/__init__.py 2023-02-15 20:28:23.506341918 +0100 -@@ -169,14 +169,14 @@ - lib_path = os.path.join(os.path.dirname(here), 'lib', lib_name) - - try: -- ctypes.CDLL(lib_path, mode=ctypes.RTLD_GLOBAL) -+ ctypes.CDLL(lib_name, mode=ctypes.RTLD_GLOBAL) - except OSError as err: - # Can only happen of wheel with cublas as PYPI deps - # As PyTorch is not purelib, but nvidia-cublas-cu11 is - if 'libcublas.so.11' not in err.args[0]: - raise err - _preload_cuda_deps() -- ctypes.CDLL(lib_path, mode=ctypes.RTLD_GLOBAL) -+ ctypes.CDLL(lib_name, mode=ctypes.RTLD_GLOBAL) - - - if (USE_RTLD_GLOBAL_WITH_LIBTORCH or os.getenv('TORCH_USE_RTLD_GLOBAL')) and \ diff --git a/sci-libs/pytorch/files/pytorch-2.0.0-emptyso.patch b/sci-libs/pytorch/files/pytorch-2.0.0-emptyso.patch deleted file mode 100644 index e4703894308a..000000000000 --- a/sci-libs/pytorch/files/pytorch-2.0.0-emptyso.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/setup.py 2023-04-05 11:23:00.713405789 +0200 -+++ b/setup.py 2023-04-05 11:23:36.900876249 +0200 -@@ -960,12 +960,6 @@ - name=str('caffe2.python.caffe2_pybind11_state_hip'), - sources=[]), - ) -- if cmake_cache_vars['BUILD_FUNCTORCH']: -- extensions.append( -- Extension( -- name=str('functorch._C'), -- sources=[]), -- ) - if cmake_cache_vars['BUILD_NVFUSER']: - extensions.append( - Extension( diff --git a/sci-libs/pytorch/pytorch-1.13.1-r2.ebuild b/sci-libs/pytorch/pytorch-1.13.1-r2.ebuild deleted file mode 100644 index 14b2e8d56547..000000000000 --- a/sci-libs/pytorch/pytorch-1.13.1-r2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_SINGLE_IMPL=1 -inherit distutils-r1 multibuild - -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}"/${P}-global-dlopen.patch \ - "${FILESDIR}"/pytorch-1.7.1-torch_shm_manager.patch \ - "${FILESDIR}"/${PN}-1.13.0-setup.patch \ - "${FILESDIR}"/${P}-emptyso.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 -} diff --git a/sci-libs/pytorch/pytorch-2.0.1-r1.ebuild b/sci-libs/pytorch/pytorch-2.0.1-r1.ebuild deleted file mode 100644 index 2ee51ce0e418..000000000000 --- a/sci-libs/pytorch/pytorch-2.0.1-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_EXT=1 -inherit distutils-r1 multibuild prefix - -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}] - dev-python/sympy[${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}-2.0.0-global-dlopen.patch \ - "${FILESDIR}"/pytorch-1.7.1-torch_shm_manager.patch \ - "${FILESDIR}"/${PN}-1.13.0-setup.patch \ - "${FILESDIR}"/${PN}-2.0.0-emptyso.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 - - hprefixify tools/setup_helpers/env.py -} - -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 develop sdist -} - -src_install() { - USE_SYSTEM_LIBS=ON distutils-r1_src_install -} -- cgit v1.2.3