From 4dec1dfeca8e16b25934ff861c9eab7d1a8758a1 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 21 Aug 2022 08:40:51 +0100
Subject: gentoo auto-resync : 21:08:2022 - 08:40:51

---
 dev-python/pyopencl/Manifest                 |  2 +-
 dev-python/pyopencl/pyopencl-2022.1.6.ebuild | 25 ++++++++++++++++---------
 2 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'dev-python/pyopencl')

diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 680bb81f324c..9ffadcbfc244 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,5 +1,5 @@
 DIST pyopencl-2022.1.5.tar.gz 454129 BLAKE2B 266bc327c9af5654287fc47cdf4e6002c7cddcd6f5e55bb70bb62aaee666dc5c102f78d4e946f010c1e109390c1d2e981e7ca6ca002d10f66248cb008b308734 SHA512 e6eb3e6d886d8ca1d94867a398b286556fd2d93535bb8481c7603cd521cd47606ce3d9cd6422830c6404305a4a1293234d8774fdda6923bdd2b4fc21fb39d377
 DIST pyopencl-2022.1.6.tar.gz 455424 BLAKE2B 03c46bebc4d6093489b0a1501267d5d67b73e9e7fe50f73cec3dd752fbb699adab63e08d60f3a54c8fd215cbb82c81353d28e875b953686b05e188df78cfe237 SHA512 a1e404c4c5f95d111690c969ae5c5d34f0deca2c8b93a5ce4d90e003031af7eb94a7708f878170a9b6e001b899d321f7dfdaa6f7545af3237d30d237d44bb45f
 EBUILD pyopencl-2022.1.5.ebuild 1572 BLAKE2B aaed0c92df6a752644454b17cdddb25f9c77179404a02b76ad3860d862faa9ff8b108b7f3330e385ab22360a41a25fbb6a4378fa4eee683d20955d71ac15d481 SHA512 60867d0d0708fdf047d72d8fd80a49c2b0b88abecb45a859f5690d9ceb07bb171e8789c9e7239d3f2c428ac2d4fb96fdbbab13d94a034e5c600e7caa196251c8
-EBUILD pyopencl-2022.1.6.ebuild 1599 BLAKE2B addd81de214a3c33e515e7716eb07ce1be83f487470a811e6df4de207bb315501f928290ce831c79f792ea7d67761725f656e8a71916393bcd48e9010a8e358f SHA512 36dccf1dd5cd846a64d6eeeb5fbc8fde0aaeacf7fd178531aa039341d69255a09a6745440980ada2983a0d4a59efef87edf21e358aa0ed34a7d7c9976a5fda84
+EBUILD pyopencl-2022.1.6.ebuild 1820 BLAKE2B 4771789e3bcf994856411c9c0f41f1d7c79c3fa1cf8d0dd5ef149cac0a3ad2277031ed97d8f6c17362cfc269cd31d5c1a9e05546b38194e89646e648e12a677a SHA512 2a6b2abd6ffcc6646599064ce4b34d26eea8b3407ea21ba46818efe19c7c203bc95eca0429adcb4d464c4be8e658693dc9577eb1f5acf94697792661da3fc96f
 MISC metadata.xml 317 BLAKE2B ba532c522d5fd599dfd41180c9813f8124dc64cd3bc7a3a7b1ecdc121b216db4b43f6cae9c32c52a430fbf6e9a22c0cf27ffaf0041ca372d81666991bcf0e979 SHA512 845a8b83a5d7729ea0fca8b704de297b8b8c0d8f315fad0bea7c0c645bc79dd993209e9ca5e89ec9c8ddbe6db2b1f142c3e1f7e5b8e4b6259fe927527ce6a919
diff --git a/dev-python/pyopencl/pyopencl-2022.1.6.ebuild b/dev-python/pyopencl/pyopencl-2022.1.6.ebuild
index 19e2c5a987c8..a1d774b5553c 100644
--- a/dev-python/pyopencl/pyopencl-2022.1.6.ebuild
+++ b/dev-python/pyopencl/pyopencl-2022.1.6.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1
+inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Python wrapper for OpenCL"
 HOMEPAGE="https://mathema.tician.de/software/pyopencl/
@@ -29,15 +29,10 @@ RDEPEND="${COMMON}
 	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/pybind11-2.10.0[${PYTHON_USEDEP}]"
+	<dev-python/pybind11-2.10.0[${PYTHON_USEDEP}]
+	test? ( dev-libs/pocl )"
 
-# The test suite fails if there are no OpenCL platforms available, and
-# even if there is one (which requires the presence of both an OpenCL
-# runtime *and* hardware supported by it - simply emerging any runtime
-# is not enough) the vast majority of tests end up skipped because by
-# default the portage user hasn't got sufficient privileges to talk
-# to the GPU.
-RESTRICT="test"
+distutils_enable_tests pytest
 
 python_configure_all() {
 	local myconf=()
@@ -49,6 +44,18 @@ python_configure_all() {
 		"${myconf[@]}"
 }
 
+python_test() {
+	# Use dev-libs/pocl for testing; ignore any other OpenCL devices that might be present
+	local -x PYOPENCL_TEST="portable:pthread"
+	# Set the number of threads to match MAKEOPTS
+	local -x POCL_MAX_PTHREAD_COUNT=$(makeopts_jobs)
+	# Change to the 'test' directory so that python does not try to import pyopencl from the source directory
+	# (Importing from the source directory fails, because the compiled '_cl' module is only in the build directory)
+	pushd test >/dev/null || die
+	epytest
+	popd >/dev/null || die
+}
+
 python_install_all() {
 	if use examples; then
 		dodoc -r examples
-- 
cgit v1.2.3