public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-libs/torchvision/
@ 2021-12-26 14:26 Andrew Ammerlaan
  0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2021-12-26 14:26 UTC (permalink / raw
  To: gentoo-commits

commit:     039d53dff3102d3ac7bdcc3d102c68459a084439
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 26 14:26:25 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Dec 26 14:26:25 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=039d53df

sci-libs/torchvision: new package

Closes: https://github.com/gentoo/sci/issues/943
Closes: https://github.com/gentoo/sci/pull/944
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-libs/torchvision/metadata.xml              | 11 +++++++
 sci-libs/torchvision/torchvision-0.11.2.ebuild | 45 ++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/sci-libs/torchvision/metadata.xml b/sci-libs/torchvision/metadata.xml
new file mode 100644
index 000000000..ad3ef354b
--- /dev/null
+++ b/sci-libs/torchvision/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>jpizarrocallejas@gmail.com</email>
+        <name>Jorge Pizarro Callejas</name>
+    </maintainer>
+    <use>
+        <flag name="cuda">Enable CUDA support if enabled in PyTorch</flag>
+    </use>
+</pkgmetadata>

diff --git a/sci-libs/torchvision/torchvision-0.11.2.ebuild b/sci-libs/torchvision/torchvision-0.11.2.ebuild
new file mode 100644
index 000000000..6c58eeb6e
--- /dev/null
+++ b/sci-libs/torchvision/torchvision-0.11.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_10 )
+
+inherit distutils-r1
+
+DESCRIPTION="Datasets, transforms and models to specific to computer vision"
+HOMEPAGE="https://github.com/pytorch/vision"
+SRC_URI="https://github.com/pytorch/vision/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda test"
+
+RDEPEND="
+	dev-python/av[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	sci-libs/pytorch[cuda?,python,${PYTHON_USEDEP}]
+	media-video/ffmpeg
+	dev-qt/qtcore:5
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/vision-${PV}"
+
+distutils_enable_tests pytest
+
+pkg_setup() {
+	if use cuda; then
+		export FORCE_CUDA=1
+		export TORCH_CUDA_ARCH_LIST="3.5;3.7;5.0;5.2;5.3;6.0;6.0+PTX;6.1;6.1+PTX;6.2;6.2+PTX;7.0;7.0+PTX;7.2;7.2+PTX;7.5;7.5+PTX"
+	fi
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/torchvision/
@ 2021-12-26 14:43 Andrew Ammerlaan
  0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2021-12-26 14:43 UTC (permalink / raw
  To: gentoo-commits

commit:     e27dc30e93e64e62183f0fc9172f5e4ae20614a2
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 26 14:43:06 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Dec 26 14:43:06 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=e27dc30e

sci-libs/torchvision: use python-single-r1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --force
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-libs/torchvision/torchvision-0.11.2.ebuild | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/sci-libs/torchvision/torchvision-0.11.2.ebuild b/sci-libs/torchvision/torchvision-0.11.2.ebuild
index 6c58eeb6e..4fe374173 100644
--- a/sci-libs/torchvision/torchvision-0.11.2.ebuild
+++ b/sci-libs/torchvision/torchvision-0.11.2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_10 )
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -14,9 +15,10 @@ SRC_URI="https://github.com/pytorch/vision/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="cuda test"
+IUSE="cuda"
 
 RDEPEND="
+	$(python_gen_cond_dep '
 	dev-python/av[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
@@ -24,13 +26,16 @@ RDEPEND="
 	dev-python/tqdm[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]
 	sci-libs/pytorch[cuda?,python,${PYTHON_USEDEP}]
+	')
 	media-video/ffmpeg
 	dev-qt/qtcore:5
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
 	test? (
+		$(python_gen_cond_dep '
 		dev-python/mock[${PYTHON_USEDEP}]
+		')
 	)"
 
 S="${WORKDIR}/vision-${PV}"


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/torchvision/
@ 2021-12-26 14:49 Andrew Ammerlaan
  0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2021-12-26 14:49 UTC (permalink / raw
  To: gentoo-commits

commit:     15507b03e4686a394f105101378d549e86b94f2b
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 26 14:49:08 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Dec 26 14:49:08 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=15507b03

sci-libs/torchvision: fix dep on pytorch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --force
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-libs/torchvision/torchvision-0.11.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/torchvision/torchvision-0.11.2.ebuild b/sci-libs/torchvision/torchvision-0.11.2.ebuild
index 4fe374173..e0ecf971e 100644
--- a/sci-libs/torchvision/torchvision-0.11.2.ebuild
+++ b/sci-libs/torchvision/torchvision-0.11.2.ebuild
@@ -25,8 +25,8 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tqdm[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]
-	sci-libs/pytorch[cuda?,python,${PYTHON_USEDEP}]
 	')
+	sci-libs/pytorch[cuda?,python,${PYTHON_SINGLE_USEDEP}]
 	media-video/ffmpeg
 	dev-qt/qtcore:5
 "


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/torchvision/
@ 2022-07-03  8:46 Andrew Ammerlaan
  0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2022-07-03  8:46 UTC (permalink / raw
  To: gentoo-commits

commit:     13140a9dae778e97937b8a05ac262ed4c7a15da8
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 08:44:35 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 08:44:35 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=13140a9d

sci-libs/torchvision: port to ::gentoo version of pytorch

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-libs/torchvision/torchvision-0.11.2.ebuild | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sci-libs/torchvision/torchvision-0.11.2.ebuild b/sci-libs/torchvision/torchvision-0.11.2.ebuild
index e0ecf971e..6df2cbc01 100644
--- a/sci-libs/torchvision/torchvision-0.11.2.ebuild
+++ b/sci-libs/torchvision/torchvision-0.11.2.ebuild
@@ -3,7 +3,6 @@
 
 EAPI=8
 
-DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
@@ -18,15 +17,13 @@ KEYWORDS="~amd64"
 IUSE="cuda"
 
 RDEPEND="
-	$(python_gen_cond_dep '
 	dev-python/av[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tqdm[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]
-	')
-	sci-libs/pytorch[cuda?,python,${PYTHON_SINGLE_USEDEP}]
+	sci-libs/pytorch[${PYTHON_USEDEP}]
 	media-video/ffmpeg
 	dev-qt/qtcore:5
 "


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/torchvision/
@ 2022-07-05 14:41 Andrew Ammerlaan
  0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2022-07-05 14:41 UTC (permalink / raw
  To: gentoo-commits

commit:     e23377f782e7184f960a704d4bbe48c514f7831c
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 14:40:32 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jul  5 14:40:32 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=e23377f7

sci-libs/torchvision: depend on pytorch[cuda?]

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-libs/torchvision/torchvision-0.11.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/torchvision/torchvision-0.11.2.ebuild b/sci-libs/torchvision/torchvision-0.11.2.ebuild
index 6df2cbc01..b17ac9007 100644
--- a/sci-libs/torchvision/torchvision-0.11.2.ebuild
+++ b/sci-libs/torchvision/torchvision-0.11.2.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tqdm[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]
-	sci-libs/pytorch[${PYTHON_USEDEP}]
+	sci-libs/pytorch[cuda(-)?,${PYTHON_USEDEP}]
 	media-video/ffmpeg
 	dev-qt/qtcore:5
 "


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/torchvision/
@ 2022-12-01 21:58 Andrew Ammerlaan
  0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2022-12-01 21:58 UTC (permalink / raw
  To: gentoo-commits

commit:     bd5fc63025145b87d3627171a90d47aa241a76d5
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  1 21:54:14 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Dec  1 21:54:36 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=bd5fc630

sci-libs/torchvision: drop use cuda

it has been dropped on pytorch

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-libs/torchvision/metadata.xml              |  3 ---
 sci-libs/torchvision/torchvision-0.11.2.ebuild | 10 +---------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/sci-libs/torchvision/metadata.xml b/sci-libs/torchvision/metadata.xml
index 28985da70..9c4ddaefd 100644
--- a/sci-libs/torchvision/metadata.xml
+++ b/sci-libs/torchvision/metadata.xml
@@ -5,9 +5,6 @@
 		<email>jpizarrocallejas@gmail.com</email>
 		<name>Jorge Pizarro Callejas</name>
 	</maintainer>
-	<use>
-		<flag name="cuda">Enable CUDA support if enabled in PyTorch</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">pytorch/vision</remote-id>
 	</upstream>

diff --git a/sci-libs/torchvision/torchvision-0.11.2.ebuild b/sci-libs/torchvision/torchvision-0.11.2.ebuild
index b17ac9007..765fd05b7 100644
--- a/sci-libs/torchvision/torchvision-0.11.2.ebuild
+++ b/sci-libs/torchvision/torchvision-0.11.2.ebuild
@@ -14,7 +14,6 @@ SRC_URI="https://github.com/pytorch/vision/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="cuda"
 
 RDEPEND="
 	dev-python/av[${PYTHON_USEDEP}]
@@ -23,7 +22,7 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tqdm[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]
-	sci-libs/pytorch[cuda(-)?,${PYTHON_USEDEP}]
+	sci-libs/pytorch[${PYTHON_USEDEP}]
 	media-video/ffmpeg
 	dev-qt/qtcore:5
 "
@@ -38,10 +37,3 @@ BDEPEND="
 S="${WORKDIR}/vision-${PV}"
 
 distutils_enable_tests pytest
-
-pkg_setup() {
-	if use cuda; then
-		export FORCE_CUDA=1
-		export TORCH_CUDA_ARCH_LIST="3.5;3.7;5.0;5.2;5.3;6.0;6.0+PTX;6.1;6.1+PTX;6.2;6.2+PTX;7.0;7.0+PTX;7.2;7.2+PTX;7.5;7.5+PTX"
-	fi
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/torchvision/
@ 2023-01-03 19:05 Andrew Ammerlaan
  0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2023-01-03 19:05 UTC (permalink / raw
  To: gentoo-commits

commit:     c8d5d7864ee4751077a339bc643515fcdc549021
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 19:04:48 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 19:04:48 2023 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c8d5d786

sci-libs/torchvision: add 0.14.1, drop 0.11.2

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 ...sion-0.11.2.ebuild => torchvision-0.14.1.ebuild} | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/sci-libs/torchvision/torchvision-0.11.2.ebuild b/sci-libs/torchvision/torchvision-0.14.1.ebuild
similarity index 65%
rename from sci-libs/torchvision/torchvision-0.11.2.ebuild
rename to sci-libs/torchvision/torchvision-0.14.1.ebuild
index 765fd05b7..8ad8d7147 100644
--- a/sci-libs/torchvision/torchvision-0.11.2.ebuild
+++ b/sci-libs/torchvision/torchvision-0.14.1.ebuild
@@ -4,25 +4,28 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Datasets, transforms and models to specific to computer vision"
 HOMEPAGE="https://github.com/pytorch/vision"
 SRC_URI="https://github.com/pytorch/vision/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/vision-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="
-	dev-python/av[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	sci-libs/pytorch[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	')
+	sci-libs/pytorch[${PYTHON_SINGLE_USEDEP}]
 	media-video/ffmpeg
 	dev-qt/qtcore:5
 "
@@ -34,6 +37,4 @@ BDEPEND="
 		')
 	)"
 
-S="${WORKDIR}/vision-${PV}"
-
 distutils_enable_tests pytest


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-01-03 19:05 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-03 19:05 [gentoo-commits] proj/sci:master commit in: sci-libs/torchvision/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2022-12-01 21:58 Andrew Ammerlaan
2022-07-05 14:41 Andrew Ammerlaan
2022-07-03  8:46 Andrew Ammerlaan
2021-12-26 14:49 Andrew Ammerlaan
2021-12-26 14:43 Andrew Ammerlaan
2021-12-26 14:26 Andrew Ammerlaan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox