Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 9 Mar 2023 09:49:32 GMT
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: b83abe200246 - main - misc/pytorch: fix packaging on non-amd64
Message-ID:  <202303090949.3299nWl8056698@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b83abe200246eceef1723a174b13e0a14ffbf86b

commit b83abe200246eceef1723a174b13e0a14ffbf86b
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2023-03-09 09:49:08 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
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 <bsd.port.pre.mk>
+
+.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 <malloc\.h>" * | ${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 <bsd.port.mk>
+.include <bsd.port.post.mk>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303090949.3299nWl8056698>