From nobody Thu Mar 09 09:49:32 2023 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 4PXPXr3FlZz3wSJx; Thu, 9 Mar 2023 09:49:32 +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 4PXPXr2DhDz4YS0; Thu, 9 Mar 2023 09:49:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678355372; 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=H45II/30Gws8BjOw2v6L7XIBaW1RAQbdzq6UZfWbJBQ=; b=NPp7l1xvqba5wh2uhXqHF+O+6GGLgh29XAITxLmBSxPobLiL0TL3ZTXrFVK1O01fLpfPrQ 1wJcQyajFDcwbkYimdDsP4enmk5YbOg1av1RBhLZOJoFtDghyoQAYweY/SABxBho5Mw7E8 16Arv5rXiZgh6UV0a3txaTAX1Qjq5pA49RdfrtdvYPisouYeqkwdD32AtTxdIQ0F0aHdlZ 5KcCHjsGhhyjALsJoBeTPd4bnBskSb6G7pEJNwJaApUZkP2RuBhbEmFUnwe71hNncIDb0+ E5I+Ve1Ka7ww7gVnO0Sl4/NZssNjDiR6FEmXRoxncmVHfO4ViR4o8YeGwr95cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678355372; 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=H45II/30Gws8BjOw2v6L7XIBaW1RAQbdzq6UZfWbJBQ=; b=q0QfTGhCcCqEr0GPjf7+fTvLr9U6shP5aECNnwUE1n2NyeZHHClH30eL2v1ymkAl+K80jX HKiUDjVE6Tq+FY8Q3SMDiDvAx2fQ0VlEpPgoCd6ITfJxeOzjbPuTf1/y78t7LK8yAQjuzI AkEJBKesSY9c7tYYD2iKuVp8YoU5D3xnEghwatmZPtaUnsfAf12GkRhbMjhpHR8ocoMlRN lGYhMAbp2ZX5GitsVnhn/p4t3mqtWngpBF9AbRWKGea3FEY4Mkie+10z4OAX+MB8+1h8LD HSVucsBOJZ3B9b6rTLctKKlJHKqOP/vc9g6hBAitwNElm4uPqiCxNCrzCjL7YA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678355372; a=rsa-sha256; cv=none; b=qiBjoVVLkq69pzFUaMfzbShS8DGoPW8aU4ol7NyA3Z+AN8oRHN8iWD2E2idS8EQA9IahK2 1gudrWsYnfH2BDJSk46lZ55GsJUVZy+vl2nJYR/qntDCTtTK8n4w2NXTFVacvSUedg/IC6 Ke+3GqMWVcMICX71OZztwFRmeA8IhPsqW2fK7TyTFAE1w9fDHfbhu1f0bQv5YkOKHR0Zcs LV3tIhML318X6dzVcDzeaO7O0aY5VTiw9bxcg2sCJI0A9rddRBPSwmWuAiGoltxxgTdNSe h7OG5DLj45xl1RqEzmv//rLIjlEW3TNMTZT7rjlNi9dmNiNR451ArpRtuPMOfA== 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 4PXPXr1GYHz1301; Thu, 9 Mar 2023 09:49:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3299nWBG056699; Thu, 9 Mar 2023 09:49:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3299nWl8056698; Thu, 9 Mar 2023 09:49:32 GMT (envelope-from git) Date: Thu, 9 Mar 2023 09:49:32 GMT Message-Id: <202303090949.3299nWl8056698@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: b83abe200246 - main - misc/pytorch: fix packaging on non-amd64 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b83abe200246eceef1723a174b13e0a14ffbf86b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=b83abe200246eceef1723a174b13e0a14ffbf86b commit b83abe200246eceef1723a174b13e0a14ffbf86b Author: Piotr Kubaj AuthorDate: 2023-03-09 09:49:08 +0000 Commit: Piotr Kubaj CommitDate: 2023-03-09 09:49:08 +0000 misc/pytorch: fix packaging on non-amd64 AVX gets built only on amd64. --- misc/pytorch/Makefile | 10 +++++++++- misc/pytorch/pkg-plist | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/misc/pytorch/Makefile b/misc/pytorch/Makefile index c272cf18c65d..476c58a5da72 100644 --- a/misc/pytorch/Makefile +++ b/misc/pytorch/Makefile @@ -51,6 +51,14 @@ PYTHON_BUILD_DEPENDS= ${PYTHON_PY_DEPENDS} \ pybind11>0:devel/pybind11 PYTHON_RUN_DEPENDS= ${PYTHON_PY_DEPENDS} +.include + +.if ${ARCH} == "amd64" +PLIST_SUB+= AMD64="" +.else +PLIST_SUB+= AMD64="@comment " +.endif + post-patch: # replace malloc.h -> stdlib.h in many places @cd ${WRKSRC} && for f in $$(${GREP} -rl "include " * | ${GREP} -E "\.(c|cpp|h|hpp)$$"); do \ @@ -63,4 +71,4 @@ post-install: # https://github.com/pytorch/pytorch/issues/24417 @${FIND} ${STAGEDIR} -type d -empty -delete -.include +.include diff --git a/misc/pytorch/pkg-plist b/misc/pytorch/pkg-plist index 9f32a8cb03f6..95479410cab7 100644 --- a/misc/pytorch/pkg-plist +++ b/misc/pytorch/pkg-plist @@ -8899,9 +8899,9 @@ include/torch/custom_class_detail.h include/torch/extension.h include/torch/library.h include/torch/script.h -lib/libCaffe2_perfkernels_avx.a -lib/libCaffe2_perfkernels_avx2.a -lib/libCaffe2_perfkernels_avx512.a +%%AMD64%%lib/libCaffe2_perfkernels_avx.a +%%AMD64%%lib/libCaffe2_perfkernels_avx2.a +%%AMD64%%lib/libCaffe2_perfkernels_avx512.a lib/libc10.so lib/libclog.a lib/libcpuinfo.a