From nobody Fri Jan 5 16:51:46 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T68cf4HYqz55JlS; Fri, 5 Jan 2024 16:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T68cf2cgNz50gq; Fri, 5 Jan 2024 16:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704473506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jfIIBU1WyZINt7fCQ5Z8cWPYexG0X7ZC2EtLAVUeZ7A=; b=vaPAoyuNAGwNjNe/jxa045hfM4T19KY9yjGD0LQzqRGv3rbqAHeeFElC42pEDiDMJY8wJW jQ8BsRquaQ01akZCrGaTEtxRPsvp++ybD1QXsPbhsj5l87kFHc3VOHIxAOtyyUUi4x0n4e GOttAfb6DzychZtG+BtFjZks9pbqCQzwr1LalAQMB0NvRdbcYRai66Aae9Y1L+9SBJvbLJ 7NDM/Jfdn0CE3mIB8U4FFMF80ERjg4CmagFdRJ7cJo38o5mIjI6+Sz1QQKGJ5NA84owkNr gbS96BBd3hNA04iVQNOynwW85915vKpvTeDpTxwQ331ZbH3xthsN7Q8zpyYuxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704473506; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jfIIBU1WyZINt7fCQ5Z8cWPYexG0X7ZC2EtLAVUeZ7A=; b=v94Fvul3ky8ywjm+E+jzKmLewpNrYZOC431nh1MWiERUbO+RnDmG96na0UxIOfI1gGul5v J/y8SV3vB4huy9LvR5VoJ04BG7zTB2ELeU+lESIv+PbQA7QawghDS5iQietgz9qguzDGbm dJRL4P8Ietf8XlOCszHjCRfr3rl8pX3gIya0o8n0Ia3GR3GfrH5oM7u4O+agRw0WdELL4v YXtjDvaT2bipHhG+NYstL1Pf9QKP03LaQgCML1W+qWc4Xx9kiKNdYfPwkgE+9qCDEVEbrh hAx8Ro9BrJ9znEUrSO+s18Ht6yQ86OI5MIblgTe/DE8N8ZpRg4YM0DeZu9Ee3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704473506; a=rsa-sha256; cv=none; b=ajeuIIRJCrnEkCKS0V6yfdq6kyCtj/yzO3xSwPEpUupfQB4f8K+s5BWw+kGiXjezOdY2iJ wR9b6kbFxN+suG+V4NeCyxTJUnGmTnzyAU3wuSFIDQPpJVTuGxq9d9KX++S4yYKSs7vCBY SBIlDrBxUIqbg1j5+NvwkaJhGygTKddLvHM+etkuUhqP4wBGNxfdENTMsFGNtjsEtXnHz1 aFtDw7FVN/IGaraU1KZ1WiBydr6wi2A+FFiQu0VESF5oMYnYrgXEruDSb1UdboA6EMcg+z 42AEb5voAP8/8wkcDhAbIVXklaBeqmxIDzwmAPfEOP3OKaU9QzqVb0735iY/MA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T68cf1hmjz153h; Fri, 5 Jan 2024 16:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 405GpkaK088615; Fri, 5 Jan 2024 16:51:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 405GpkJS088612; Fri, 5 Jan 2024 16:51:46 GMT (envelope-from git) Date: Fri, 5 Jan 2024 16:51:46 GMT Message-Id: <202401051651.405GpkJS088612@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason W. Bacon" Subject: git: 74265132881f - main - devel/py-joblib: Update to 1.3.2_1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jwb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74265132881f61bd8686ceb3c65f3e9fdec88974 Auto-Submitted: auto-generated The branch main has been updated by jwb: URL: https://cgit.FreeBSD.org/ports/commit/?id=74265132881f61bd8686ceb3c65f3e9fdec88974 commit 74265132881f61bd8686ceb3c65f3e9fdec88974 Author: Jason W. Bacon AuthorDate: 2024-01-05 16:50:06 +0000 Commit: Jason W. Bacon CommitDate: 2024-01-05 16:51:44 +0000 devel/py-joblib: Update to 1.3.2_1 Patch to allow autodeection of hardware cores on FreeBSD Pull request submitted to upstream PR: 275997 Approved by: skreuzer --- devel/py-joblib/Makefile | 1 + .../patch-joblib_externals_loky_backend_context.py | 39 ++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/devel/py-joblib/Makefile b/devel/py-joblib/Makefile index 834e4c30b4c4..ccdeac14f7b0 100644 --- a/devel/py-joblib/Makefile +++ b/devel/py-joblib/Makefile @@ -1,5 +1,6 @@ PORTNAME= joblib PORTVERSION= 1.3.2 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-joblib/files/patch-joblib_externals_loky_backend_context.py b/devel/py-joblib/files/patch-joblib_externals_loky_backend_context.py new file mode 100644 index 000000000000..217577a36292 --- /dev/null +++ b/devel/py-joblib/files/patch-joblib_externals_loky_backend_context.py @@ -0,0 +1,39 @@ +--- joblib/externals/loky/backend/context.py.orig 2023-06-29 15:14:21 UTC ++++ joblib/externals/loky/backend/context.py +@@ -245,6 +245,9 @@ def _count_physical_cores(): + return physical_cores_cache, exception + + # Not cached yet, find it ++ # Using subprocesses is inefficient, but python has no portable ++ # sysctl interface at this time ++ # FIXME: Add OpenBSD, Dragonfly + try: + if sys.platform == "linux": + cpu_info = subprocess.run( +@@ -269,6 +272,26 @@ def _count_physical_cores(): + elif sys.platform == "darwin": + cpu_info = subprocess.run( + "sysctl -n hw.physicalcpu".split(), ++ capture_output=True, ++ text=True, ++ ) ++ cpu_info = cpu_info.stdout ++ cpu_count_physical = int(cpu_info) ++ elif sys.platform.startswith('freebsd'): ++ cpu_info = subprocess.run( ++ "sysctl -n kern.smp.cores".split(), ++ capture_output=True, ++ text=True, ++ ) ++ cpu_info = cpu_info.stdout ++ cpu_count_physical = int(cpu_info) ++ elif sys.platform.startswith('netbsd'): ++ # FIXME: hw.ncpu reports the number of hyperthreads. ++ # We prefer independent cores to prevent oversubscription. ++ # NetBSD does not currently expose physical core counts, ++ # but this is under discussion in PR kern/57816. ++ cpu_info = subprocess.run( ++ "sysctl -n hw.ncpu".split(), + capture_output=True, + text=True, + )