Date: Mon, 3 Jan 2022 09:01:00 GMT From: =?utf-8?Q?Stefan E=C3=9Fer?= <se@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a2cfb3e0589d - main - math/py-numpy: revert obsolete commit 507c189b28 Message-ID: <202201030901.203910sV077045@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=a2cfb3e0589d26cbb8bf569fdf854f6162ff4915 commit a2cfb3e0589d26cbb8bf569fdf854f6162ff4915 Author: Stefan Eßer <se@FreeBSD.org> AuthorDate: 2022-01-03 08:49:26 +0000 Commit: Stefan Eßer <se@FreeBSD.org> CommitDate: 2022-01-03 08:49:26 +0000 math/py-numpy: revert obsolete commit 507c189b28 The sched_getaffinity() function in the C library returned a different error code than expected (i.e. other than returned by GLIBC) if the requested CPU set size did not match the one expected by the system. The error code has been changed from ERANGE to EINVAL as expected by the wrapper for os.sched_getaffinity() in Python, obsoleting the patch that commented out the failing function call in setup.py. --- math/py-numpy/files/patch-numpy_distutils_misc__util.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/math/py-numpy/files/patch-numpy_distutils_misc__util.py b/math/py-numpy/files/patch-numpy_distutils_misc__util.py deleted file mode 100644 index 36f46dc3ae15..000000000000 --- a/math/py-numpy/files/patch-numpy_distutils_misc__util.py +++ /dev/null @@ -1,16 +0,0 @@ ---- numpy/distutils/misc_util.py.orig 2022-01-02 20:27:35 UTC -+++ numpy/distutils/misc_util.py -@@ -92,9 +92,9 @@ def get_num_build_jobs(): - - """ - from numpy.distutils.core import get_distribution -- try: -- cpu_count = len(os.sched_getaffinity(0)) -- except AttributeError: -- cpu_count = multiprocessing.cpu_count() -+# try: -+# cpu_count = len(os.sched_getaffinity(0)) -+# except AttributeError: -+ cpu_count = multiprocessing.cpu_count() - cpu_count = min(cpu_count, 8) - envjobs = int(os.environ.get("NPY_NUM_BUILD_JOBS", cpu_count))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201030901.203910sV077045>