Update pytorch to 1.10.1 improve ebuild quality + switch to EAPI 8

Signed-off-by: Miezhiko <Miezhiko@gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>

2 files changed, 18 insertions, 16 deletions

diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest
index b530dd652..9c481ffdc 100644
--- a/sci-libs/pytorch/Manifest
+++ b/sci-libs/pytorch/Manifest
@@ -76,7 +76,7 @@ DIST psimd-072586a71b55b7f8c584153d223e95687148a90.tar.gz 6825 BLAKE2B db255d2a6
 DIST pthreadpool-029c8862.tar.gz 45970 BLAKE2B 09bd7d258f45fbe703238826b7435d8a5d013700cd734282b646420ba0854c0a386712f6bc3ed44e7496d51471b1e0a965f01ebdb09786e2020d979ecddb767a SHA512 b51099fa9d62065883cc43dcd5f9717a17be5ee2e87fc861667172a09acb3a62929c8bbc8a5c0c00885a638af0ec2ae4149adde2ba85bf3c80834f9b973c2d5b
 DIST pthreadpool-029c88620.tar.gz 45970 BLAKE2B 09bd7d258f45fbe703238826b7435d8a5d013700cd734282b646420ba0854c0a386712f6bc3ed44e7496d51471b1e0a965f01ebdb09786e2020d979ecddb767a SHA512 b51099fa9d62065883cc43dcd5f9717a17be5ee2e87fc861667172a09acb3a62929c8bbc8a5c0c00885a638af0ec2ae4149adde2ba85bf3c80834f9b973c2d5b
 DIST pthreadpool-a134dd5d4cee80cce15db81a72e7f929d71dd413.tar.gz 49011 BLAKE2B 7bfbca81321243e64aa53c668dfe380ce4f7b88477a1c794a4dea9062c9b0969ca745dbfe0abbb95fffbf44080763506609c387ed085d89f6c612be6804b5cc2 SHA512 5f5a1275bbcef13cea88e381010bf2654c9646d30c5fb061f1d6e9e9a0ae6398e137c5e4f7da69f7d8d8b58fb5a7e79f7a4c0c1c3bbaad8f3d0c896d21bc7691
-DIST pytorch-1.10.0.tar.gz 18474149 BLAKE2B 6b0dd6e92733a7e421d0ddc3f809732e66c06bc9f4538064d92f0469749ba2546b6a8c77ca09b8840b00e0d1d5d8fd439a37f8119d73fb2f734139559e69a5d8 SHA512 92b70e6170a7f173c4a9cb29f6cec6dfa598587aa9cf6a620ec861b95da6ea555cbc7285914c0dab6cfc8af320fad4999be4a788acc1f15140664a67ad9dc35d
+DIST pytorch-1.10.1.tar.gz 18475578 BLAKE2B db951d029dfa227376c0f551f04c618730042e868d1b33feadee804fd56cbb2b2a581ee9034ea7f3101a77400db26dd2109050b064ccec564b72c355065704e8 SHA512 55e443ed1c5c709a33824003caa08c1d24712965cb9bdbe22b94b80fb9d94ecbd76d6ff30449fcc0c060ac08a7b54eefdec1c16484328e215c957aa42012c22b
 DIST pytorch-1.6.0.tar.gz 11376568 BLAKE2B 30aac34e14837ed6942ef7577aea77752cd9c809cb751fa837693b2b60eeda9a371421c4b4678fe94763a47e434b65ea60afc56aec7863887ba12bf362b96f0a SHA512 117ff1588ed1ebd0df15fbed066c65ea026893fe9a40d14aa1f73d848fab114b1b11bd7ed083815030f7fdf13a824480521cb40865f48a24c7028f4d195f2127
 DIST pytorch-1.7.1.tar.gz 13012087 BLAKE2B ff498814178281ca59ae80bfe51dde3ffb0cde1eaa762bd9b36c2ff7f07d4b5ae4d68e10c76158e5e9e4250fcb01265a3755575b761495e20cf677e9a9825454 SHA512 359e271093e7afd374202f48e40356d195f644f78377a0b88f38627ad7aeabb9201a18c12ff35fb4aaf0d731168e511504445d8b4c08e92eed50264e23d81bae
 DIST pytorch-1.9.0.tar.gz 16772380 BLAKE2B 16f369cf2752082ab07fa0e497aaff7b90daf94cf39cce533c4a8b06a9237710089af0c137e29fbc79b4cf72d8d47681408e9ada1692431b573d90a07c373f1e SHA512 389ff114367a4337ab6e68178184f04751e4641fac685923afa019093951fa3a446f5265f6661f3aaad99c733c0107391431896c6e876796b8837f5ae75edd99
