diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-01-03 08:25:41 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-03 08:25:41 +0000 |
| commit | 2f28d79786e67cf29825843d6d04d4591a27f9cf (patch) | |
| tree | 8a64339e27c973dd87bc7bf3434f082998eabe76 /sci-libs/caffe2 | |
| parent | 384d032fe7e048bb10cc9bc9881835c92d7e104c (diff) | |
gentoo auto-resync : 03:01:2023 - 08:25:40
Diffstat (limited to 'sci-libs/caffe2')
| -rw-r--r-- | sci-libs/caffe2/Manifest | 2 | ||||
| -rw-r--r-- | sci-libs/caffe2/caffe2-1.12.0-r1.ebuild (renamed from sci-libs/caffe2/caffe2-1.12.0.ebuild) | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest index efd7900664e6..11de6a38dde1 100644 --- a/sci-libs/caffe2/Manifest +++ b/sci-libs/caffe2/Manifest @@ -2,5 +2,5 @@ AUX caffe2-1.11.0-gentoo.patch 5245 BLAKE2B 46f70234e3073a99297da4d56281a507a396 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 DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7 SHA512 c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7 -EBUILD caffe2-1.12.0.ebuild 4258 BLAKE2B 45e96799704f0dd60faf0bd0a43eba54e56c039a8c5ffc4338806772db9bab97fe4bb402ea5b4a8d9e32a506710a677c395af9b1ccd4546a2942d35ec5eb62ff SHA512 56d31e6e01e87c6043dfca1966a8ab4b91187176da692a94c6d0192e452b0f1397ff94ce6ec2a473527631886e9f87e5c017d03c462b25eb8678987afc83fb4d +EBUILD caffe2-1.12.0-r1.ebuild 4326 BLAKE2B 33fe8cd04aed161d82b54ecc6e680292ca8652b0295ef631a989e36d4b7bb97efe220d08a955d44cb9c5ffc3cb9ff1cfc4bd3b0299189bc3918a9dd500fbdede SHA512 afd5e4a9109adbcc582a61097e065d82d84ecad5e4ef17e1f0846290b0a1d3e1295c5fab7b732b4534cb0e9cce5ded8c997a70ace4ca924f26320d9ad9cd99f6 MISC metadata.xml 961 BLAKE2B 7e0924bce6c952cf8b5e997a50e11aad18d572060087ab877d9600399712a6e46f7bee9938aef6b7af142de21046c1cbe541302a68a20072d1040e7b084b202c SHA512 9ff387a4d11eb83799665e38690f0c668ea6147ab92cc8fd68d4fb60590e51863d4530b885f71bd660429c6d38e573a2a7d8fca5e0139b82111ab05cb61b67d9 diff --git a/sci-libs/caffe2/caffe2-1.12.0.ebuild b/sci-libs/caffe2/caffe2-1.12.0-r1.ebuild index 035c81fabb3a..8f6e1f87386f 100644 --- a/sci-libs/caffe2/caffe2-1.12.0.ebuild +++ b/sci-libs/caffe2/caffe2-1.12.0-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) -inherit python-r1 cmake flag-o-matic +inherit python-single-r1 cmake flag-o-matic MYPN=pytorch MYP=${MYPN}-${PV} @@ -43,7 +43,9 @@ RDEPEND=" ) ffmpeg? ( media-video/ffmpeg:= ) nnpack? ( sci-libs/NNPACK ) - numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) + numpy? ( $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) @@ -57,8 +59,10 @@ DEPEND=" dev-libs/FXdiv dev-libs/pocketfft dev-libs/flatbuffers - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + ') " S="${WORKDIR}"/${MYP} @@ -91,7 +95,6 @@ src_configure() { ewarn "or by running /opt/cuda/extras/demo_suite/deviceQuery | grep 'CUDA Capability'" fi - python_setup local mycmakeargs=( -DBUILD_CUSTOM_PROTOBUF=OFF -DBUILD_SHARED_LIBS=ON @@ -144,11 +147,6 @@ src_configure() { cmake_src_configure } -python_install() { - python_domodule python/caffe2 - python_domodule python/torch -} - src_install() { cmake_src_install @@ -156,8 +154,10 @@ src_install() { doins "${BUILD_DIR}"/CMakeCache.txt rm -rf python - mkdir -p python/torch || die + 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_foreach_impl python_install + python_domodule python/caffe2 + python_domodule python/torch } |