From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1596903-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id F2EDF15815E
for <garchives@archives.gentoo.org>; Sat, 3 Feb 2024 07:22:52 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9B3FFE2B71;
Sat, 3 Feb 2024 07:22:51 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 76CA0E2B71
for <gentoo-commits@lists.gentoo.org>; Sat, 3 Feb 2024 07:22:51 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 899173431FB
for <gentoo-commits@lists.gentoo.org>; Sat, 3 Feb 2024 07:22:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C305014C8
for <gentoo-commits@lists.gentoo.org>; Sat, 3 Feb 2024 07:22:47 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1706944954.1f6128143a5f8bb3dd26c112a1269099d7cde9c9.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/caffe2/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sci-libs/caffe2/caffe2-2.1.2-r2.ebuild sci-libs/caffe2/caffe2-2.1.2-r3.ebuild
X-VCS-Directories: sci-libs/caffe2/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 1f6128143a5f8bb3dd26c112a1269099d7cde9c9
X-VCS-Branch: master
Date: Sat, 3 Feb 2024 07:22:47 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 5bb9c6e7-7300-4428-8b47-3ca4c3026004
X-Archives-Hash: 7800c71320f9dc1482c868c9488fc39a
commit: 1f6128143a5f8bb3dd26c112a1269099d7cde9c9
Author: Sv. Lockal <lockalsash <AT> gmail <DOT> com>
AuthorDate: Mon Jan 29 14:57:18 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 3 07:22:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f612814
sci-libs/caffe2: do not move torch headers; symlink them
This allows to use provided CMake configuration to build other projects
(like intel-extension-for-pytorch).
Closes: https://bugs.gentoo.org/923269
Signed-off-by: Sv. Lockal <lockalsash <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35073
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sci-libs/caffe2/{caffe2-2.1.2-r2.ebuild => caffe2-2.1.2-r3.ebuild} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/sci-libs/caffe2/caffe2-2.1.2-r2.ebuild b/sci-libs/caffe2/caffe2-2.1.2-r3.ebuild
similarity index 98%
rename from sci-libs/caffe2/caffe2-2.1.2-r2.ebuild
rename to sci-libs/caffe2/caffe2-2.1.2-r3.ebuild
index f45e501e8567..9b7554309dbc 100644
--- a/sci-libs/caffe2/caffe2-2.1.2-r2.ebuild
+++ b/sci-libs/caffe2/caffe2-2.1.2-r3.ebuild
@@ -223,16 +223,15 @@ src_install() {
rm -rf python
mkdir -p python/torch/include || die
mv "${ED}"/usr/lib/python*/site-packages/caffe2 python/ || die
- mv "${ED}"/usr/include/torch python/torch/include || die
if use cuda; then
mv "${ED}${S}"/nvfuser python/nvfuser || die
mv "${ED}"/usr/$(get_libdir)/nvfuser.so python/nvfuser/_C.so || die
fi
- rm -rf "${ED}${S}"/test
- rm -rf "${ED}${S}"/third_party
cp torch/version.py python/torch/ || die
python_domodule python/caffe2
python_domodule python/torch
+ ln -s ../../../../../include/torch \
+ "${D}$(python_get_sitedir)"/torch/include/torch || die # bug 923269
if use cuda; then
python_domodule python/nvfuser
fi