diff --git a/sci-libs/pytorch/pytorch-1.10.0.ebuild b/sci-libs/pytorch/pytorch-1.10.1.ebuild
index 36d68fb14..8fb18d3a0 100644
--- a/sci-libs/pytorch/pytorch-1.10.0.ebuild
+++ b/sci-libs/pytorch/pytorch-1.10.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake cuda distutils-r1 prefix
 
@@ -56,10 +56,9 @@ https://github.com/mikey/linux-syscall-support/archive/e1e7b0ad8ee99a875b272c8e3
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
-IUSE="asan blas cuda +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkldnn mpi namedtensor +nnpack numa +observers opencl opencv +openmp +python +qnnpack redis rocm static test tools zeromq"
-RESTRICT="!test? ( test )"
+IUSE="asan blas cuda +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkldnn mpi namedtensor +nnpack numa +observers opencl opencv +openmp +python +qnnpack redis rocm static tools zeromq"
 REQUIRED_USE="
 	?? ( cuda rocm )
 "
@@ -104,7 +103,6 @@ RDEPEND="
 BDEPEND="dev-python/pyyaml"
 
 DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 	dev-cpp/tbb
 	app-arch/zstd
 	dev-python/pybind11[${PYTHON_USEDEP}]
@@ -122,6 +120,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.10.0-nonull.patch
 )
 
+distutils_enable_tests pytest
+
 src_prepare() {
 	cmake_src_prepare
 	eprefixify torch/__init__.py
@@ -208,11 +208,11 @@ src_prepare() {
 		#Allow escaping sandbox
 		addread /dev/kfd
 		addread /dev/dri
-		addwrite /dev/kfd
-		addwrite /dev/dri
+		addpredict /dev/kfd
+		addpredict /dev/dri
 
 		ebegin "HIPifying cuda sources"
-		tools/amd_build/build_amd.py
+		${EPYTHON} tools/amd_build/build_amd.py || die
 		eend $?
 
 		export PYTORCH_ROCM_ARCH=$(rocminfo | egrep -o "gfx[0-9]+" | uniq | awk -vORS=';' "{print $1}" | sed 's/;$/\n/') || die
@@ -307,21 +307,23 @@ src_install() {
 	rm -rfv "${ED}/usr/include/include"
 	rm -rfv "${ED}/usr/include/var"
 
-	cp -rv "${WORKDIR}/${P}/third_party/pybind11/include/pybind11" "${ED}/usr/include/"
+	cp -rv "${WORKDIR}/${P}/third_party/pybind11/include/pybind11" "${ED}/usr/include/" || die
 
-	rm -fv "${ED}/usr/${LIB}/libtbb.so"
-	rm -rfv "${ED}/usr/${LIB}/cmake"
+	rm -v "${ED}/usr/${LIB}/libtbb.so" || die
+	rm -r "${ED}/usr/${LIB}/cmake" || die
 
 	if use python; then
-		scanelf -r --fix "${BUILD_DIR}/caffe2/python"
+		scanelf -r --fix "${BUILD_DIR}/caffe2/python" || die
 		USE_SYSTEM_LIBS=ON CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_install
 
 		python_foreach_impl python_optimize
 	fi
 
-	find "${ED}/usr/${LIB}" -name "*.a" -exec rm -fv {} \;
+	find "${ED}/usr/${LIB}" -name "*.a" -exec rm -fv {} \; || die
 
-	use test && rm -rfv "${ED}/usr/test" "${ED}"/usr/bin/test_{api,jit}
+	if use test; then
+		rm -r "${ED}/usr/test" "${ED}"/usr/bin/test_{api,jit} || die
+	fi
 
 	# Remove the empty directories by CMake Python:
 	find "${ED}" -type d -empty -delete || die