From nobody Fri Mar 22 04:11:35 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 4V185z1jQvz5FcXY; Fri, 22 Mar 2024 04:11:35 +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 4V185z1Gw2z43Z8; Fri, 22 Mar 2024 04:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711080695; 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=l599GUgHWQb6gPCkBC0oI92OnWoj30EXkcKhZaUVXu4=; b=Gs2KLPOP54Iq22s8tLPXT1I+u6HomOf7CE4VJt+iRemdjIurMUOTBMFqcpcVnQYQIu47zG uA9Wtt8kqVfJ0UM/BzQK84lHp0qrwLYYR+JpkY+UFDzCb9zJLk82A/H+3L8e9loWpO7h+X +UdOrAPnelLxtxWXe3lZ1GZpRqYqlRRl3aucsIVKhiwk/hNYXWVskHnPEAV+T5EEXH6tm+ J+gsH6EBRRMVJmQBDDOVR4TIF2mCEKrboCFK8b7C5nC/3kIqpxWWtgHk8p2O5F+bSARLAA 5/vbUO+pX5R8FUBrITDowYxlN6OKPTOESkJztzXi4Y6iJRMKVfxlJNuTBEOBgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711080695; a=rsa-sha256; cv=none; b=cG0Nwir18Pk2gpgmVr5tqiutBsngQrW3E6RDyoc1Yuej5q1uqFiRueq4Wk68znqXoqrVZd 3BZGv6zwRDP6tP0Ehb0OID8pJ3XEEeYZNE5iFOZcfyEYA0NRHW+DSdeyC+7P4BaZV+C/Hi 9CTqHhUhkI0KCZxSUMyD4Momlk9S4a8YbTRkvXM9L3zxWqySN+ctWxFJ61GqKgdPlV/gjU innRyYTBgh2dSg5+qcGtEeRH81zCZYxUeoS5LqMLd3m91EmcrAikTdcpd+dgDM4IHaP0yR qj+3iwWRVEg+iQjZFvsQUQfvV8onQPi/6hx6Gx9sCumg0ODStH38wXnyv2cBBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711080695; 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=l599GUgHWQb6gPCkBC0oI92OnWoj30EXkcKhZaUVXu4=; b=n4pCL0Ytw6RfIJxKEPOpqjrrO98yYCES46HgLETQ12BHAwplMH9iwx+jyy9M9ZsQnXimo/ vlShLrDL6eBGH8ajayRaeg6Eyq1QFqD6TEvU8ccSmql77z/DX3VNz9GPpI2NbU2nw4k9Ol qD84b9xOfUVKjbGeVqcd7ZQpU/VC3T51T89u1FHpqcx3scNYFJTH0KOVd+59Jwi0EU209Y QV/xgbOaiDf83atq4a5MGqWt5SAYzoDjXGVykbIQyE2OQQ302A8HpB9kclMOl0PO2VgvHl 6n9Dke02HtdYk9aFsa/qc/l2+bNE/77CJWRzzu03us6aAuGqs0qk5PGOUsfHSg== 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 4V185z0tdvz14M1; Fri, 22 Mar 2024 04:11:35 +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 42M4BZQ5052873; Fri, 22 Mar 2024 04:11:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M4BZjL052870; Fri, 22 Mar 2024 04:11:35 GMT (envelope-from git) Date: Fri, 22 Mar 2024 04:11:35 GMT Message-Id: <202403220411.42M4BZjL052870@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 4719d1e11f5e - main - misc/py-pytorch: Fix the problem that the cpuinfo library didn't support FreeBSD 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4719d1e11f5e300f686b174cf6ca9baf5c20e1b0 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=4719d1e11f5e300f686b174cf6ca9baf5c20e1b0 commit 4719d1e11f5e300f686b174cf6ca9baf5c20e1b0 Author: Yuri Victorovich AuthorDate: 2024-03-22 02:53:33 +0000 Commit: Yuri Victorovich CommitDate: 2024-03-22 02:56:13 +0000 misc/py-pytorch: Fix the problem that the cpuinfo library didn't support FreeBSD The symptoms included error messages and exceptions. Now the bundled cpuinfo directory is replaced with the cpuinfo patched with the pull request patch that fixes FreeBSD compatibility. --- misc/py-pytorch/Makefile | 11 +++++++++++ misc/py-pytorch/distinfo | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/misc/py-pytorch/Makefile b/misc/py-pytorch/Makefile index 8f556eab3bdb..bff54f2c9fc1 100644 --- a/misc/py-pytorch/Makefile +++ b/misc/py-pytorch/Makefile @@ -1,9 +1,11 @@ PORTNAME= pytorch DISTVERSIONPREFIX= v DISTVERSION= 2.2.1 +PORTREVISION= 1 CATEGORIES= misc # machine-learning MASTER_SITES= https://github.com/pytorch/pytorch/releases/download/v${DISTVERSION}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +DISTFILES= ${PORTNAME}-${DISTVERSIONFULL}${EXTRACT_SUFX} # the main tarball disappears when GH_xx tags are added w/out this line DIST_SUBDIR= ${PORTNAME} MAINTAINER= yuri@FreeBSD.org @@ -42,6 +44,9 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dill>0:devel/py-dill@${PY_FLAVOR} # optiona USES= compiler:c++17-lang localbase:ldflags python USE_PYTHON= distutils autoplist +USE_GITHUB= nodefault +GH_TUPLE= pytorch:cpuinfo:3a3b76bc8845d0f4a2ea3108e256313458c5de03:cpuinfo/cpuinfo-with-freebsd-support # https://github.com/pytorch/cpuinfo/pull/230/commits + MAKE_ENV= USE_NINJA=no # ninja breaks for some reason MAKE_ENV+= BUILD_TEST=0 # ninja breaks for some reason MAKE_ENV+= USE_MKLDNN=0 # disable MKLDNN that doesn't exist, see https://github.com/pytorch/pytorch/issues/100957 @@ -58,6 +63,12 @@ POST_PLIST= fix-plist USES+= llvm:max=15 .endif +post-patch: + @cd ${WRKSRC} && \ + ${RM} -r third_party/cpuinfo third_party/fbgemm/third_party/cpuinfo && \ + ${CP} -r cpuinfo-with-freebsd-support third_party/cpuinfo && \ + ${CP} -r cpuinfo-with-freebsd-support third_party/fbgemm/third_party/cpuinfo + post-install: # strip binaries @${STRIP_CMD} \ ${STAGEDIR}${PYTHON_SITELIBDIR}/torch/bin/torch_shm_manager \ diff --git a/misc/py-pytorch/distinfo b/misc/py-pytorch/distinfo index 70054e4d3cfd..1bd8a1fbc0ce 100644 --- a/misc/py-pytorch/distinfo +++ b/misc/py-pytorch/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1708727478 +TIMESTAMP = 1711068042 SHA256 (pytorch/pytorch-v2.2.1.tar.gz) = 8069467387b8ab7a7279671b9144d80a5c5342b4fa022eb3c1db629a6fd806c9 SIZE (pytorch/pytorch-v2.2.1.tar.gz) = 287453242 +SHA256 (pytorch/pytorch-cpuinfo-3a3b76bc8845d0f4a2ea3108e256313458c5de03_GH0.tar.gz) = 658acaf67573484abc7a093066d3766f9a3b94aff5b77e0f4e9c72cee5ebaa4a +SIZE (pytorch/pytorch-cpuinfo-3a3b76bc8845d0f4a2ea3108e256313458c5de03_GH0.tar.gz) = 3534893