[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Horea Christian]

commit:     a114921ad23fc7bd4c6a23e29696e37e5f45736c
Author:     Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Tue Jan 18 19:50:45 2022 +0000
Commit:     Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Tue Jan 18 19:50:45 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=a114921a

sci-libs/pytorch: revbump as per previous commit

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Horea Christian <chr <AT> chymera.eu>

 sci-libs/pytorch/{pytorch-1.10.1.ebuild => pytorch-1.10.1-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sci-libs/pytorch/pytorch-1.10.1.ebuild b/sci-libs/pytorch/pytorch-1.10.1-r1.ebuild
similarity index 100%
rename from sci-libs/pytorch/pytorch-1.10.1.ebuild
rename to sci-libs/pytorch/pytorch-1.10.1-r1.ebuild

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Andrew Ammerlaan]

commit:     f9bd854106a0be65c182e2c145c94c490983f4c6
Author:     Miezhiko <Miezhiko <AT> gmail <DOT> com>
AuthorDate: Thu Feb 24 13:12:00 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 19:13:09 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=f9bd8541

sci-libs/pytorch: update to 1.10.2

Signed-off-by: Miezhiko <Miezhiko <AT> gmail.com>
Closes: https://github.com/gentoo/sci/pull/1145
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-libs/pytorch/{pytorch-1.10.1-r1.ebuild => pytorch-1.10.2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sci-libs/pytorch/pytorch-1.10.1-r1.ebuild b/sci-libs/pytorch/pytorch-1.10.2.ebuild
similarity index 100%
rename from sci-libs/pytorch/pytorch-1.10.1-r1.ebuild
rename to sci-libs/pytorch/pytorch-1.10.2.ebuild

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Horea Christian]

commit:     c1b59fbed7d118800f417014de364aed7b98913a
Author:     Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Tue Jan 18 18:58:44 2022 +0000
Commit:     Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Tue Jan 18 18:58:44 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c1b59fbe

sci-libs/pytorch: removed deprecated sys-fabric/libibverbs dep

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Horea Christian <chr <AT> chymera.eu>

 sci-libs/pytorch/pytorch-1.10.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/pytorch/pytorch-1.10.1.ebuild b/sci-libs/pytorch/pytorch-1.10.1.ebuild
index 59947e530..8ba76f1bd 100644
--- a/sci-libs/pytorch/pytorch-1.10.1.ebuild
+++ b/sci-libs/pytorch/pytorch-1.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -114,7 +114,7 @@ DEPEND="${RDEPEND}
 	dev-python/pybind11[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 	')
-	sys-fabric/libibverbs
+	sys-cluster/rdma-core
 	sys-process/numactl
 "
 

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Andrew Ammerlaan]

commit:     17596353d6219013a251b16c096aae3f42c90ac0
Author:     Antonin Riha <antonin.riha <AT> bluedynamic <DOT> cz>
AuthorDate: Fri Jan 14 14:52:19 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jan 14 15:19:52 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=17596353

Fixed thrust include path for rocm platform

Signed-off-by: Antonín Říha <riha.antonin <AT> outlook.com>
Closes: https://github.com/gentoo/sci/pull/1133
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-libs/pytorch/pytorch-1.10.1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-libs/pytorch/pytorch-1.10.1.ebuild b/sci-libs/pytorch/pytorch-1.10.1.ebuild
index 948d595a7..59947e530 100644
--- a/sci-libs/pytorch/pytorch-1.10.1.ebuild
+++ b/sci-libs/pytorch/pytorch-1.10.1.ebuild
@@ -230,6 +230,7 @@ src_prepare() {
 		export PYTORCH_ROCM_ARCH="${AMDGPU_TARGETS}"
 		sed -e "/set(roctracer_INCLUDE_DIRS/s,\${ROCTRACER_PATH}/include,${EPREFIX}/usr/include/roctracer," \
 			-e "/PYTORCH_HIP_HCC_LIBRARIES/s,\${HIP_PATH}/lib,${EPREFIX}/usr/lib/hip/lib," \
+			-e "/set(roctracer_INCLUDE_DIRS/a\  set(thrust_INCLUDE_DIRS ${EPREFIX}/usr/include/rocthrust)" \
 			-e "s,\${ROCTRACER_PATH}/lib,${EPREFIX}/usr/lib64/roctracer," \
 			-e "/READ.*\.info\/version-dev/c\  set(ROCM_VERSION_DEV_RAW ${ROCM_VERSION})" \
 			-i cmake/public/LoadHIP.cmake || die

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Andrew Ammerlaan]

commit:     1823ef711155df1e529ba5c414238c23695372a6
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 12 11:51:23 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Jan 12 11:51:23 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=1823ef71

sci-libs/pytorch: cleanup old

we finally have a working version of this again

Closes: https://github.com/gentoo/sci/issues/1075
Closes: https://github.com/gentoo/sci/issues/1073
Closes: https://github.com/gentoo/sci/issues/1070
Closes: https://github.com/gentoo/sci/issues/953
Closes: https://bugs.gentoo.org/789807
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-libs/pytorch/metadata.xml            |   5 -
 sci-libs/pytorch/pytorch-1.6.0-r2.ebuild | 287 ---------------------------
 sci-libs/pytorch/pytorch-1.7.1-r2.ebuild | 292 ----------------------------
 sci-libs/pytorch/pytorch-1.9.0.ebuild    | 321 -------------------------------
 4 files changed, 905 deletions(-)

diff --git a/sci-libs/pytorch/metadata.xml b/sci-libs/pytorch/metadata.xml
index 01e2b2703..df07ea4be 100644
--- a/sci-libs/pytorch/metadata.xml
+++ b/sci-libs/pytorch/metadata.xml
@@ -11,23 +11,18 @@
 	</maintainer>
 	<use>
 		<flag name="asan">Build with address sanitizer (ASAN)</flag>
-		<flag name="atlas">Use ATLAS as BLAS implementation</flag>
 		<flag name="cuda">Enable support for nVidia CUDA</flag>
-		<flag name="eigen">Use Eigen as BLAS implementation</flag>
 		<flag name="fbgemm">Enable FBGEMM (Facebook GEneral Matrix Multiplication) support</flag>
 		<flag name="gflags">Build with gflags</flag>
 		<flag name="glog">Build with glog support</flag>
 		<flag name="gloo">Build gloo distributed communication backend support</flag>
 		<flag name="leveldb">Enable support for LevelDB</flag>
 		<flag name="lmdb">Enable support for LMDB</flag>
-		<flag name="mkl">Use Intel MKL as BLAS implementation</flag>
 		<flag name="mkldnn">Build with Intel MKL-DNN support</flag>
 		<flag name="namedtensor">Enable support for named tensors</flag>
 		<flag name="nnpack">Enable NNPACK support</flag>
 		<flag name="numa">Enable support for NUMA</flag>
-		<flag name="numpy">Enable NumPy support</flag>
 		<flag name="observers">Build observers</flag>
-		<flag name="openblas">Use OpenBLAS as BLAS implementation</flag>
 		<flag name="opencv">Enable support for OpenCV</flag>
 		<flag name="opencl">Enable support for OpenCL</flag>
 		<flag name="qnnpack">Enable QNNPACK support</flag>

diff --git a/sci-libs/pytorch/pytorch-1.6.0-r2.ebuild b/sci-libs/pytorch/pytorch-1.6.0-r2.ebuild
deleted file mode 100644
index 280089c6e..000000000
--- a/sci-libs/pytorch/pytorch-1.6.0-r2.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1 cmake cuda
-
-MPV=${PV/_p/a}
-
-DESCRIPTION="Tensors and Dynamic neural networks in Python with strong GPU acceleration"
-HOMEPAGE="https://pytorch.org/"
-SRC_URI="https://github.com/pytorch/${PN}/archive/v${MPV}.tar.gz -> ${P}.tar.gz
-https://github.com/google/benchmark/archive/505be96ab.tar.gz -> benchmark-505be96ab.tar.gz
-https://github.com/pytorch/cpuinfo/archive/63b254577.tar.gz -> cpuinfo-63b254577.tar.gz
-https://github.com/NVlabs/cub/archive/d106ddb99.tar.gz -> cub-d106ddb99.tar.gz
-https://github.com/pytorch/fbgemm/archive/87c378172.tar.gz -> fbgemm-87c378172.tar.gz
-https://github.com/fmtlib/fmt/archive/9bdd1596c.tar.gz -> fmt-9bdd1596c.tar.gz
-https://github.com/houseroad/foxi/archive/8015abb72.tar.gz -> foxi-8015abb72.tar.gz
-https://github.com/Maratyszcza/FP16/archive/4dfe081cf.tar.gz -> FP16-4dfe081cf.tar.gz
-https://github.com/Maratyszcza/FXdiv/archive/b408327ac.tar.gz -> FXdiv-b408327ac.tar.gz
-https://github.com/google/gemmlowp/archive/3fb5c176c.tar.gz -> gemmlowp-3fb5c176c.tar.gz
-https://github.com/facebookincubator/gloo/archive/3d08580f9.tar.gz -> gloo-3d08580f9.tar.gz
-https://github.com/google/googletest/archive/2fe3bd994.tar.gz -> googletest-2fe3bd994.tar.gz
-https://github.com/intel/ideep/archive/938cc6889.tar.gz -> ideep-938cc6889.tar.gz
-cuda? ( https://github.com/NVIDIA/nccl/archive/5949d96f3.tar.gz -> nccl-5949d96f3.tar.gz )
-https://github.com/Maratyszcza/NNPACK/archive/24b55303f.tar.gz -> NNPACK-24b55303f.tar.gz
-https://github.com/onnx/onnx/archive/a82c6a701.tar.gz -> onnx-a82c6a701.tar.gz
-https://github.com/onnx/onnx-tensorrt/archive/c15321141.tar.gz -> onnx-tensorrt-c15321141.tar.gz
-https://github.com/Maratyszcza/psimd/archive/072586a71.tar.gz -> psimd-072586a71.tar.gz
-https://github.com/Maratyszcza/pthreadpool/archive/029c88620.tar.gz -> pthreadpool-029c88620.tar.gz
-https://github.com/Maratyszcza/PeachPy/archive/07d8fde8a.tar.gz -> PeachPy-07d8fde8a.tar.gz
-https://github.com/pytorch/QNNPACK/archive/7d2a4e993.tar.gz -> QNNPACK-7d2a4e993.tar.gz
-https://github.com/shibatch/sleef/archive/7f523de65.tar.gz -> sleef-7f523de65.tar.gz
-https://github.com/pytorch/tensorpipe/archive/3b8089c9c.tar.gz -> tensorpipe-3b8089c9c.tar.gz
-https://github.com/google/XNNPACK/archive/1b354636b.tar.gz -> XNNPACK-1b354636b.tar.gz
-https://github.com/asmjit/asmjit/archive/9057aa30.tar.gz -> asmjit-9057aa30.tar.gz
-	"
-
-# git clone git@github.com:pytorch/pytorch.git && cd pytorch
-# src_uri() {
-# join \
-#   <(git config --file .gitmodules --get-regexp url | sed -r -e 's/^submodule.(.*).url (.*)/\1 \2/' -e 's,NNPACK_deps/,,' -e 's/third-party/third_party/' | sort) \
-#   <(git submodule status | awk '{print $2 " " $1}' | sort) | \
-# while read path url hash; do
-#         [[ ${path} =~ (eigen|six|ios|neon2sse|protobuf|pybind11|enum34|tbb|zstd|fbjni) ]] && continue
-#         u=${url%.git}
-#         h=${hash#-}
-#         h=${h:0:8}
-#         echo "${u}/archive/${h}.tar.gz -> $(basename ${u})-${h}.tar.gz"
-# done
-# }
-# src_uri
-
-# git submodule update --init third_party/fbgemm && cd third_party/fbgemm
-# src_uri | grep asmjit
-# cd ../..
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="asan atlas cuda eigen +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkl mkldnn mpi namedtensor +nnpack numa +numpy +observers +openblas opencl opencv +openmp +python +qnnpack redis static test tools zeromq"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	numpy? ( python )
-	^^ ( atlas eigen mkl openblas )
-"
-
-RDEPEND="
-	dev-libs/protobuf
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	atlas? ( sci-libs/atlas )
-	cuda? ( dev-libs/cudnn
-		dev-cpp/eigen[cuda] )
-	ffmpeg? ( media-video/ffmpeg )
-	gflags? ( dev-cpp/gflags )
-	glog? ( dev-cpp/glog )
-	leveldb? ( dev-libs/leveldb )
-	lmdb? ( dev-db/lmdb )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	openblas? ( sci-libs/openblas )
-	opencl? ( dev-libs/clhpp virtual/opencl )
-	opencv? ( media-libs/opencv )
-	python? ( ${PYTHON_DEPS}
-		dev-python/pybind11[${PYTHON_USEDEP}]
-	)
-	redis? ( dev-db/redis )
-	zeromq? ( net-libs/zeromq )
-	eigen? ( dev-cpp/eigen )
-	dev-libs/libuv
-"
-
-#ATen code generation
-BDEPEND="dev-python/pyyaml"
-
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-cpp/tbb
-	app-arch/zstd
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	sys-fabric/libibverbs
-	sys-process/numactl
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-setup.patch
-	"${FILESDIR}"/${PN}-1.6.0-skip-tests.patch
-	"${FILESDIR}"/${PN}-1.6.0-global-dlopen.patch
-	"${FILESDIR}"/0002-Don-t-build-libtorch-again-for-PyTorch-1.4.0.patch
-	"${FILESDIR}"/0003-Change-path-to-caffe2-build-dir-made-by-libtorch.patch
-	"${FILESDIR}"/0005-Change-library-directory-according-to-CMake-build.patch
-)
-
-src_unpack() {
-	default
-
-	[[ -d ${P} ]] || mv -v ${PN}-${MPV} ${P} || die
-}
-
-src_prepare() {
-	cmake_src_prepare
-	eapply_user
-
-	mv -v third_party/miniz-* ../ || die
-	rm -r third_party || die
-	ln -s .. third_party || die
-	cd .. || die
-	for d in *; do
-		case ${d} in
-			${PN}* | miniz-*) continue ;;
-			PeachPy-*) mv -v ${d} python-peachpy || die ;;
-			*) mv -v ${d} ${d%-*} || die ;;
-		esac
-	done
-
-	mv -v FBGEMM fbgemm || die
-	cd fbgemm || die
-	rm -r third_party || die
-	ln -s .. third_party || die
-
-	cd ../onnx || die
-	rm -r third_party || die
-	ln -s .. third_party || die
-
-	if use cuda; then
-		cd ../nccl || die
-		eapply "${FILESDIR}"/${PN}-1.6.0-nccl-nvccflags.patch
-		ln -s . nccl || die
-
-		addpredict /dev/nvidiactl
-		cuda_src_prepare
-		export CUDAHOSTCXX=$(cuda_gccdir)/g++
-	fi
-
-	cd ../tensorpipe || die
-	eapply "${FILESDIR}"/${PN}-1.6.0-tensorpipe-unbundle-libuv.patch
-}
-
-src_configure() {
-	local blas="Eigen"
-
-	if use atlas; then
-		blas="ATLAS"
-	elif use mkl; then
-		blas="MKL"
-	elif use openblas; then
-		blas="OpenBLAS"
-	fi
-
-	local mycmakeargs=(
-		-DTORCH_BUILD_VERSION=${PV}
-		-DTORCH_INSTALL_LIB_DIR=$(get_libdir)
-		-DBUILD_BINARY=$(usex tools ON OFF)
-		-DBUILD_CUSTOM_PROTOBUF=OFF
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_SHARED_LIBS=$(usex static OFF ON)
-		-DBUILD_TEST=$(usex test ON OFF)
-		-DUSE_ASAN=$(usex asan ON OFF)
-		-DUSE_CUDA=$(usex cuda ON OFF)
-		-DUSE_NCCL=$(usex cuda ON OFF)
-		-DUSE_SYSTEM_NCCL=OFF
-		-DUSE_ROCM=OFF
-		-DUSE_FBGEMM=$(usex fbgemm ON OFF)
-		-DUSE_FFMPEG=$(usex ffmpeg ON OFF)
-		-DUSE_GFLAGS=$(usex gflags ON OFF)
-		-DUSE_GLOG=$(usex glog ON OFF)
-		-DUSE_LEVELDB=$(usex leveldb ON OFF)
-		-DUSE_LITE_PROTO=OFF
-		-DUSE_LMDB=$(usex lmdb ON OFF)
-		-DCAFFE2_USE_MKL=$(usex mkl ON OFF)
-		-DUSE_MKLDNN=$(usex mkldnn ON OFF)
-		-DUSE_MKLDNN_CBLAS=OFF
-		-DUSE_NNPACK=$(usex nnpack ON OFF)
-		-DUSE_NUMPY=$(usex numpy ON OFF)
-		-DUSE_NUMA=$(usex numa ON OFF)
-		-DUSE_OBSERVERS=$(usex observers ON OFF)
-		-DUSE_OPENCL=$(usex opencl ON OFF)
-		-DUSE_OPENCV=$(usex opencv ON OFF)
-		-DUSE_OPENMP=$(usex openmp ON OFF)
-		-DUSE_TBB=OFF
-		-DUSE_PROF=OFF
-		-DUSE_QNNPACK=$(usex qnnpack ON OFF)
-		-DUSE_REDIS=$(usex redis ON OFF)
-		-DUSE_ROCKSDB=OFF
-		-DUSE_ZMQ=$(usex zeromq ON OFF)
-		-DUSE_MPI=$(usex mpi ON OFF)
-		-DUSE_GLOO=$(usex gloo ON OFF)
-		-DUSE_SYSTEM_EIGEN_INSTALL=ON
-		-DBUILD_NAMEDTENSOR=$(usex namedtensor ON OFF)
-		-DBLAS=${blas}
-	)
-
-	cmake_src_configure
-
-	if use python; then
-		CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_configure
-	fi
-
-	# do not rerun cmake and the build process in src_install
-	sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use python; then
-		CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	local LIB=$(get_libdir)
-	if [[ ${LIB} != lib ]]; then
-		mv -fv "${ED}"/usr/lib/*.so "${ED}"/usr/${LIB}/ || die
-	fi
-
-	rm -rfv "${ED}/torch"
-	rm -rfv "${ED}/var"
-	rm -rfv "${ED}/usr/lib"
-
-	rm -fv "${ED}/usr/include/*.{h,hpp}"
-	rm -rfv "${ED}/usr/include/asmjit"
-	rm -rfv "${ED}/usr/include/c10d"
-	rm -rfv "${ED}/usr/include/fbgemm"
-	rm -rfv "${ED}/usr/include/fp16"
-	rm -rfv "${ED}/usr/include/gloo"
-	rm -rfv "${ED}/usr/include/include"
-	rm -rfv "${ED}/usr/include/var"
-
-	cp -rv "${WORKDIR}/${P}/third_party/pybind11/include/pybind11" "${ED}/usr/include/"
-
-	rm -fv "${ED}/usr/lib64/libtbb.so"
-	rm -rfv "${ED}/usr/lib64/cmake"
-
-	if use python; then
-		install_shm_manager() {
-			TORCH_BIN_DIR="${D}$(python_get_sitedir)/torch/bin"
-
-			mkdir -pv ${TORCH_BIN_DIR}
-			cp -v "${ED}/usr/bin/torch_shm_manager" "${TORCH_BIN_DIR}"
-		}
-
-		python_foreach_impl install_shm_manager
-
-		scanelf -r --fix "${BUILD_DIR}/caffe2/python"
-		CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_install
-
-		python_foreach_impl python_optimize
-	fi
-
-	find "${ED}/usr/${LIB}" -name "*.a" -exec rm -fv {} \;
-
-	use test && rm -rfv "${ED}/usr/test" "${ED}"/usr/bin/test_{api,jit}
-
-	# Remove the empty directories by CMake Python:
-	find "${ED}" -type d -empty -delete || die
-}

diff --git a/sci-libs/pytorch/pytorch-1.7.1-r2.ebuild b/sci-libs/pytorch/pytorch-1.7.1-r2.ebuild
deleted file mode 100644
index 99cc2e750..000000000
--- a/sci-libs/pytorch/pytorch-1.7.1-r2.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake cuda distutils-r1 prefix
-
-DESCRIPTION="Tensors and Dynamic neural networks in Python with strong GPU acceleration"
-HOMEPAGE="https://pytorch.org/"
-SRC_URI="https://github.com/pytorch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/google/benchmark/archive/505be96a.tar.gz -> benchmark-505be96a.tar.gz
-https://github.com/pytorch/cpuinfo/archive/63b25457.tar.gz -> cpuinfo-63b25457.tar.gz
-https://github.com/NVlabs/cub/archive/d106ddb9.tar.gz -> cub-d106ddb9.tar.gz
-https://github.com/pytorch/fbgemm/archive/1d710393.tar.gz -> fbgemm-1d710393.tar.gz
-https://github.com/asmjit/asmjit/archive/9057aa30.tar.gz -> asmjit-9057aa30.tar.gz
-https://github.com/pytorch/cpuinfo/archive/d5e37adf.tar.gz -> cpuinfo-d5e37adf.tar.gz
-https://github.com/google/googletest/archive/0fc5466d.tar.gz -> googletest-0fc5466d.tar.gz
-https://github.com/fmtlib/fmt/archive/cd4af11e.tar.gz -> fmt-cd4af11e.tar.gz
-https://github.com/houseroad/foxi/archive/4aba696e.tar.gz -> foxi-4aba696e.tar.gz
-https://github.com/Maratyszcza/FP16/archive/4dfe081c.tar.gz -> FP16-4dfe081c.tar.gz
-https://github.com/Maratyszcza/FXdiv/archive/b408327a.tar.gz -> FXdiv-b408327a.tar.gz
-https://github.com/google/gemmlowp/archive/3fb5c176.tar.gz -> gemmlowp-3fb5c176.tar.gz
-https://github.com/facebookincubator/gloo/archive/3dc0328f.tar.gz -> gloo-3dc0328f.tar.gz
-https://github.com/google/googletest/archive/2fe3bd99.tar.gz -> googletest-2fe3bd99.tar.gz
-https://github.com/intel/ideep/archive/ba885200.tar.gz -> ideep-ba885200.tar.gz
-https://github.com/intel/mkl-dnn/archive/5ef631a0.tar.gz -> mkl-dnn-5ef631a0.tar.gz
-cuda? ( https://github.com/NVIDIA/nccl/archive/033d7995.tar.gz -> nccl-033d7995.tar.gz )
-https://github.com/Maratyszcza/NNPACK/archive/24b55303.tar.gz -> NNPACK-24b55303.tar.gz
-https://github.com/onnx/onnx/archive/a82c6a70.tar.gz -> onnx-a82c6a70.tar.gz
-https://github.com/onnx/onnx-tensorrt/archive/c1532114.tar.gz -> onnx-tensorrt-c1532114.tar.gz
-https://github.com/onnx/onnx/archive/765f5ee8.tar.gz -> onnx-765f5ee8.tar.gz
-https://github.com/google/benchmark/archive/e776aa02.tar.gz -> benchmark-e776aa02.tar.gz
-https://github.com/google/benchmark/archive/5b7683f4.tar.gz -> benchmark-5b7683f4.tar.gz
-https://github.com/google/googletest/archive/5ec7f0c4.tar.gz -> googletest-5ec7f0c4.tar.gz
-https://github.com/Maratyszcza/psimd/archive/072586a7.tar.gz -> psimd-072586a7.tar.gz
-https://github.com/Maratyszcza/pthreadpool/archive/029c8862.tar.gz -> pthreadpool-029c8862.tar.gz
-https://github.com/Maratyszcza/PeachPy/archive/07d8fde8.tar.gz -> PeachPy-07d8fde8.tar.gz
-https://github.com/pytorch/QNNPACK/archive/7d2a4e99.tar.gz -> QNNPACK-7d2a4e99.tar.gz
-https://github.com/shibatch/sleef/archive/7f523de6.tar.gz -> sleef-7f523de6.tar.gz
-https://github.com/pytorch/tensorpipe/archive/95ff9319.tar.gz -> tensorpipe-95ff9319.tar.gz
-https://github.com/google/googletest/archive/2fe3bd99.tar.gz -> googletest-2fe3bd99.tar.gz
-https://github.com/google/libnop/archive/aa95422e.tar.gz -> libnop-aa95422e.tar.gz
-https://github.com/libuv/libuv/archive/02a9e1be.tar.gz -> libuv-02a9e1be.tar.gz
-https://github.com/google/XNNPACK/archive/1b354636.tar.gz -> XNNPACK-1b354636.tar.gz
-	"
-
-# git clone git@github.com:pytorch/pytorch.git && cd pytorch
-# git submodules update --init --recursive
-# ${FILESDIR}/get_third_paries
-# cat SRC_URI src_prepare
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="asan blas cuda +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkldnn mpi namedtensor +nnpack numa +observers opencl opencv +openmp +python +qnnpack redis rocm static test tools zeromq"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	?? ( cuda rocm )
-"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	blas? ( virtual/blas )
-	cuda? ( dev-libs/cudnn
-		dev-cpp/eigen[cuda] )
-	rocm? ( >=dev-util/hip-4.0.0-r1
-			>=dev-libs/rccl-4
-			>=sci-libs/rocThrust-4
-			>=sci-libs/hipCUB-4
-			>=sci-libs/rocPRIM-4
-			>=sci-libs/miopen-4
-			>=sci-libs/rocBLAS-4
-			>=sci-libs/rocRAND-4
-			>=sci-libs/hipSPARSE-4
-			>=sci-libs/rocFFT-4
-			>=dev-util/roctracer-4 )
-	ffmpeg? ( media-video/ffmpeg )
-	gflags? ( dev-cpp/gflags )
-	glog? ( dev-cpp/glog )
-	leveldb? ( dev-libs/leveldb )
-	lmdb? ( dev-db/lmdb )
-	mpi? ( virtual/mpi )
-	opencl? ( dev-libs/clhpp virtual/opencl )
-	opencv? ( media-libs/opencv )
-	python? ( ${PYTHON_DEPS}
-		dev-python/pybind11[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/protobuf-python:0/22
-	)
-	redis? ( dev-db/redis )
-	zeromq? ( net-libs/zeromq )
-	dev-cpp/eigen
-	dev-libs/protobuf:0/22
-	dev-libs/libuv
-"
-
-#ATen code generation
-BDEPEND="dev-python/pyyaml"
-
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-cpp/tbb
-	app-arch/zstd
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	sys-fabric/libibverbs
-	sys-process/numactl
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.1-setup.patch
-	"${FILESDIR}"/${PN}-1.6.0-skip-tests.patch
-	"${FILESDIR}"/${PN}-1.6.0-global-dlopen.patch
-	"${FILESDIR}"/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch
-	"${FILESDIR}"/0003-Change-path-to-caffe2-build-dir-made-by-libtorch.patch
-	"${FILESDIR}"/0005-Change-library-directory-according-to-CMake-build.patch
-	"${FILESDIR}"/${PN}-1.7.1-no-rpath.patch
-	"${FILESDIR}"/${PN}-1.7.1-tensorpipe-unbundle-libuv.patch
-	"${FILESDIR}"/${PN}-1.7.1-torch_shm_manager.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-	eprefixify torch/__init__.py
-	eapply_user
-
-	rmdir third_party/benchmark && ln -sv "${WORKDIR}"/benchmark-505be96ab23056580a3a2315abba048f4428b04e third_party/benchmark
-	rmdir third_party/cpuinfo && ln -sv "${WORKDIR}"/cpuinfo-63b254577ed77a8004a9be6ac707f3dccc4e1fd9 third_party/cpuinfo
-	rmdir third_party/cub && ln -sv "${WORKDIR}"/cub-d106ddb991a56c3df1b6d51b2409e36ba8181ce4 third_party/cub
-	rmdir third_party/fbgemm && ln -sv "${WORKDIR}"/FBGEMM-1d710393d5b7588f5de3b83f51c22bbddf095229 third_party/fbgemm
-	rmdir third_party/fbgemm/third_party/asmjit && ln -sv "${WORKDIR}"/asmjit-9057aa30b620f0662ff51e2230c126a345063064 third_party/fbgemm/third_party/asmjit
-	rmdir third_party/fbgemm/third_party/cpuinfo && ln -sv "${WORKDIR}"/cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970 third_party/fbgemm/third_party/cpuinfo
-	rmdir third_party/fbgemm/third_party/googletest && ln -sv "${WORKDIR}"/googletest-0fc5466dbb9e623029b1ada539717d10bd45e99e third_party/fbgemm/third_party/googletest
-	rmdir third_party/fmt && ln -sv "${WORKDIR}"/fmt-cd4af11efc9c622896a3e4cb599fa28668ca3d05 third_party/fmt
-	rmdir third_party/foxi && ln -sv "${WORKDIR}"/foxi-4aba696ec8f31794fd42880346dc586486205e0a third_party/foxi
-	rmdir third_party/FP16 && ln -sv "${WORKDIR}"/FP16-4dfe081cf6bcd15db339cf2680b9281b8451eeb3 third_party/FP16
-	rmdir third_party/FXdiv && ln -sv "${WORKDIR}"/FXdiv-b408327ac2a15ec3e43352421954f5b1967701d1 third_party/FXdiv
-	rmdir third_party/gemmlowp/gemmlowp && ln -sv "${WORKDIR}"/gemmlowp-3fb5c176c17c765a3492cd2f0321b0dab712f350 third_party/gemmlowp/gemmlowp
-	rmdir third_party/gloo && ln -sv "${WORKDIR}"/gloo-3dc0328fe6a9d47bd47c0c6ca145a0d8a21845c6 third_party/gloo
-	rmdir third_party/googletest && ln -sv "${WORKDIR}"/googletest-2fe3bd994b3189899d93f1d5a881e725e046fdc2 third_party/googletest
-	rmdir third_party/ideep && ln -sv "${WORKDIR}"/ideep-ba885200dbbc1f144c7b58eba487378eb324f281 third_party/ideep
-	rmdir third_party/ideep/mkl-dnn && ln -sv "${WORKDIR}"/mkl-dnn-5ef631a030a6f73131c77892041042805a06064f third_party/ideep/mkl-dnn
-	rmdir third_party/nccl/nccl && ln -sv "${WORKDIR}"/nccl-033d799524fb97629af5ac2f609de367472b2696 third_party/nccl/nccl
-	rmdir third_party/NNPACK && ln -sv "${WORKDIR}"/NNPACK-24b55303f5cf65d75844714513a0d1b1409809bd third_party/NNPACK
-	rmdir third_party/onnx && ln -sv "${WORKDIR}"/onnx-a82c6a7010e2e332d8f74ad5b0c726fd47c85376 third_party/onnx
-	rmdir third_party/onnx-tensorrt && ln -sv "${WORKDIR}"/onnx-tensorrt-c153211418a7c57ce071d9ce2a41f8d1c85a878f third_party/onnx-tensorrt
-	rmdir third_party/onnx-tensorrt/third_party/onnx && ln -sv "${WORKDIR}"/onnx-765f5ee823a67a866f4bd28a9860e81f3c811ce8 third_party/onnx-tensorrt/third_party/onnx
-	rmdir third_party/onnx-tensorrt/third_party/onnx/third_party/benchmark && ln -sv "${WORKDIR}"/benchmark-e776aa0275e293707b6a0901e0e8d8a8a3679508 third_party/onnx-tensorrt/third_party/onnx/third_party/benchmark
-	rmdir third_party/onnx/third_party/benchmark && ln -sv "${WORKDIR}"/benchmark-e776aa0275e293707b6a0901e0e8d8a8a3679508 third_party/onnx/third_party/benchmark
-	rmdir third_party/psimd && ln -sv "${WORKDIR}"/psimd-072586a71b55b7f8c584153d223e95687148a900 third_party/psimd
-	rmdir third_party/pthreadpool && ln -sv "${WORKDIR}"/pthreadpool-029c88620802e1361ccf41d1970bd5b07fd6b7bb third_party/pthreadpool
-	rmdir third_party/python-peachpy && ln -sv "${WORKDIR}"/PeachPy-07d8fde8ac45d7705129475c0f94ed8925b93473 third_party/python-peachpy
-	rmdir third_party/QNNPACK && ln -sv "${WORKDIR}"/QNNPACK-7d2a4e9931a82adc3814275b6219a03e24e36b4c third_party/QNNPACK
-	rmdir third_party/sleef && ln -sv "${WORKDIR}"/sleef-7f523de651585fe25cade462efccca647dcc8d02 third_party/sleef
-	rmdir third_party/tensorpipe && ln -sv "${WORKDIR}"/tensorpipe-95ff9319161fcdb3c674d2bb63fac3e94095b343 third_party/tensorpipe
-	rmdir third_party/tensorpipe/third_party/googletest && ln -sv "${WORKDIR}"/googletest-2fe3bd994b3189899d93f1d5a881e725e046fdc2 third_party/tensorpipe/third_party/googletest
-	rmdir third_party/tensorpipe/third_party/libnop && ln -sv "${WORKDIR}"/libnop-aa95422ea8c409e3f078d2ee7708a5f59a8b9fa2 third_party/tensorpipe/third_party/libnop
-	rmdir third_party/tensorpipe/third_party/libuv && ln -sv "${WORKDIR}"/libuv-02a9e1be252b623ee032a3137c0b0c94afbe6809 third_party/tensorpipe/third_party/libuv
-	rmdir third_party/XNNPACK && ln -sv "${WORKDIR}"/XNNPACK-1b354636b5942826547055252f3b359b54acff95 third_party/XNNPACK
-
-	if use cuda; then
-		cd third_party/nccl/nccl || die
-		eapply "${FILESDIR}"/${PN}-1.6.0-nccl-nvccflags.patch
-
-		addpredict /dev/nvidiactl
-		cuda_src_prepare
-		export CUDAHOSTCXX=$(cuda_gccdir)/g++
-	fi
-
-	if use rocm; then
-		#Allow escaping sandbox
-		addread /dev/kfd
-		addread /dev/dri
-		addwrite /dev/kfd
-		addwrite /dev/dri
-
-		ebegin "HIPifying cuda sources"
-		tools/amd_build/build_amd.py
-		eend $?
-
-		export PYTORCH_ROCM_ARCH=$(rocminfo | egrep -o "gfx[0-9]+" | uniq | awk -vORS=';' "{print $1}" | sed 's/;$/\n/') || die
-		sed -e "/set(roctracer_INCLUDE_DIRS/s,\${ROCTRACER_PATH}/include,${EPREFIX}/usr/include/roctracer," \
-			-i cmake/public/LoadHIP.cmake || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DTORCH_BUILD_VERSION=${PV}
-		-DTORCH_INSTALL_LIB_DIR=$(get_libdir)
-		-DBUILD_BINARY=$(usex tools ON OFF)
-		-DBUILD_CUSTOM_PROTOBUF=OFF
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_SHARED_LIBS=$(usex static OFF ON)
-		-DBUILD_TEST=$(usex test ON OFF)
-		-DUSE_ASAN=$(usex asan ON OFF)
-		-DUSE_CUDA=$(usex cuda ON OFF)
-		-DUSE_NCCL=$(usex cuda ON OFF)
-		-DUSE_SYSTEM_NCCL=OFF
-		-DUSE_ROCM=$(usex rocm ON OFF)
-		-DUSE_FBGEMM=$(usex fbgemm ON OFF)
-		-DUSE_FFMPEG=$(usex ffmpeg ON OFF)
-		-DUSE_GFLAGS=$(usex gflags ON OFF)
-		-DUSE_GLOG=$(usex glog ON OFF)
-		-DUSE_LEVELDB=$(usex leveldb ON OFF)
-		-DUSE_LITE_PROTO=OFF
-		-DUSE_LMDB=$(usex lmdb ON OFF)
-		-DUSE_MKLDNN=$(usex mkldnn ON OFF)
-		-DUSE_MKLDNN_CBLAS=OFF
-		-DUSE_NNPACK=$(usex nnpack ON OFF)
-		-DUSE_NUMPY=$(usex python ON OFF)
-		-DUSE_NUMA=$(usex numa ON OFF)
-		-DUSE_OBSERVERS=$(usex observers ON OFF)
-		-DUSE_OPENCL=$(usex opencl ON OFF)
-		-DUSE_OPENCV=$(usex opencv ON OFF)
-		-DUSE_OPENMP=$(usex openmp ON OFF)
-		-DUSE_TBB=OFF
-		-DUSE_PROF=OFF
-		-DUSE_QNNPACK=$(usex qnnpack ON OFF)
-		-DUSE_REDIS=$(usex redis ON OFF)
-		-DUSE_ROCKSDB=OFF
-		-DUSE_ZMQ=$(usex zeromq ON OFF)
-		-DUSE_MPI=$(usex mpi ON OFF)
-		-DUSE_GLOO=$(usex gloo ON OFF)
-		-DUSE_SYSTEM_EIGEN_INSTALL=ON
-		-DBUILD_NAMEDTENSOR=$(usex namedtensor ON OFF)
-		-DBLAS=$(usex blas Generic Eigen)
-		-DTP_BUILD_LIBUV=OFF
-		-Wno-dev
-	)
-
-	cmake_src_configure
-
-	if use python; then
-		CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_configure
-	fi
-
-	# do not rerun cmake and the build process in src_install
-	sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use python; then
-		CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	local LIB=$(get_libdir)
-	if [[ ${LIB} != lib ]]; then
-		mv -fv "${ED}"/usr/lib/*.so "${ED}"/usr/${LIB}/ || die
-	fi
-
-	rm -rfv "${ED}/torch"
-	rm -rfv "${ED}/var"
-	rm -rfv "${ED}/usr/lib"
-
-	rm -fv "${ED}/usr/include/*.{h,hpp}"
-	rm -rfv "${ED}/usr/include/asmjit"
-	rm -rfv "${ED}/usr/include/c10d"
-	rm -rfv "${ED}/usr/include/fbgemm"
-	rm -rfv "${ED}/usr/include/fp16"
-	rm -rfv "${ED}/usr/include/gloo"
-	rm -rfv "${ED}/usr/include/include"
-	rm -rfv "${ED}/usr/include/var"
-
-	cp -rv "${WORKDIR}/${P}/third_party/pybind11/include/pybind11" "${ED}/usr/include/"
-
-	rm -fv "${ED}/usr/${LIB}/libtbb.so"
-	rm -rfv "${ED}/usr/${LIB}/cmake"
-
-	if use python; then
-		scanelf -r --fix "${BUILD_DIR}/caffe2/python"
-		CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_install
-
-		python_foreach_impl python_optimize
-	fi
-
-	find "${ED}/usr/${LIB}" -name "*.a" -exec rm -fv {} \;
-
-	use test && rm -rfv "${ED}/usr/test" "${ED}"/usr/bin/test_{api,jit}
-
-	# Remove the empty directories by CMake Python:
-	find "${ED}" -type d -empty -delete || die
-}

diff --git a/sci-libs/pytorch/pytorch-1.9.0.ebuild b/sci-libs/pytorch/pytorch-1.9.0.ebuild
deleted file mode 100644
index c997f8da8..000000000
--- a/sci-libs/pytorch/pytorch-1.9.0.ebuild
+++ /dev/null
@@ -1,321 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake cuda distutils-r1 prefix
-
-DESCRIPTION="Tensors and Dynamic neural networks in Python with strong GPU acceleration"
-HOMEPAGE="https://pytorch.org/"
-SRC_URI="https://github.com/pytorch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-https://github.com/google/benchmark/archive/e991355c02b93fe17713efe04cbc2e278e00fdbd.tar.gz -> benchmark-e991355c02b93fe17713efe04cbc2e278e00fdbd.tar.gz
-https://github.com/pytorch/cpuinfo/archive/63b25457.tar.gz -> cpuinfo-63b25457.tar.gz
-https://github.com/NVlabs/cub/archive/d106ddb991a56c3df1b6d51b2409e36ba8181ce4.tar.gz -> cub-d106ddb991a56c3df1b6d51b2409e36ba8181ce4.tar.gz
-https://github.com/pytorch/fbgemm/archive/7495417ad31c38a06b1b13db66b355b6f23cd96d.tar.gz -> fbgemm-7495417ad31c38a06b1b13db66b355b6f23cd96d.tar.gz
-https://github.com/asmjit/asmjit/archive/9057aa30.tar.gz -> asmjit-9057aa30.tar.gz
-https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.tar.gz -> cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.tar.gz
-https://github.com/google/googletest/archive/0fc5466d.tar.gz -> googletest-0fc5466d.tar.gz
-https://github.com/fmtlib/fmt/archive/cd4af11efc9c622896a3e4cb599fa28668ca3d05.tar.gz -> fmt-cd4af11efc9c622896a3e4cb599fa28668ca3d05.tar.gz
-https://github.com/houseroad/foxi/archive/c278588e34e535f0bb8f00df3880d26928038cad.tar.gz -> foxi-c278588e34e535f0bb8f00df3880d26928038cad.tar.gz
-https://github.com/Maratyszcza/FP16/archive/4dfe081cf6bcd15db339cf2680b9281b8451eeb3.tar.gz -> FP16-4dfe081cf6bcd15db339cf2680b9281b8451eeb3.tar.gz
-https://github.com/Maratyszcza/FXdiv/archive/b408327ac2a15ec3e43352421954f5b1967701d1.tar.gz -> FXdiv-b408327ac2a15ec3e43352421954f5b1967701d1.tar.gz
-https://github.com/google/gemmlowp/archive/3fb5c176.tar.gz -> gemmlowp-3fb5c176.tar.gz
-https://github.com/facebookincubator/gloo/archive/c22a5cfba94edf8ea4f53a174d38aa0c629d070f.tar.gz -> gloo-c22a5cfba94edf8ea4f53a174d38aa0c629d070f.tar.gz
-https://github.com/google/googletest/archive/e2239ee6043f73722e7aa812a459f54a28552929.tar.gz -> googletest-e2239ee6043f73722e7aa812a459f54a28552929.tar.gz
-https://github.com/intel/ideep/archive/9ca27bbfd88fa1469cbf0467bd6f14cd1738fa40.tar.gz -> ideep-9ca27bbfd88fa1469cbf0467bd6f14cd1738fa40.tar.gz
-https://github.com/intel/mkl-dnn/archive/5ef631a0.tar.gz -> mkl-dnn-5ef631a0.tar.gz
-cuda? ( https://github.com/NVIDIA/nccl/archive/033d7995.tar.gz -> nccl-033d7995.tar.gz )
-https://github.com/Maratyszcza/NNPACK/archive/c07e3a0400713d546e0dea2d5466dd22ea389c73.tar.gz -> NNPACK-c07e3a0400713d546e0dea2d5466dd22ea389c73.tar.gz
-https://github.com/onnx/onnx/archive/a82c6a70.tar.gz -> onnx-a82c6a70.tar.gz
-https://github.com/onnx/onnx-tensorrt/archive/c153211418a7c57ce071d9ce2a41f8d1c85a878f.tar.gz -> onnx-tensorrt-c153211418a7c57ce071d9ce2a41f8d1c85a878f.tar.gz
-https://github.com/onnx/onnx/archive/29e7aa7048809784465d06e897f043a4600642b2.tar.gz -> onnx-29e7aa7048809784465d06e897f043a4600642b2.tar.gz
-https://github.com/google/benchmark/archive/e776aa02.tar.gz -> benchmark-e776aa02.tar.gz
-https://github.com/google/benchmark/archive/5b7683f4.tar.gz -> benchmark-5b7683f4.tar.gz
-https://github.com/google/googletest/archive/5ec7f0c4.tar.gz -> googletest-5ec7f0c4.tar.gz
-https://github.com/Maratyszcza/psimd/archive/072586a71b55b7f8c584153d223e95687148a90.tar.gz -> psimd-072586a71b55b7f8c584153d223e95687148a90.tar.gz
-https://github.com/Maratyszcza/pthreadpool/archive/a134dd5d4cee80cce15db81a72e7f929d71dd413.tar.gz -> pthreadpool-a134dd5d4cee80cce15db81a72e7f929d71dd413.tar.gz
-https://github.com/Maratyszcza/PeachPy/archive/07d8fde8ac45d7705129475c0f94ed8925b93473.tar.gz -> PeachPy-07d8fde8ac45d7705129475c0f94ed8925b93473.tar.gz
-https://github.com/pytorch/QNNPACK/archive/7d2a4e9931a82adc3814275b6219a03e24e36b4c.tar.gz -> QNNPACK-7d2a4e9931a82adc3814275b6219a03e24e36b4c.tar.gz
-https://github.com/shibatch/sleef/archive/e0a003ee838b75d11763aa9c3ef17bf71a725bff.tar.gz -> sleef-e0a003ee838b75d11763aa9c3ef17bf71a725bff.tar.gz
-https://github.com/pytorch/tensorpipe/archive/c0e7623adb05f36311c7cde6dac8fc4c290419d9.tar.gz -> tensorpipe-c0e7623adb05f36311c7cde6dac8fc4c290419d9.tar.gz
-https://github.com/google/googletest/archive/2fe3bd99.tar.gz -> googletest-2fe3bd99.tar.gz
-https://github.com/google/libnop/archive/aa95422e.tar.gz -> libnop-aa95422e.tar.gz
-https://github.com/libuv/libuv/archive/02a9e1be.tar.gz -> libuv-02a9e1be.tar.gz
-https://github.com/google/XNNPACK/archive/79cd5f9e18ad0925ac9a050b00ea5a36230072db.tar.gz -> XNNPACK-79cd5f9e18ad0925ac9a050b00ea5a36230072db.tar.gz
-https://github.com/pytorch/kineto/archive/dbfa0ead96612f7ca265c63a35fdf0488395179b.tar.gz -> kineto-dbfa0ead96612f7ca265c63a35fdf0488395179b.tar.gz
-"
-
-# git clone git@github.com:pytorch/pytorch.git && cd pytorch
-# git submodules update --init --recursive
-# ${FILESDIR}/get_third_paries
-# cat SRC_URI src_prepare
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-
-IUSE="asan blas cuda +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkldnn mpi namedtensor +nnpack numa +observers opencl opencv +openmp +python +qnnpack redis rocm static test tools zeromq"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	?? ( cuda rocm )
-"
-
-RDEPEND="
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	blas? ( virtual/blas )
-	cuda? ( dev-libs/cudnn
-		dev-cpp/eigen[cuda] )
-	rocm? ( >=dev-util/hip-4.0.0-r1
-			>=dev-libs/rccl-4
-			>=sci-libs/rocThrust-4
-			>=sci-libs/hipCUB-4
-			>=sci-libs/rocPRIM-4
-			>=sci-libs/miopen-4
-			>=sci-libs/rocBLAS-4
-			>=sci-libs/rocRAND-4
-			>=sci-libs/hipSPARSE-4
-			>=sci-libs/rocFFT-4
-			>=dev-util/roctracer-4 )
-	ffmpeg? ( media-video/ffmpeg )
-	gflags? ( dev-cpp/gflags )
-	glog? ( dev-cpp/glog )
-	leveldb? ( dev-libs/leveldb )
-	lmdb? ( dev-db/lmdb )
-	mpi? ( virtual/mpi )
-	opencl? ( dev-libs/clhpp virtual/opencl )
-	opencv? ( media-libs/opencv )
-	python? ( ${PYTHON_DEPS}
-		dev-python/pybind11[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/protobuf-python:0/22
-	)
-	redis? ( dev-db/redis )
-	zeromq? ( net-libs/zeromq )
-	dev-cpp/eigen
-	dev-libs/protobuf:0/22
-	dev-libs/libuv
-"
-
-#ATen code generation
-BDEPEND="dev-python/pyyaml"
-
-DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	dev-cpp/tbb
-	app-arch/zstd
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-	sys-fabric/libibverbs
-	sys-process/numactl
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-skip-tests.patch
-	"${FILESDIR}"/${PN}-1.6.0-global-dlopen.patch
-	"${FILESDIR}"/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch
-	"${FILESDIR}"/${PN}-1.7.1-no-rpath.patch
-	"${FILESDIR}"/${PN}-1.7.1-torch_shm_manager.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-	eprefixify torch/__init__.py
-
-	rmdir third_party/benchmark || die
-	ln -sv "${WORKDIR}"/benchmark-e991355c02b93fe17713efe04cbc2e278e00fdbd third_party/benchmark || die
-	rmdir third_party/cpuinfo || die
-	ln -sv "${WORKDIR}"/cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d third_party/cpuinfo || die
-	rmdir third_party/cub || die
-	ln -sv "${WORKDIR}"/cub-d106ddb991a56c3df1b6d51b2409e36ba8181ce4 third_party/cub || die
-	rmdir third_party/fbgemm || die
-	ln -sv "${WORKDIR}"/FBGEMM-7495417ad31c38a06b1b13db66b355b6f23cd96d third_party/fbgemm || die
-	rmdir third_party/fbgemm/third_party/asmjit || die
-	ln -sv "${WORKDIR}"/asmjit-9057aa30b620f0662ff51e2230c126a345063064 third_party/fbgemm/third_party/asmjit || die
-	rmdir third_party/fbgemm/third_party/cpuinfo || die
-	ln -sv "${WORKDIR}"/cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970 third_party/fbgemm/third_party/cpuinfo || die
-	rmdir third_party/fbgemm/third_party/googletest || die
-	ln -sv "${WORKDIR}"/googletest-0fc5466dbb9e623029b1ada539717d10bd45e99e third_party/fbgemm/third_party/googletest || die
-	rmdir third_party/fmt || die
-	ln -sv "${WORKDIR}"/fmt-cd4af11efc9c622896a3e4cb599fa28668ca3d05 third_party/fmt || die
-	rmdir third_party/foxi || die
-	ln -sv "${WORKDIR}"/foxi-c278588e34e535f0bb8f00df3880d26928038cad third_party/foxi || die
-	rmdir third_party/FP16 || die
-	ln -sv "${WORKDIR}"/FP16-4dfe081cf6bcd15db339cf2680b9281b8451eeb3 third_party/FP16 || die
-	rmdir third_party/FXdiv
-	ln -sv "${WORKDIR}"/FXdiv-b408327ac2a15ec3e43352421954f5b1967701d1 third_party/FXdiv || die
-	rmdir third_party/gemmlowp/gemmlowp || die
-	ln -sv "${WORKDIR}"/gemmlowp-3fb5c176c17c765a3492cd2f0321b0dab712f350 third_party/gemmlowp/gemmlowp || die
-	rmdir third_party/gloo || die
-	ln -sv "${WORKDIR}"/gloo-c22a5cfba94edf8ea4f53a174d38aa0c629d070f third_party/gloo || die
-	rmdir third_party/googletest || die
-	ln -sv "${WORKDIR}"/googletest-e2239ee6043f73722e7aa812a459f54a28552929 third_party/googletest || die
-	rmdir third_party/ideep || die
-	ln -sv "${WORKDIR}"/ideep-9ca27bbfd88fa1469cbf0467bd6f14cd1738fa40 third_party/ideep || die
-	rmdir third_party/ideep/mkl-dnn || die
-	ln -sv "${WORKDIR}"/mkl-dnn-5ef631a030a6f73131c77892041042805a06064f third_party/ideep/mkl-dnn || die
-	rmdir third_party/nccl/nccl || die
-	ln -sv "${WORKDIR}"/nccl-033d799524fb97629af5ac2f609de367472b2696 third_party/nccl/nccl || die
-	rmdir third_party/NNPACK || die
-	ln -sv "${WORKDIR}"/NNPACK-c07e3a0400713d546e0dea2d5466dd22ea389c73 third_party/NNPACK || die
-	rmdir third_party/onnx || die
-	ln -sv "${WORKDIR}"/onnx-29e7aa7048809784465d06e897f043a4600642b2 third_party/onnx || die
-	rmdir third_party/onnx-tensorrt || die
-	ln -sv "${WORKDIR}"/onnx-tensorrt-c153211418a7c57ce071d9ce2a41f8d1c85a878f third_party/onnx-tensorrt || die
-	rmdir third_party/onnx-tensorrt/third_party/onnx || die
-	ln -sv "${WORKDIR}"/onnx-765f5ee823a67a866f4bd28a9860e81f3c811ce8 third_party/onnx-tensorrt/third_party/onnx || die
-	rmdir third_party/onnx/third_party/benchmark || die
-	ln -sv "${WORKDIR}"/benchmark-e776aa0275e293707b6a0901e0e8d8a8a3679508 third_party/onnx/third_party/benchmark || die
-	rmdir third_party/psimd || die
-	ln -sv "${WORKDIR}"/psimd-072586a71b55b7f8c584153d223e95687148a900 third_party/psimd || die
-	rmdir third_party/pthreadpool || die
-	ln -sv "${WORKDIR}"/pthreadpool-a134dd5d4cee80cce15db81a72e7f929d71dd413 third_party/pthreadpool || die
-	rmdir third_party/python-peachpy || die
-	ln -sv "${WORKDIR}"/PeachPy-07d8fde8ac45d7705129475c0f94ed8925b93473 third_party/python-peachpy || die
-	rmdir third_party/QNNPACK || die
-	ln -sv "${WORKDIR}"/QNNPACK-7d2a4e9931a82adc3814275b6219a03e24e36b4c third_party/QNNPACK || die
-	rmdir third_party/sleef || die
-	ln -sv "${WORKDIR}"/sleef-e0a003ee838b75d11763aa9c3ef17bf71a725bff third_party/sleef || die
-	rmdir third_party/tensorpipe || die
-	ln -sv "${WORKDIR}"/tensorpipe-c0e7623adb05f36311c7cde6dac8fc4c290419d9 third_party/tensorpipe || die
-	rmdir third_party/tensorpipe/third_party/googletest || die
-	ln -sv "${WORKDIR}"/googletest-2fe3bd994b3189899d93f1d5a881e725e046fdc2 third_party/tensorpipe/third_party/googletest || die
-	rmdir third_party/tensorpipe/third_party/libnop || die
-	ln -sv "${WORKDIR}"/libnop-aa95422ea8c409e3f078d2ee7708a5f59a8b9fa2 third_party/tensorpipe/third_party/libnop || die
-	rmdir third_party/tensorpipe/third_party/libuv || die
-	ln -sv "${WORKDIR}"/libuv-02a9e1be252b623ee032a3137c0b0c94afbe6809 third_party/tensorpipe/third_party/libuv || die
-	rmdir third_party/XNNPACK || die
-	ln -sv "${WORKDIR}"/XNNPACK-79cd5f9e18ad0925ac9a050b00ea5a36230072db third_party/XNNPACK || die
-	rmdir third_party/kineto || die
-	ln -sv "${WORKDIR}"/kineto-dbfa0ead96612f7ca265c63a35fdf0488395179b third_party/kineto || die
-
-	if use cuda; then
-		cd third_party/nccl/nccl || die
-		eapply "${FILESDIR}"/${PN}-1.6.0-nccl-nvccflags.patch
-
-# 		addpredict /dev/nvidiactl
-		cuda_src_prepare
-		export CUDAHOSTCXX=$(cuda_gccdir)/g++
-	fi
-
-	if use rocm; then
-		#Allow escaping sandbox
-		addread /dev/kfd
-		addread /dev/dri
-		addwrite /dev/kfd
-		addwrite /dev/dri
-
-		ebegin "HIPifying cuda sources"
-		tools/amd_build/build_amd.py
-		eend $?
-
-		export PYTORCH_ROCM_ARCH=$(rocminfo | egrep -o "gfx[0-9]+" | uniq | awk -vORS=';' "{print $1}" | sed 's/;$/\n/') || die
-		sed -e "/set(roctracer_INCLUDE_DIRS/s,\${ROCTRACER_PATH}/include,${EPREFIX}/usr/include/roctracer," \
-			-i cmake/public/LoadHIP.cmake || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DTORCH_BUILD_VERSION=${PV}
-		-DTORCH_INSTALL_LIB_DIR=$(get_libdir)
-		-DBUILD_BINARY=$(usex tools ON OFF)
-		-DBUILD_CUSTOM_PROTOBUF=OFF
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_SHARED_LIBS=$(usex static OFF ON)
-		-DBUILD_TEST=$(usex test ON OFF)
-		-DUSE_ASAN=$(usex asan ON OFF)
-		-DUSE_CUDA=$(usex cuda ON OFF)
-		-DUSE_NCCL=$(usex cuda ON OFF)
-		-DUSE_SYSTEM_NCCL=OFF
-		-DUSE_ROCM=$(usex rocm ON OFF)
-		-DUSE_FBGEMM=$(usex fbgemm ON OFF)
-		-DUSE_FFMPEG=$(usex ffmpeg ON OFF)
-		-DUSE_GFLAGS=$(usex gflags ON OFF)
-		-DUSE_GLOG=$(usex glog ON OFF)
-		-DUSE_LEVELDB=$(usex leveldb ON OFF)
-		-DUSE_LITE_PROTO=OFF
-		-DUSE_LMDB=$(usex lmdb ON OFF)
-		-DUSE_MKLDNN=$(usex mkldnn ON OFF)
-		-DUSE_MKLDNN_CBLAS=OFF
-		-DUSE_NNPACK=$(usex nnpack ON OFF)
-		-DUSE_NUMPY=$(usex python ON OFF)
-		-DUSE_NUMA=$(usex numa ON OFF)
-		-DUSE_OBSERVERS=$(usex observers ON OFF)
-		-DUSE_OPENCL=$(usex opencl ON OFF)
-		-DUSE_OPENCV=$(usex opencv ON OFF)
-		-DUSE_OPENMP=$(usex openmp ON OFF)
-		-DUSE_TBB=OFF
-		-DUSE_PROF=OFF
-		-DUSE_QNNPACK=$(usex qnnpack ON OFF)
-		-DUSE_REDIS=$(usex redis ON OFF)
-		-DUSE_ROCKSDB=OFF
-		-DUSE_ZMQ=$(usex zeromq ON OFF)
-		-DUSE_MPI=$(usex mpi ON OFF)
-		-DUSE_GLOO=$(usex gloo ON OFF)
-		-DUSE_SYSTEM_EIGEN_INSTALL=ON
-		-DBUILD_NAMEDTENSOR=$(usex namedtensor ON OFF)
-		-DBLAS=$(usex blas Generic Eigen)
-		-DTP_BUILD_LIBUV=OFF
-		-Wno-dev
-	)
-
-	cmake_src_configure
-
-	if use python; then
-		CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_configure
-	fi
-
-	# do not rerun cmake and the build process in src_install
-	sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die
-}
-
-src_compile() {
-	cmake_src_compile
-
-	if use python; then
-		CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	cmake_src_install
-
-	local LIB=$(get_libdir)
-	if [[ ${LIB} != lib ]]; then
-		mv -fv "${ED}"/usr/lib/*.so "${ED}"/usr/${LIB}/ || die
-	fi
-
-	rm -rfv "${ED}/torch"
-	rm -rfv "${ED}/var"
-	rm -rfv "${ED}/usr/lib"
-
-	rm -fv "${ED}/usr/include/*.{h,hpp}"
-	rm -rfv "${ED}/usr/include/asmjit"
-	rm -rfv "${ED}/usr/include/c10d"
-	rm -rfv "${ED}/usr/include/fbgemm"
-	rm -rfv "${ED}/usr/include/fp16"
-	rm -rfv "${ED}/usr/include/gloo"
-	rm -rfv "${ED}/usr/include/include"
-	rm -rfv "${ED}/usr/include/var"
-
-	cp -rv "${WORKDIR}/${P}/third_party/pybind11/include/pybind11" "${ED}/usr/include/"
-
-	rm -fv "${ED}/usr/${LIB}/libtbb.so"
-	rm -rfv "${ED}/usr/${LIB}/cmake"
-
-	if use python; then
-		scanelf -r --fix "${BUILD_DIR}/caffe2/python"
-		CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_install
-
-		python_foreach_impl python_optimize
-	fi
-
-	find "${ED}/usr/${LIB}" -name "*.a" -exec rm -fv {} \;
-
-	use test && rm -rfv "${ED}/usr/test" "${ED}"/usr/bin/test_{api,jit}
-
-	# Remove the empty directories by CMake Python:
-	find "${ED}" -type d -empty -delete || die
-}

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Andrew Ammerlaan]

commit:     3f42049a77ae9c11af52753c2f99ce9391274d4d
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 26 14:39:23 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Dec 26 14:39:23 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=3f42049a

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

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

 sci-libs/pytorch/pytorch-1.10.1.ebuild | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/sci-libs/pytorch/pytorch-1.10.1.ebuild b/sci-libs/pytorch/pytorch-1.10.1.ebuild
index 98afa9662..a7bbb62ac 100644
--- a/sci-libs/pytorch/pytorch-1.10.1.ebuild
+++ b/sci-libs/pytorch/pytorch-1.10.1.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS=manual
+DISTUTILS_SINGLE_IMPL=1
 PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake cuda distutils-r1 prefix
@@ -63,7 +64,9 @@ IUSE="asan blas cuda +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkldnn mpi na
 REQUIRED_USE="	?? ( cuda rocm )"
 
 RDEPEND="
+	$(python_gen_cond_dep '
 	dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
 	blas? ( virtual/blas )
 	cuda? ( dev-libs/cudnn
 		dev-cpp/eigen[cuda] )
@@ -87,10 +90,12 @@ RDEPEND="
 	opencl? ( dev-libs/clhpp )
 	opencv? ( media-libs/opencv )
 	python? ( ${PYTHON_DEPS}
+		$(python_gen_cond_dep '
 		dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/pybind11[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/protobuf-python:=
+		dev-python/protobuf-python:=[${PYTHON_USEDEP}]
+		')
 	)
 	redis? ( dev-db/redis )
 	zeromq? ( net-libs/zeromq )
@@ -105,8 +110,10 @@ BDEPEND="dev-python/pyyaml"
 DEPEND="${RDEPEND}
 	dev-cpp/tbb
 	app-arch/zstd
+	$(python_gen_cond_dep '
 	dev-python/pybind11[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	')
 	sys-fabric/libibverbs
 	sys-process/numactl
 "
@@ -316,7 +323,7 @@ src_install() {
 		scanelf -r --fix "${BUILD_DIR}/caffe2/python" || die
 		USE_SYSTEM_LIBS=ON CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_install
 
-		python_foreach_impl python_optimize
+		python_optimize
 	fi
 
 	find "${ED}/usr/${LIB}" -name "*.a" -exec rm -fv {} \; || die

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Andrew Ammerlaan]

commit:     c04e69c1ba5b2eb35268d2bceb8b91e46abf23a0
Author:     Miezhiko <Miezhiko <AT> gmail <DOT> com>
AuthorDate: Wed Dec 22 09:01:14 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Dec 22 12:42:23 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c04e69c1

sci-libs/pytorch: fix src_install (2)

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

 sci-libs/pytorch/pytorch-1.10.1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sci-libs/pytorch/pytorch-1.10.1.ebuild b/sci-libs/pytorch/pytorch-1.10.1.ebuild
index 0377b626f..5a745c28f 100644
--- a/sci-libs/pytorch/pytorch-1.10.1.ebuild
+++ b/sci-libs/pytorch/pytorch-1.10.1.ebuild
@@ -307,7 +307,6 @@ src_install() {
 	rm -rfv "${ED}/usr/include/include"
 	rm -rfv "${ED}/usr/include/var"
 
-	rm -v "${ED}/usr/${LIB}/libtbb.so" || die
 	rm -r "${ED}/usr/${LIB}/cmake" || die
 
 	if use python; then

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Andrew Ammerlaan]

commit:     210ccd4d54c55764d83218b99627e41ed7d59aaa
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 22 14:33:15 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Dec 22 14:33:15 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=210ccd4d

sci-libs/pytorch: QA fixes

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

 sci-libs/pytorch/pytorch-1.10.1.ebuild | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/sci-libs/pytorch/pytorch-1.10.1.ebuild b/sci-libs/pytorch/pytorch-1.10.1.ebuild
index 1750f40c9..e3b49e630 100644
--- a/sci-libs/pytorch/pytorch-1.10.1.ebuild
+++ b/sci-libs/pytorch/pytorch-1.10.1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake cuda distutils-r1 prefix
@@ -58,11 +59,8 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 
-IUSE="asan blas cuda +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkldnn mpi namedtensor +nnpack numa +observers opencl opencv +openmp +python +qnnpack redis rocm static test tools zeromq"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	?? ( cuda rocm )
-"
+IUSE="asan blas cuda +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkldnn mpi namedtensor +nnpack numa +observers opencl opencv +openmp +python +qnnpack redis rocm static tools zeromq"
+REQUIRED_USE="	?? ( cuda rocm )"
 
 RDEPEND="
 	dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -104,7 +102,6 @@ RDEPEND="
 BDEPEND="dev-python/pyyaml"
 
 DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 	dev-cpp/tbb
 	app-arch/zstd
 	dev-python/pybind11[${PYTHON_USEDEP}]
@@ -304,21 +301,13 @@ src_install() {
 		mv -fv "${ED}"/usr/lib/*.so "${ED}"/usr/${LIB}/ || die
 	fi
 
-	rm -rfv "${ED}/torch"
-	rm -rfv "${ED}/var"
-	rm -rfv "${ED}/usr/lib"
-
-	rm -fv "${ED}/usr/include/*.{h,hpp}"
-	rm -rfv "${ED}/usr/include/asmjit"
-	rm -rfv "${ED}/usr/include/c10d"
-	rm -rfv "${ED}/usr/include/fbgemm"
-	rm -rfv "${ED}/usr/include/fp16"
-	rm -rfv "${ED}/usr/include/gloo"
-	rm -rfv "${ED}/usr/include/include"
-	rm -rfv "${ED}/usr/include/var"
-
-	rm -r "${ED}/usr/${LIB}/cmake" || die
-	rm -rv "${ED}/usr/${LIB}/cmake" || die
+	rm -r "${ED}/usr/lib" || die
+
+	rm -r "${ED}/usr/include/asmjit" || die
+	rm -r "${ED}/usr/include/c10d" || die
+	rm -r "${ED}/usr/include/fbgemm" || die
+	rm -r "${ED}/usr/include/fp16" || die
+	rm -r "${ED}/usr/include/gloo" || die
 
 	if use python; then
 		scanelf -r --fix "${BUILD_DIR}/caffe2/python" || die

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Andrew Ammerlaan]

commit:     4c15677854b501ff60e87f35c1b52c2ac2e2db91
Author:     Miezhiko <Miezhiko <AT> gmail <DOT> com>
AuthorDate: Wed Dec 22 06:53:36 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Dec 22 12:42:22 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=4c156778

Update pytorch to 1.10.1 improve ebuild quality + switch to EAPI 8

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

 ...pytorch-1.10.0.ebuild => pytorch-1.10.1.ebuild} | 32 ++++++++++++----------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/sci-libs/pytorch/pytorch-1.10.0.ebuild b/sci-libs/pytorch/pytorch-1.10.1.ebuild
similarity index 96%
rename from sci-libs/pytorch/pytorch-1.10.0.ebuild
rename to sci-libs/pytorch/pytorch-1.10.1.ebuild
index 36d68fb14..8fb18d3a0 100644
--- a/sci-libs/pytorch/pytorch-1.10.0.ebuild
+++ b/sci-libs/pytorch/pytorch-1.10.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake cuda distutils-r1 prefix
 
@@ -56,10 +56,9 @@ https://github.com/mikey/linux-syscall-support/archive/e1e7b0ad8ee99a875b272c8e3
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
-IUSE="asan blas cuda +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkldnn mpi namedtensor +nnpack numa +observers opencl opencv +openmp +python +qnnpack redis rocm static test tools zeromq"
-RESTRICT="!test? ( test )"
+IUSE="asan blas cuda +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkldnn mpi namedtensor +nnpack numa +observers opencl opencv +openmp +python +qnnpack redis rocm static tools zeromq"
 REQUIRED_USE="
 	?? ( cuda rocm )
 "
@@ -104,7 +103,6 @@ RDEPEND="
 BDEPEND="dev-python/pyyaml"
 
 DEPEND="${RDEPEND}
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 	dev-cpp/tbb
 	app-arch/zstd
 	dev-python/pybind11[${PYTHON_USEDEP}]
@@ -122,6 +120,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.10.0-nonull.patch
 )
 
+distutils_enable_tests pytest
+
 src_prepare() {
 	cmake_src_prepare
 	eprefixify torch/__init__.py
@@ -208,11 +208,11 @@ src_prepare() {
 		#Allow escaping sandbox
 		addread /dev/kfd
 		addread /dev/dri
-		addwrite /dev/kfd
-		addwrite /dev/dri
+		addpredict /dev/kfd
+		addpredict /dev/dri
 
 		ebegin "HIPifying cuda sources"
-		tools/amd_build/build_amd.py
+		${EPYTHON} tools/amd_build/build_amd.py || die
 		eend $?
 
 		export PYTORCH_ROCM_ARCH=$(rocminfo | egrep -o "gfx[0-9]+" | uniq | awk -vORS=';' "{print $1}" | sed 's/;$/\n/') || die
@@ -307,21 +307,23 @@ src_install() {
 	rm -rfv "${ED}/usr/include/include"
 	rm -rfv "${ED}/usr/include/var"
 
-	cp -rv "${WORKDIR}/${P}/third_party/pybind11/include/pybind11" "${ED}/usr/include/"
+	cp -rv "${WORKDIR}/${P}/third_party/pybind11/include/pybind11" "${ED}/usr/include/" || die
 
-	rm -fv "${ED}/usr/${LIB}/libtbb.so"
-	rm -rfv "${ED}/usr/${LIB}/cmake"
+	rm -v "${ED}/usr/${LIB}/libtbb.so" || die
+	rm -r "${ED}/usr/${LIB}/cmake" || die
 
 	if use python; then
-		scanelf -r --fix "${BUILD_DIR}/caffe2/python"
+		scanelf -r --fix "${BUILD_DIR}/caffe2/python" || die
 		USE_SYSTEM_LIBS=ON CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_install
 
 		python_foreach_impl python_optimize
 	fi
 
-	find "${ED}/usr/${LIB}" -name "*.a" -exec rm -fv {} \;
+	find "${ED}/usr/${LIB}" -name "*.a" -exec rm -fv {} \; || die
 
-	use test && rm -rfv "${ED}/usr/test" "${ED}"/usr/bin/test_{api,jit}
+	if use test; then
+		rm -r "${ED}/usr/test" "${ED}"/usr/bin/test_{api,jit} || die
+	fi
 
 	# Remove the empty directories by CMake Python:
 	find "${ED}" -type d -empty -delete || die

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Andrew Ammerlaan]

commit:     4ccd5ccf3bbc13d8b56e956ae65c8fa36c179f60
Author:     Miezhiko <Miezhiko <AT> gmail <DOT> com>
AuthorDate: Thu Nov 11 08:02:42 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Dec 22 12:42:22 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=4ccd5ccf

sci-libs/pythorch: solve conflict with system pybind11

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

 sci-libs/pytorch/pytorch-1.10.0.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-libs/pytorch/pytorch-1.10.0.ebuild b/sci-libs/pytorch/pytorch-1.10.0.ebuild
index d3d347325..1aa85911f 100644
--- a/sci-libs/pytorch/pytorch-1.10.0.ebuild
+++ b/sci-libs/pytorch/pytorch-1.10.0.ebuild
@@ -108,7 +108,7 @@ DEPEND="${RDEPEND}
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 	dev-cpp/tbb
 	app-arch/zstd
-	!dev-python/pybind11
+	dev-python/pybind11[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 	sys-fabric/libibverbs
 	sys-process/numactl
@@ -321,6 +321,8 @@ src_install() {
 		python_foreach_impl python_optimize
 	fi
 
+	rm -rfv "${ED}/usr/include/pybind11"
+
 	find "${ED}/usr/${LIB}" -name "*.a" -exec rm -fv {} \;
 
 	use test && rm -rfv "${ED}/usr/test" "${ED}"/usr/bin/test_{api,jit}

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Andrew Ammerlaan]

commit:     d03777e9a0a24ba23723f18d822c1256d8acd003
Author:     Miezhiko <Miezhiko <AT> gmail <DOT> com>
AuthorDate: Wed Dec 22 07:16:58 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Dec 22 12:42:22 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d03777e9

sci-libs/pytorch: fix breakpad, drop ~x86 support

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

 sci-libs/pytorch/pytorch-1.10.1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/pytorch/pytorch-1.10.1.ebuild b/sci-libs/pytorch/pytorch-1.10.1.ebuild
index 8fb18d3a0..598f80108 100644
--- a/sci-libs/pytorch/pytorch-1.10.1.ebuild
+++ b/sci-libs/pytorch/pytorch-1.10.1.ebuild
@@ -45,7 +45,7 @@ https://github.com/google/libnop/archive/aa95422e.tar.gz -> libnop-aa95422e.tar.
 https://github.com/libuv/libuv/archive/48e04275332f5753427d21a52f17ec6206451f2c.tar.gz -> libuv-48e04275332f5753427d21a52f17ec6206451f2c.tar.gz
 https://github.com/google/XNNPACK/archive/79cd5f9e18ad0925ac9a050b00ea5a36230072db.tar.gz -> XNNPACK-79cd5f9e18ad0925ac9a050b00ea5a36230072db.tar.gz
 https://github.com/pytorch/kineto/archive/879a203d9bf554e95541679ddad6e0326f272dc1.tar.gz -> kineto-879a203d9bf554e95541679ddad6e0326f272dc1.tar.gz
-https://github.com/driazati/breakpad/archive/7d188f679d4ae0a5bd06408a3047d69ef8eef848.tar.gz -> breakpad-7d188f679d4ae0a5bd06408a3047d69ef8eef848.tar.gz
+https://github.com/driazati/breakpad/archive/edbb99f95c75be27d038fffb1d969cdacf705db2.tar.gz -> breakpad-edbb99f95c75be27d038fffb1d969cdacf705db2.tar.gz
 https://github.com/mikey/linux-syscall-support/archive/e1e7b0ad8ee99a875b272c8e33e308472e897660.tar.gz -> lss-e1e7b0ad8ee99a875b272c8e33e308472e897660.tar.gz
 "
 
@@ -56,7 +56,7 @@ https://github.com/mikey/linux-syscall-support/archive/e1e7b0ad8ee99a875b272c8e3
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
 
 IUSE="asan blas cuda +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkldnn mpi namedtensor +nnpack numa +observers opencl opencv +openmp +python +qnnpack redis rocm static tools zeromq"
 REQUIRED_USE="
@@ -193,7 +193,7 @@ src_prepare() {
 	rmdir third_party/kineto || die
 	ln -sv "${WORKDIR}"/kineto-879a203d9bf554e95541679ddad6e0326f272dc1 third_party/kineto || die
 	rmdir third_party/breakpad || die
-	ln -sv "${WORKDIR}"/breakpad-7d188f679d4ae0a5bd06408a3047d69ef8eef848 third_party/breakpad || die
+	ln -sv "${WORKDIR}"/breakpad-edbb99f95c75be27d038fffb1d969cdacf705db2 third_party/breakpad || die
 	rmdir third_party/breakpad/src/third_party/lss || die
 	ln -sv "${WORKDIR}"/linux-syscall-support-e1e7b0ad8ee99a875b272c8e33e308472e897660 third_party/breakpad/src/third_party/lss || die
 

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Andrew Ammerlaan]

commit:     bc98310f979f36a5fb3d2279120233faf522fee2
Author:     Miezhiko <Miezhiko <AT> gmail <DOT> com>
AuthorDate: Wed Dec 22 08:03:01 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Dec 22 12:42:23 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=bc98310f

sci-libs/pytorch: fix src_install

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

 sci-libs/pytorch/pytorch-1.10.1.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sci-libs/pytorch/pytorch-1.10.1.ebuild b/sci-libs/pytorch/pytorch-1.10.1.ebuild
index 598f80108..0377b626f 100644
--- a/sci-libs/pytorch/pytorch-1.10.1.ebuild
+++ b/sci-libs/pytorch/pytorch-1.10.1.ebuild
@@ -307,8 +307,6 @@ src_install() {
 	rm -rfv "${ED}/usr/include/include"
 	rm -rfv "${ED}/usr/include/var"
 
-	cp -rv "${WORKDIR}/${P}/third_party/pybind11/include/pybind11" "${ED}/usr/include/" || die
-
 	rm -v "${ED}/usr/${LIB}/libtbb.so" || die
 	rm -r "${ED}/usr/${LIB}/cmake" || die
 

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Andrew Ammerlaan]

commit:     e94f62bceecc242d72de315c54acc2f904f4f9a3
Author:     Miezhiko <Miezhiko <AT> gmail <DOT> com>
AuthorDate: Mon Nov 15 09:03:08 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Dec 22 12:42:22 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=e94f62bc

sci-libs/pytorch: use system pybind11

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

 sci-libs/pytorch/pytorch-1.10.0.ebuild | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/sci-libs/pytorch/pytorch-1.10.0.ebuild b/sci-libs/pytorch/pytorch-1.10.0.ebuild
index 1aa85911f..36d68fb14 100644
--- a/sci-libs/pytorch/pytorch-1.10.0.ebuild
+++ b/sci-libs/pytorch/pytorch-1.10.0.ebuild
@@ -47,7 +47,6 @@ https://github.com/google/XNNPACK/archive/79cd5f9e18ad0925ac9a050b00ea5a36230072
 https://github.com/pytorch/kineto/archive/879a203d9bf554e95541679ddad6e0326f272dc1.tar.gz -> kineto-879a203d9bf554e95541679ddad6e0326f272dc1.tar.gz
 https://github.com/driazati/breakpad/archive/7d188f679d4ae0a5bd06408a3047d69ef8eef848.tar.gz -> breakpad-7d188f679d4ae0a5bd06408a3047d69ef8eef848.tar.gz
 https://github.com/mikey/linux-syscall-support/archive/e1e7b0ad8ee99a875b272c8e33e308472e897660.tar.gz -> lss-e1e7b0ad8ee99a875b272c8e33e308472e897660.tar.gz
-https://github.com/pybind/pybind11/archive/8de7772cc72daca8e947b79b83fea46214931604.tar.gz -> pybind11-8de7772cc72daca8e947b79b83fea46214931604.tar.gz
 "
 
 # git clone git@github.com:pytorch/pytorch.git && cd pytorch
@@ -197,8 +196,6 @@ src_prepare() {
 	ln -sv "${WORKDIR}"/breakpad-7d188f679d4ae0a5bd06408a3047d69ef8eef848 third_party/breakpad || die
 	rmdir third_party/breakpad/src/third_party/lss || die
 	ln -sv "${WORKDIR}"/linux-syscall-support-e1e7b0ad8ee99a875b272c8e33e308472e897660 third_party/breakpad/src/third_party/lss || die
-	rmdir third_party/pybind11 || die
-	ln -sv "${WORKDIR}"/pybind11-8de7772cc72daca8e947b79b83fea46214931604 third_party/pybind11 || die
 
 	if use cuda; then
 		cd third_party/nccl/nccl || die
@@ -264,6 +261,7 @@ src_configure() {
 		-DUSE_MPI=$(usex mpi ON OFF)
 		-DUSE_GLOO=$(usex gloo ON OFF)
 		-DUSE_SYSTEM_EIGEN_INSTALL=ON
+		-DUSE_SYSTEM_PYBIND11=ON
 		-DBUILD_NAMEDTENSOR=$(usex namedtensor ON OFF)
 		-DBLAS=$(usex blas Generic Eigen)
 		-DTP_BUILD_LIBUV=OFF
@@ -321,8 +319,6 @@ src_install() {
 		python_foreach_impl python_optimize
 	fi
 
-	rm -rfv "${ED}/usr/include/pybind11"
-
 	find "${ED}/usr/${LIB}" -name "*.a" -exec rm -fv {} \;
 
 	use test && rm -rfv "${ED}/usr/test" "${ED}"/usr/bin/test_{api,jit}

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Andrew Ammerlaan]

commit:     e0ef48565de0d6e5b46e60aa24810a3404dd0861
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 20 09:14:46 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jul 20 09:54:24 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=e0ef4856

sci-libs/pytorch: add version 1.9.0

no keywords, cause compile failure (as do all
other versions of pytorch)

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

 sci-libs/pytorch/pytorch-1.9.0.ebuild | 321 ++++++++++++++++++++++++++++++++++
 1 file changed, 321 insertions(+)

diff --git a/sci-libs/pytorch/pytorch-1.9.0.ebuild b/sci-libs/pytorch/pytorch-1.9.0.ebuild
new file mode 100644
index 000000000..c997f8da8
--- /dev/null
+++ b/sci-libs/pytorch/pytorch-1.9.0.ebuild
@@ -0,0 +1,321 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit cmake cuda distutils-r1 prefix
+
+DESCRIPTION="Tensors and Dynamic neural networks in Python with strong GPU acceleration"
+HOMEPAGE="https://pytorch.org/"
+SRC_URI="https://github.com/pytorch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+https://github.com/google/benchmark/archive/e991355c02b93fe17713efe04cbc2e278e00fdbd.tar.gz -> benchmark-e991355c02b93fe17713efe04cbc2e278e00fdbd.tar.gz
+https://github.com/pytorch/cpuinfo/archive/63b25457.tar.gz -> cpuinfo-63b25457.tar.gz
+https://github.com/NVlabs/cub/archive/d106ddb991a56c3df1b6d51b2409e36ba8181ce4.tar.gz -> cub-d106ddb991a56c3df1b6d51b2409e36ba8181ce4.tar.gz
+https://github.com/pytorch/fbgemm/archive/7495417ad31c38a06b1b13db66b355b6f23cd96d.tar.gz -> fbgemm-7495417ad31c38a06b1b13db66b355b6f23cd96d.tar.gz
+https://github.com/asmjit/asmjit/archive/9057aa30.tar.gz -> asmjit-9057aa30.tar.gz
+https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.tar.gz -> cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.tar.gz
+https://github.com/google/googletest/archive/0fc5466d.tar.gz -> googletest-0fc5466d.tar.gz
+https://github.com/fmtlib/fmt/archive/cd4af11efc9c622896a3e4cb599fa28668ca3d05.tar.gz -> fmt-cd4af11efc9c622896a3e4cb599fa28668ca3d05.tar.gz
+https://github.com/houseroad/foxi/archive/c278588e34e535f0bb8f00df3880d26928038cad.tar.gz -> foxi-c278588e34e535f0bb8f00df3880d26928038cad.tar.gz
+https://github.com/Maratyszcza/FP16/archive/4dfe081cf6bcd15db339cf2680b9281b8451eeb3.tar.gz -> FP16-4dfe081cf6bcd15db339cf2680b9281b8451eeb3.tar.gz
+https://github.com/Maratyszcza/FXdiv/archive/b408327ac2a15ec3e43352421954f5b1967701d1.tar.gz -> FXdiv-b408327ac2a15ec3e43352421954f5b1967701d1.tar.gz
+https://github.com/google/gemmlowp/archive/3fb5c176.tar.gz -> gemmlowp-3fb5c176.tar.gz
+https://github.com/facebookincubator/gloo/archive/c22a5cfba94edf8ea4f53a174d38aa0c629d070f.tar.gz -> gloo-c22a5cfba94edf8ea4f53a174d38aa0c629d070f.tar.gz
+https://github.com/google/googletest/archive/e2239ee6043f73722e7aa812a459f54a28552929.tar.gz -> googletest-e2239ee6043f73722e7aa812a459f54a28552929.tar.gz
+https://github.com/intel/ideep/archive/9ca27bbfd88fa1469cbf0467bd6f14cd1738fa40.tar.gz -> ideep-9ca27bbfd88fa1469cbf0467bd6f14cd1738fa40.tar.gz
+https://github.com/intel/mkl-dnn/archive/5ef631a0.tar.gz -> mkl-dnn-5ef631a0.tar.gz
+cuda? ( https://github.com/NVIDIA/nccl/archive/033d7995.tar.gz -> nccl-033d7995.tar.gz )
+https://github.com/Maratyszcza/NNPACK/archive/c07e3a0400713d546e0dea2d5466dd22ea389c73.tar.gz -> NNPACK-c07e3a0400713d546e0dea2d5466dd22ea389c73.tar.gz
+https://github.com/onnx/onnx/archive/a82c6a70.tar.gz -> onnx-a82c6a70.tar.gz
+https://github.com/onnx/onnx-tensorrt/archive/c153211418a7c57ce071d9ce2a41f8d1c85a878f.tar.gz -> onnx-tensorrt-c153211418a7c57ce071d9ce2a41f8d1c85a878f.tar.gz
+https://github.com/onnx/onnx/archive/29e7aa7048809784465d06e897f043a4600642b2.tar.gz -> onnx-29e7aa7048809784465d06e897f043a4600642b2.tar.gz
+https://github.com/google/benchmark/archive/e776aa02.tar.gz -> benchmark-e776aa02.tar.gz
+https://github.com/google/benchmark/archive/5b7683f4.tar.gz -> benchmark-5b7683f4.tar.gz
+https://github.com/google/googletest/archive/5ec7f0c4.tar.gz -> googletest-5ec7f0c4.tar.gz
+https://github.com/Maratyszcza/psimd/archive/072586a71b55b7f8c584153d223e95687148a90.tar.gz -> psimd-072586a71b55b7f8c584153d223e95687148a90.tar.gz
+https://github.com/Maratyszcza/pthreadpool/archive/a134dd5d4cee80cce15db81a72e7f929d71dd413.tar.gz -> pthreadpool-a134dd5d4cee80cce15db81a72e7f929d71dd413.tar.gz
+https://github.com/Maratyszcza/PeachPy/archive/07d8fde8ac45d7705129475c0f94ed8925b93473.tar.gz -> PeachPy-07d8fde8ac45d7705129475c0f94ed8925b93473.tar.gz
+https://github.com/pytorch/QNNPACK/archive/7d2a4e9931a82adc3814275b6219a03e24e36b4c.tar.gz -> QNNPACK-7d2a4e9931a82adc3814275b6219a03e24e36b4c.tar.gz
+https://github.com/shibatch/sleef/archive/e0a003ee838b75d11763aa9c3ef17bf71a725bff.tar.gz -> sleef-e0a003ee838b75d11763aa9c3ef17bf71a725bff.tar.gz
+https://github.com/pytorch/tensorpipe/archive/c0e7623adb05f36311c7cde6dac8fc4c290419d9.tar.gz -> tensorpipe-c0e7623adb05f36311c7cde6dac8fc4c290419d9.tar.gz
+https://github.com/google/googletest/archive/2fe3bd99.tar.gz -> googletest-2fe3bd99.tar.gz
+https://github.com/google/libnop/archive/aa95422e.tar.gz -> libnop-aa95422e.tar.gz
+https://github.com/libuv/libuv/archive/02a9e1be.tar.gz -> libuv-02a9e1be.tar.gz
+https://github.com/google/XNNPACK/archive/79cd5f9e18ad0925ac9a050b00ea5a36230072db.tar.gz -> XNNPACK-79cd5f9e18ad0925ac9a050b00ea5a36230072db.tar.gz
+https://github.com/pytorch/kineto/archive/dbfa0ead96612f7ca265c63a35fdf0488395179b.tar.gz -> kineto-dbfa0ead96612f7ca265c63a35fdf0488395179b.tar.gz
+"
+
+# git clone git@github.com:pytorch/pytorch.git && cd pytorch
+# git submodules update --init --recursive
+# ${FILESDIR}/get_third_paries
+# cat SRC_URI src_prepare
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+
+IUSE="asan blas cuda +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkldnn mpi namedtensor +nnpack numa +observers opencl opencv +openmp +python +qnnpack redis rocm static test tools zeromq"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	?? ( cuda rocm )
+"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	blas? ( virtual/blas )
+	cuda? ( dev-libs/cudnn
+		dev-cpp/eigen[cuda] )
+	rocm? ( >=dev-util/hip-4.0.0-r1
+			>=dev-libs/rccl-4
+			>=sci-libs/rocThrust-4
+			>=sci-libs/hipCUB-4
+			>=sci-libs/rocPRIM-4
+			>=sci-libs/miopen-4
+			>=sci-libs/rocBLAS-4
+			>=sci-libs/rocRAND-4
+			>=sci-libs/hipSPARSE-4
+			>=sci-libs/rocFFT-4
+			>=dev-util/roctracer-4 )
+	ffmpeg? ( media-video/ffmpeg )
+	gflags? ( dev-cpp/gflags )
+	glog? ( dev-cpp/glog )
+	leveldb? ( dev-libs/leveldb )
+	lmdb? ( dev-db/lmdb )
+	mpi? ( virtual/mpi )
+	opencl? ( dev-libs/clhpp virtual/opencl )
+	opencv? ( media-libs/opencv )
+	python? ( ${PYTHON_DEPS}
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/protobuf-python:0/22
+	)
+	redis? ( dev-db/redis )
+	zeromq? ( net-libs/zeromq )
+	dev-cpp/eigen
+	dev-libs/protobuf:0/22
+	dev-libs/libuv
+"
+
+#ATen code generation
+BDEPEND="dev-python/pyyaml"
+
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	dev-cpp/tbb
+	app-arch/zstd
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	sys-fabric/libibverbs
+	sys-process/numactl
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-skip-tests.patch
+	"${FILESDIR}"/${PN}-1.6.0-global-dlopen.patch
+	"${FILESDIR}"/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch
+	"${FILESDIR}"/${PN}-1.7.1-no-rpath.patch
+	"${FILESDIR}"/${PN}-1.7.1-torch_shm_manager.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	eprefixify torch/__init__.py
+
+	rmdir third_party/benchmark || die
+	ln -sv "${WORKDIR}"/benchmark-e991355c02b93fe17713efe04cbc2e278e00fdbd third_party/benchmark || die
+	rmdir third_party/cpuinfo || die
+	ln -sv "${WORKDIR}"/cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d third_party/cpuinfo || die
+	rmdir third_party/cub || die
+	ln -sv "${WORKDIR}"/cub-d106ddb991a56c3df1b6d51b2409e36ba8181ce4 third_party/cub || die
+	rmdir third_party/fbgemm || die
+	ln -sv "${WORKDIR}"/FBGEMM-7495417ad31c38a06b1b13db66b355b6f23cd96d third_party/fbgemm || die
+	rmdir third_party/fbgemm/third_party/asmjit || die
+	ln -sv "${WORKDIR}"/asmjit-9057aa30b620f0662ff51e2230c126a345063064 third_party/fbgemm/third_party/asmjit || die
+	rmdir third_party/fbgemm/third_party/cpuinfo || die
+	ln -sv "${WORKDIR}"/cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970 third_party/fbgemm/third_party/cpuinfo || die
+	rmdir third_party/fbgemm/third_party/googletest || die
+	ln -sv "${WORKDIR}"/googletest-0fc5466dbb9e623029b1ada539717d10bd45e99e third_party/fbgemm/third_party/googletest || die
+	rmdir third_party/fmt || die
+	ln -sv "${WORKDIR}"/fmt-cd4af11efc9c622896a3e4cb599fa28668ca3d05 third_party/fmt || die
+	rmdir third_party/foxi || die
+	ln -sv "${WORKDIR}"/foxi-c278588e34e535f0bb8f00df3880d26928038cad third_party/foxi || die
+	rmdir third_party/FP16 || die
+	ln -sv "${WORKDIR}"/FP16-4dfe081cf6bcd15db339cf2680b9281b8451eeb3 third_party/FP16 || die
+	rmdir third_party/FXdiv
+	ln -sv "${WORKDIR}"/FXdiv-b408327ac2a15ec3e43352421954f5b1967701d1 third_party/FXdiv || die
+	rmdir third_party/gemmlowp/gemmlowp || die
+	ln -sv "${WORKDIR}"/gemmlowp-3fb5c176c17c765a3492cd2f0321b0dab712f350 third_party/gemmlowp/gemmlowp || die
+	rmdir third_party/gloo || die
+	ln -sv "${WORKDIR}"/gloo-c22a5cfba94edf8ea4f53a174d38aa0c629d070f third_party/gloo || die
+	rmdir third_party/googletest || die
+	ln -sv "${WORKDIR}"/googletest-e2239ee6043f73722e7aa812a459f54a28552929 third_party/googletest || die
+	rmdir third_party/ideep || die
+	ln -sv "${WORKDIR}"/ideep-9ca27bbfd88fa1469cbf0467bd6f14cd1738fa40 third_party/ideep || die
+	rmdir third_party/ideep/mkl-dnn || die
+	ln -sv "${WORKDIR}"/mkl-dnn-5ef631a030a6f73131c77892041042805a06064f third_party/ideep/mkl-dnn || die
+	rmdir third_party/nccl/nccl || die
+	ln -sv "${WORKDIR}"/nccl-033d799524fb97629af5ac2f609de367472b2696 third_party/nccl/nccl || die
+	rmdir third_party/NNPACK || die
+	ln -sv "${WORKDIR}"/NNPACK-c07e3a0400713d546e0dea2d5466dd22ea389c73 third_party/NNPACK || die
+	rmdir third_party/onnx || die
+	ln -sv "${WORKDIR}"/onnx-29e7aa7048809784465d06e897f043a4600642b2 third_party/onnx || die
+	rmdir third_party/onnx-tensorrt || die
+	ln -sv "${WORKDIR}"/onnx-tensorrt-c153211418a7c57ce071d9ce2a41f8d1c85a878f third_party/onnx-tensorrt || die
+	rmdir third_party/onnx-tensorrt/third_party/onnx || die
+	ln -sv "${WORKDIR}"/onnx-765f5ee823a67a866f4bd28a9860e81f3c811ce8 third_party/onnx-tensorrt/third_party/onnx || die
+	rmdir third_party/onnx/third_party/benchmark || die
+	ln -sv "${WORKDIR}"/benchmark-e776aa0275e293707b6a0901e0e8d8a8a3679508 third_party/onnx/third_party/benchmark || die
+	rmdir third_party/psimd || die
+	ln -sv "${WORKDIR}"/psimd-072586a71b55b7f8c584153d223e95687148a900 third_party/psimd || die
+	rmdir third_party/pthreadpool || die
+	ln -sv "${WORKDIR}"/pthreadpool-a134dd5d4cee80cce15db81a72e7f929d71dd413 third_party/pthreadpool || die
+	rmdir third_party/python-peachpy || die
+	ln -sv "${WORKDIR}"/PeachPy-07d8fde8ac45d7705129475c0f94ed8925b93473 third_party/python-peachpy || die
+	rmdir third_party/QNNPACK || die
+	ln -sv "${WORKDIR}"/QNNPACK-7d2a4e9931a82adc3814275b6219a03e24e36b4c third_party/QNNPACK || die
+	rmdir third_party/sleef || die
+	ln -sv "${WORKDIR}"/sleef-e0a003ee838b75d11763aa9c3ef17bf71a725bff third_party/sleef || die
+	rmdir third_party/tensorpipe || die
+	ln -sv "${WORKDIR}"/tensorpipe-c0e7623adb05f36311c7cde6dac8fc4c290419d9 third_party/tensorpipe || die
+	rmdir third_party/tensorpipe/third_party/googletest || die
+	ln -sv "${WORKDIR}"/googletest-2fe3bd994b3189899d93f1d5a881e725e046fdc2 third_party/tensorpipe/third_party/googletest || die
+	rmdir third_party/tensorpipe/third_party/libnop || die
+	ln -sv "${WORKDIR}"/libnop-aa95422ea8c409e3f078d2ee7708a5f59a8b9fa2 third_party/tensorpipe/third_party/libnop || die
+	rmdir third_party/tensorpipe/third_party/libuv || die
+	ln -sv "${WORKDIR}"/libuv-02a9e1be252b623ee032a3137c0b0c94afbe6809 third_party/tensorpipe/third_party/libuv || die
+	rmdir third_party/XNNPACK || die
+	ln -sv "${WORKDIR}"/XNNPACK-79cd5f9e18ad0925ac9a050b00ea5a36230072db third_party/XNNPACK || die
+	rmdir third_party/kineto || die
+	ln -sv "${WORKDIR}"/kineto-dbfa0ead96612f7ca265c63a35fdf0488395179b third_party/kineto || die
+
+	if use cuda; then
+		cd third_party/nccl/nccl || die
+		eapply "${FILESDIR}"/${PN}-1.6.0-nccl-nvccflags.patch
+
+# 		addpredict /dev/nvidiactl
+		cuda_src_prepare
+		export CUDAHOSTCXX=$(cuda_gccdir)/g++
+	fi
+
+	if use rocm; then
+		#Allow escaping sandbox
+		addread /dev/kfd
+		addread /dev/dri
+		addwrite /dev/kfd
+		addwrite /dev/dri
+
+		ebegin "HIPifying cuda sources"
+		tools/amd_build/build_amd.py
+		eend $?
+
+		export PYTORCH_ROCM_ARCH=$(rocminfo | egrep -o "gfx[0-9]+" | uniq | awk -vORS=';' "{print $1}" | sed 's/;$/\n/') || die
+		sed -e "/set(roctracer_INCLUDE_DIRS/s,\${ROCTRACER_PATH}/include,${EPREFIX}/usr/include/roctracer," \
+			-i cmake/public/LoadHIP.cmake || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DTORCH_BUILD_VERSION=${PV}
+		-DTORCH_INSTALL_LIB_DIR=$(get_libdir)
+		-DBUILD_BINARY=$(usex tools ON OFF)
+		-DBUILD_CUSTOM_PROTOBUF=OFF
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_SHARED_LIBS=$(usex static OFF ON)
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DUSE_ASAN=$(usex asan ON OFF)
+		-DUSE_CUDA=$(usex cuda ON OFF)
+		-DUSE_NCCL=$(usex cuda ON OFF)
+		-DUSE_SYSTEM_NCCL=OFF
+		-DUSE_ROCM=$(usex rocm ON OFF)
+		-DUSE_FBGEMM=$(usex fbgemm ON OFF)
+		-DUSE_FFMPEG=$(usex ffmpeg ON OFF)
+		-DUSE_GFLAGS=$(usex gflags ON OFF)
+		-DUSE_GLOG=$(usex glog ON OFF)
+		-DUSE_LEVELDB=$(usex leveldb ON OFF)
+		-DUSE_LITE_PROTO=OFF
+		-DUSE_LMDB=$(usex lmdb ON OFF)
+		-DUSE_MKLDNN=$(usex mkldnn ON OFF)
+		-DUSE_MKLDNN_CBLAS=OFF
+		-DUSE_NNPACK=$(usex nnpack ON OFF)
+		-DUSE_NUMPY=$(usex python ON OFF)
+		-DUSE_NUMA=$(usex numa ON OFF)
+		-DUSE_OBSERVERS=$(usex observers ON OFF)
+		-DUSE_OPENCL=$(usex opencl ON OFF)
+		-DUSE_OPENCV=$(usex opencv ON OFF)
+		-DUSE_OPENMP=$(usex openmp ON OFF)
+		-DUSE_TBB=OFF
+		-DUSE_PROF=OFF
+		-DUSE_QNNPACK=$(usex qnnpack ON OFF)
+		-DUSE_REDIS=$(usex redis ON OFF)
+		-DUSE_ROCKSDB=OFF
+		-DUSE_ZMQ=$(usex zeromq ON OFF)
+		-DUSE_MPI=$(usex mpi ON OFF)
+		-DUSE_GLOO=$(usex gloo ON OFF)
+		-DUSE_SYSTEM_EIGEN_INSTALL=ON
+		-DBUILD_NAMEDTENSOR=$(usex namedtensor ON OFF)
+		-DBLAS=$(usex blas Generic Eigen)
+		-DTP_BUILD_LIBUV=OFF
+		-Wno-dev
+	)
+
+	cmake_src_configure
+
+	if use python; then
+		CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_configure
+	fi
+
+	# do not rerun cmake and the build process in src_install
+	sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use python; then
+		CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	local LIB=$(get_libdir)
+	if [[ ${LIB} != lib ]]; then
+		mv -fv "${ED}"/usr/lib/*.so "${ED}"/usr/${LIB}/ || die
+	fi
+
+	rm -rfv "${ED}/torch"
+	rm -rfv "${ED}/var"
+	rm -rfv "${ED}/usr/lib"
+
+	rm -fv "${ED}/usr/include/*.{h,hpp}"
+	rm -rfv "${ED}/usr/include/asmjit"
+	rm -rfv "${ED}/usr/include/c10d"
+	rm -rfv "${ED}/usr/include/fbgemm"
+	rm -rfv "${ED}/usr/include/fp16"
+	rm -rfv "${ED}/usr/include/gloo"
+	rm -rfv "${ED}/usr/include/include"
+	rm -rfv "${ED}/usr/include/var"
+
+	cp -rv "${WORKDIR}/${P}/third_party/pybind11/include/pybind11" "${ED}/usr/include/"
+
+	rm -fv "${ED}/usr/${LIB}/libtbb.so"
+	rm -rfv "${ED}/usr/${LIB}/cmake"
+
+	if use python; then
+		scanelf -r --fix "${BUILD_DIR}/caffe2/python"
+		CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_install
+
+		python_foreach_impl python_optimize
+	fi
+
+	find "${ED}/usr/${LIB}" -name "*.a" -exec rm -fv {} \;
+
+	use test && rm -rfv "${ED}/usr/test" "${ED}"/usr/bin/test_{api,jit}
+
+	# Remove the empty directories by CMake Python:
+	find "${ED}" -type d -empty -delete || die
+}

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Aisha Tammy]

commit:     99221a7072b26b57ba8ce4b3ad5e1716ede5f46a
Author:     Raouf Bencheraiet <foufou33 <AT> gmail <DOT> com>
AuthorDate: Mon Apr 12 19:23:09 2021 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Tue Apr 20 15:41:12 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=99221a70

sci-libs/pytorch: require 0 or oneof (cuda rocm)

instead of exactly oneof (cuda rocm)
Signed-off-by:  Raouf Bencheraiet <foufou33 <AT> gmail.com>
Closes: https://github.com/gentoo/sci/pull/1078
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 sci-libs/pytorch/pytorch-1.7.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/pytorch/pytorch-1.7.1-r2.ebuild b/sci-libs/pytorch/pytorch-1.7.1-r2.ebuild
index dff47d8da..99cc2e750 100644
--- a/sci-libs/pytorch/pytorch-1.7.1-r2.ebuild
+++ b/sci-libs/pytorch/pytorch-1.7.1-r2.ebuild
@@ -58,7 +58,7 @@ KEYWORDS="~amd64"
 IUSE="asan blas cuda +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkldnn mpi namedtensor +nnpack numa +observers opencl opencv +openmp +python +qnnpack redis rocm static test tools zeromq"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
-	^^ ( cuda rocm )
+	?? ( cuda rocm )
 "
 
 RDEPEND="

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Andrew Ammerlaan]

commit:     da6d80a8099422ec4561560dab4eb62f4ea3953b
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sun Jan 24 13:55:58 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Jan 24 13:55:58 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=da6d80a8

sci-libs/pytorch: correct protobuf-python dependency

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sci-libs/pytorch/pytorch-1.7.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-libs/pytorch/pytorch-1.7.1-r2.ebuild b/sci-libs/pytorch/pytorch-1.7.1-r2.ebuild
index e116b7ef7..77d314ca9 100644
--- a/sci-libs/pytorch/pytorch-1.7.1-r2.ebuild
+++ b/sci-libs/pytorch/pytorch-1.7.1-r2.ebuild
@@ -88,7 +88,7 @@ RDEPEND="
 	python? ( ${PYTHON_DEPS}
 		dev-python/pybind11[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-libs/protobuf-python:0/22
+		dev-python/protobuf-python:0/22
 	)
 	redis? ( dev-db/redis )
 	zeromq? ( net-libs/zeromq )

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Andrew Ammerlaan]

commit:     27d949f3812f0c9b53e1ed7e3226df9a9c32ef63
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Fri Jan 15 20:09:33 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Jan 15 20:09:33 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=27d949f3

sci-libs/pytorch: drop old, no supported python implementations

new repoman check is unhappy with it

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sci-libs/pytorch/metadata.xml               |   1 -
 sci-libs/pytorch/pytorch-1.4.0_p0-r2.ebuild | 258 ----------------------------
 2 files changed, 259 deletions(-)

diff --git a/sci-libs/pytorch/metadata.xml b/sci-libs/pytorch/metadata.xml
index 8bd5a6add..423c3c434 100644
--- a/sci-libs/pytorch/metadata.xml
+++ b/sci-libs/pytorch/metadata.xml
@@ -32,7 +32,6 @@
 		<flag name="opencl">Enable support for OpenCL</flag>
 		<flag name="qnnpack">Enable QNNPACK support</flag>
 		<flag name="redis">Enable support for Redis</flag>
-		<flag name="tbb">Build with Intel TBB enabled</flag>
 		<flag name="tools">Build binary tools</flag>
 		<flag name="zeromq">Enable support for ZeroMQ</flag>
 	</use>

diff --git a/sci-libs/pytorch/pytorch-1.4.0_p0-r2.ebuild b/sci-libs/pytorch/pytorch-1.4.0_p0-r2.ebuild
deleted file mode 100644
index 15ebe667d..000000000
--- a/sci-libs/pytorch/pytorch-1.4.0_p0-r2.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 cmake-utils cuda
-
-MPV=${PV/_p/a}
-
-DESCRIPTION="Tensors and Dynamic neural networks in Python with strong GPU acceleration"
-HOMEPAGE="https://pytorch.org/"
-SRC_URI="https://github.com/pytorch/${PN}/archive/v${MPV}.tar.gz -> ${P}.tar.gz
-https://github.com/facebookincubator/gloo/archive/ca528e32.tar.gz -> gloo-ca528e32.tar.gz
-https://github.com/google/benchmark/archive/505be96a.tar.gz -> benchmark-505be96a.tar.gz
-https://github.com/google/gemmlowp/archive/3fb5c176.tar.gz -> gemmlowp-3fb5c176.tar.gz
-https://github.com/google/googletest/archive/2fe3bd99.tar.gz -> googletest-2fe3bd99.tar.gz
-https://github.com/houseroad/foxi/archive/8f74bc4d.tar.gz -> foxi-8f74bc4d.tar.gz
-https://github.com/intel/ideep/archive/78eafa5d.tar.gz -> ideep-78eafa5d.tar.gz
-https://github.com/Maratyszcza/FP16/archive/febbb1c1.tar.gz -> FP16-febbb1c1.tar.gz
-https://github.com/Maratyszcza/FXdiv/archive/b742d114.tar.gz -> FXdiv-b742d114.tar.gz
-https://github.com/Maratyszcza/NNPACK/archive/c039579a.tar.gz -> NNPACK-c039579a.tar.gz
-https://github.com/Maratyszcza/PeachPy/archive/07d8fde8.tar.gz -> PeachPy-07d8fde8.tar.gz
-https://github.com/Maratyszcza/psimd/archive/90a938f3.tar.gz -> psimd-90a938f3.tar.gz
-https://github.com/Maratyszcza/pthreadpool/archive/13da0b4c.tar.gz -> pthreadpool-13da0b4c.tar.gz
-cuda? ( https://github.com/NVIDIA/nccl/archive/7c72dee6.tar.gz -> nccl-7c72dee6.tar.gz )
-https://github.com/NVlabs/cub/archive/285aeeba.tar.gz -> cub-285aeeba.tar.gz
-https://github.com/onnx/onnx/archive/2891e145.tar.gz -> onnx-2891e145.tar.gz
-https://github.com/onnx/onnx-tensorrt/archive/cb3d8066.tar.gz -> onnx-tensorrt-cb3d8066.tar.gz
-https://github.com/pytorch/cpuinfo/archive/89fe1695.tar.gz -> cpuinfo-89fe1695.tar.gz
-https://github.com/pytorch/fbgemm/archive/82d259da.tar.gz -> fbgemm-82d259da.tar.gz
-https://github.com/pytorch/QNNPACK/archive/7d2a4e99.tar.gz -> QNNPACK-7d2a4e99.tar.gz
-https://github.com/shibatch/sleef/archive/7f523de6.tar.gz -> sleef-7f523de6.tar.gz
-https://github.com/asmjit/asmjit/archive/17556b2d.tar.gz -> asmjit-17556b2d.tar.gz
-	"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="asan atlas cuda eigen +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkl mkldnn mpi namedtensor +nnpack numa +numpy +observers +openblas opencl opencv +openmp +python +qnnpack redis static tbb test tools zeromq"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	numpy? ( python )
-	^^ ( atlas eigen mkl openblas )
-"
-
-DEPEND="
-	dev-libs/protobuf
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	atlas? ( sci-libs/atlas )
-	cuda? ( dev-libs/cudnn
-		dev-cpp/eigen[cuda] )
-	ffmpeg? ( media-video/ffmpeg )
-	gflags? ( dev-cpp/gflags )
-	glog? ( dev-cpp/glog )
-	leveldb? ( dev-libs/leveldb )
-	lmdb? ( dev-db/lmdb )
-	mkl? ( sci-libs/mkl )
-	mpi? ( virtual/mpi )
-	numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
-	openblas? ( sci-libs/openblas )
-	opencl? ( dev-libs/clhpp virtual/opencl )
-	opencv? ( media-libs/opencv )
-	python? ( ${PYTHON_DEPS}
-		dev-python/pybind11[${PYTHON_USEDEP}]
-	)
-	redis? ( dev-db/redis )
-	zeromq? ( net-libs/zeromq )
-	eigen? ( dev-cpp/eigen )
-"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-DEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-cpp/tbb
-	app-arch/zstd
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/pybind11[${PYTHON_USEDEP}]
-	sys-fabric/libibverbs
-	sys-process/numactl
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.0-setup.patch
-	"${FILESDIR}"/${PN}-1.4.0-sleef.patch
-	"${FILESDIR}"/${PN}-1.4.0-skip-tests.patch
-	"${FILESDIR}"/0002-Don-t-build-libtorch-again-for-PyTorch-1.4.0.patch
-	"${FILESDIR}"/0003-Change-path-to-caffe2-build-dir-made-by-libtorch.patch
-	"${FILESDIR}"/0005-Change-library-directory-according-to-CMake-build.patch
-)
-
-src_unpack() {
-	default
-
-	mv -v ${PN}-${MPV} ${P} || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	mv -v third_party/miniz-* ../ || die
-	rm -r third_party || die
-	ln -s .. third_party || die
-	cd .. || die
-	for d in *; do
-		case ${d} in
-			${PN}* | miniz-*) continue ;;
-			PeachPy-*) mv -v ${d} python-peachpy || die ;;
-			*) mv -v ${d} ${d%-*} || die ;;
-		esac
-	done
-
-	mv -v FBGEMM fbgemm || die
-	cd fbgemm || die
-	rm -r third_party || die
-	ln -s .. third_party || die
-
-	cd ../onnx || die
-	rm -r third_party || die
-	ln -s .. third_party || die
-
-	if use cuda; then
-		cd ../nccl || die
-		eapply "${FILESDIR}"/${PN}-1.4.0-nccl-nvccflags.patch
-		ln -s . nccl || die
-
-		cuda_src_prepare
-		export CUDAHOSTCXX=$(cuda_gccdir)/g++
-	fi
-}
-
-src_configure() {
-	local blas="Eigen"
-
-	if use atlas; then
-		blas="ATLAS"
-	elif use mkl; then
-		blas="MKL"
-	elif use openblas; then
-		blas="OpenBLAS"
-	fi
-
-	local mycmakeargs=(
-		-DTORCH_BUILD_VERSION=${PV}
-		-DTORCH_INSTALL_LIB_DIR=$(get_libdir)
-		-DBUILD_BINARY=$(usex tools ON OFF)
-		-DBUILD_CUSTOM_PROTOBUF=OFF
-		-DBUILD_PYTHON=$(usex python ON OFF)
-		-DBUILD_SHARED_LIBS=$(usex static OFF ON)
-		-DBUILD_TEST=$(usex test ON OFF)
-		-DUSE_ASAN=$(usex asan ON OFF)
-		-DUSE_CUDA=$(usex cuda ON OFF)
-		-DUSE_NCCL=$(usex cuda ON OFF)
-		-DUSE_SYSTEM_NCCL=OFF
-		-DUSE_ROCM=OFF
-		-DUSE_FBGEMM=$(usex fbgemm ON OFF)
-		-DUSE_FFMPEG=$(usex ffmpeg ON OFF)
-		-DUSE_GFLAGS=$(usex gflags ON OFF)
-		-DUSE_GLOG=$(usex glog ON OFF)
-		-DUSE_LEVELDB=$(usex leveldb ON OFF)
-		-DUSE_LITE_PROTO=OFF
-		-DUSE_LMDB=$(usex lmdb ON OFF)
-		-DCAFFE2_USE_MKL=$(usex mkl ON OFF)
-		-DUSE_MKLDNN=$(usex mkldnn ON OFF)
-		-DUSE_MKLDNN_CBLAS=OFF
-		-DUSE_NNPACK=$(usex nnpack ON OFF)
-		-DUSE_NUMPY=$(usex numpy ON OFF)
-		-DUSE_NUMA=$(usex numa ON OFF)
-		-DUSE_OBSERVERS=$(usex observers ON OFF)
-		-DUSE_OPENCL=$(usex opencl ON OFF)
-		-DUSE_OPENCV=$(usex opencv ON OFF)
-		-DUSE_OPENMP=$(usex openmp ON OFF)
-		-DUSE_TBB=OFF
-		-DUSE_PROF=OFF
-		-DUSE_QNNPACK=$(usex qnnpack ON OFF)
-		-DUSE_REDIS=$(usex redis ON OFF)
-		-DUSE_ROCKSDB=OFF
-		-DUSE_ZMQ=$(usex zeromq ON OFF)
-		-DUSE_MPI=$(usex mpi ON OFF)
-		-DUSE_GLOO=$(usex gloo ON OFF)
-		-DUSE_SYSTEM_EIGEN_INSTALL=ON
-		-DBUILD_NAMEDTENSOR=$(usex namedtensor ON OFF)
-		-DBLAS=${blas}
-	)
-
-	cmake-utils_src_configure
-
-	if use python; then
-		CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_configure
-	fi
-
-	# do not rerun cmake and the build process in src_install
-	sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use python; then
-		CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local LIB=$(get_libdir)
-	if [[ ${LIB} != lib ]]; then
-		mv -fv "${ED}"/usr/lib/*.so "${ED}"/usr/${LIB}/ || die
-	fi
-
-	rm -rfv "${ED}/torch"
-	rm -rfv "${ED}/var"
-	rm -rfv "${ED}/usr/lib"
-
-	rm -fv "${ED}/usr/include/*.{h,hpp}"
-	rm -rfv "${ED}/usr/include/asmjit"
-	rm -rfv "${ED}/usr/include/c10d"
-	rm -rfv "${ED}/usr/include/fbgemm"
-	rm -rfv "${ED}/usr/include/fp16"
-	rm -rfv "${ED}/usr/include/gloo"
-	rm -rfv "${ED}/usr/include/include"
-	rm -rfv "${ED}/usr/include/var"
-
-	cp -rv "${WORKDIR}/${P}/third_party/pybind11/include/pybind11" "${ED}/usr/include/"
-
-	rm -fv "${ED}/usr/lib64/libtbb.so"
-	rm -rfv "${ED}/usr/lib64/cmake"
-
-	if use python; then
-		install_shm_manager() {
-			TORCH_BIN_DIR="${D}$(python_get_sitedir)/torch/bin"
-
-			mkdir -pv ${TORCH_BIN_DIR}
-			cp -v "${ED}/usr/bin/torch_shm_manager" "${TORCH_BIN_DIR}"
-		}
-
-		python_foreach_impl install_shm_manager
-
-		scanelf -r --fix "${BUILD_DIR}/caffe2/python"
-		CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_install
-
-		python_foreach_impl python_optimize
-	fi
-
-	find "${ED}/usr/lib64" -name "*.a" -exec rm -fv {} \;
-
-	use test && rm -rfv "${ED}/usr/test" "${ED}"/usr/bin/test_{api,jit}
-
-	# Remove the empty directories by CMake Python:
-	find "${ED}" -type d -empty -delete || die
-}

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Andrew Ammerlaan]

commit:     e40e8c4d9eda3e12971749ff33163d420ea18651
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue Jan 12 10:13:05 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue Jan 12 10:13:05 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=e40e8c4d

sci-libs/pytorch: fix double EPREFIX

also add missing RESTRICT="!test? ( test )"

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 .../pytorch/{pytorch-1.4.0_p0-r1.ebuild => pytorch-1.4.0_p0-r2.ebuild} | 3 ++-
 sci-libs/pytorch/{pytorch-1.6.0-r1.ebuild => pytorch-1.6.0-r2.ebuild}  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-libs/pytorch/pytorch-1.4.0_p0-r1.ebuild b/sci-libs/pytorch/pytorch-1.4.0_p0-r2.ebuild
similarity index 98%
rename from sci-libs/pytorch/pytorch-1.4.0_p0-r1.ebuild
rename to sci-libs/pytorch/pytorch-1.4.0_p0-r2.ebuild
index 7e837fad2..15ebe667d 100644
--- a/sci-libs/pytorch/pytorch-1.4.0_p0-r1.ebuild
+++ b/sci-libs/pytorch/pytorch-1.4.0_p0-r2.ebuild
@@ -40,6 +40,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 IUSE="asan atlas cuda eigen +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkl mkldnn mpi namedtensor +nnpack numa +numpy +observers +openblas opencl opencv +openmp +python +qnnpack redis static tbb test tools zeromq"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -234,7 +235,7 @@ src_install() {
 
 	if use python; then
 		install_shm_manager() {
-			TORCH_BIN_DIR="${ED}$(python_get_sitedir)/torch/bin"
+			TORCH_BIN_DIR="${D}$(python_get_sitedir)/torch/bin"
 
 			mkdir -pv ${TORCH_BIN_DIR}
 			cp -v "${ED}/usr/bin/torch_shm_manager" "${TORCH_BIN_DIR}"

diff --git a/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild b/sci-libs/pytorch/pytorch-1.6.0-r2.ebuild
similarity index 99%
rename from sci-libs/pytorch/pytorch-1.6.0-r1.ebuild
rename to sci-libs/pytorch/pytorch-1.6.0-r2.ebuild
index ac8790dab..c3ec2c99d 100644
--- a/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild
+++ b/sci-libs/pytorch/pytorch-1.6.0-r2.ebuild
@@ -62,6 +62,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 IUSE="asan atlas cuda eigen +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkl mkldnn mpi namedtensor +nnpack numa +numpy +observers +openblas opencl opencv +openmp +python +qnnpack redis static test tools zeromq"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -263,7 +264,7 @@ src_install() {
 
 	if use python; then
 		install_shm_manager() {
-			TORCH_BIN_DIR="${ED}$(python_get_sitedir)/torch/bin"
+			TORCH_BIN_DIR="${D}$(python_get_sitedir)/torch/bin"
 
 			mkdir -pv ${TORCH_BIN_DIR}
 			cp -v "${ED}/usr/bin/torch_shm_manager" "${TORCH_BIN_DIR}"

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Andrew Ammerlaan]

commit:     3ada98e36e771cba1c7e4eb4833421b8f4fe745d
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue Jan 12 10:07:26 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue Jan 12 10:07:40 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=3ada98e3

sci-libs/pytorch: use python_get_sitedir for install path

Bug: https://github.com/gentoo/sci/issues/1039
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sci-libs/pytorch/pytorch-1.4.0_p0-r1.ebuild | 4 ++--
 sci-libs/pytorch/pytorch-1.6.0-r1.ebuild    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-libs/pytorch/pytorch-1.4.0_p0-r1.ebuild b/sci-libs/pytorch/pytorch-1.4.0_p0-r1.ebuild
index 8c84e7a09..7e837fad2 100644
--- a/sci-libs/pytorch/pytorch-1.4.0_p0-r1.ebuild
+++ b/sci-libs/pytorch/pytorch-1.4.0_p0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -234,7 +234,7 @@ src_install() {
 
 	if use python; then
 		install_shm_manager() {
-			TORCH_BIN_DIR="${ED}/usr/lib64/${EPYTHON}/site-packages/torch/bin"
+			TORCH_BIN_DIR="${ED}$(python_get_sitedir)/torch/bin"
 
 			mkdir -pv ${TORCH_BIN_DIR}
 			cp -v "${ED}/usr/bin/torch_shm_manager" "${TORCH_BIN_DIR}"

diff --git a/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild b/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild
index 807308c4e..ac8790dab 100644
--- a/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild
+++ b/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -263,7 +263,7 @@ src_install() {
 
 	if use python; then
 		install_shm_manager() {
-			TORCH_BIN_DIR="${ED}/usr/lib64/${EPYTHON}/site-packages/torch/bin"
+			TORCH_BIN_DIR="${ED}$(python_get_sitedir)/torch/bin"
 
 			mkdir -pv ${TORCH_BIN_DIR}
 			cp -v "${ED}/usr/bin/torch_shm_manager" "${TORCH_BIN_DIR}"

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Benda XU]

commit:     f66ac0c6904b9f69ec44eb9b368c9e754b1b26e1
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 13:01:27 2020 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 13:01:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=f66ac0c6

sci-libs/pytorch: migrate from cmake-utils to cmake.

Suggested-by: kenshin33, Hendrik Klug <hendrik.klug <AT> gmail.com>

Closes: https://github.com/gentoo/sci/issues/992
Closes: https://bugs.gentoo.org/755101
Closes: https://bugs.gentoo.org/754342
Package-Manager: Portage-3.0.12, Repoman-3.0.1
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 sci-libs/pytorch/pytorch-1.6.0-r1.ebuild | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild b/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild
index 0708ef6d3..807308c4e 100644
--- a/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild
+++ b/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild
@@ -125,7 +125,8 @@ src_unpack() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
+	eapply_user
 
 	mv -v third_party/miniz-* ../ || die
 	rm -r third_party || die
@@ -216,7 +217,7 @@ src_configure() {
 		-DBLAS=${blas}
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 
 	if use python; then
 		CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_configure
@@ -227,7 +228,7 @@ src_configure() {
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if use python; then
 		CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_compile
@@ -235,7 +236,7 @@ src_compile() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	local LIB=$(get_libdir)
 	if [[ ${LIB} != lib ]]; then

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Benda XU]

commit:     051efe62ff7b5696889b5fe99a6cccb60848ac44
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  8 15:24:20 2020 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Nov  8 15:24:38 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=051efe62

sci-libs/pytorch: give cmake a fake /dev/nvidiactl.

This disables the auto detection of CUDA compute capabilities.

Reported-by: Hendrik Klug
Suggested-by: Simon Detheridge
Closes: https://bugs.gentoo.org/742617
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 sci-libs/pytorch/pytorch-1.6.0-r1.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild b/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild
index b81be39e6..0708ef6d3 100644
--- a/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild
+++ b/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit distutils-r1 cmake-utils cuda
+inherit distutils-r1 cmake cuda
 
 MPV=${PV/_p/a}
 
@@ -153,6 +153,7 @@ src_prepare() {
 		eapply "${FILESDIR}"/${PN}-1.6.0-nccl-nvccflags.patch
 		ln -s . nccl || die
 
+		addpredict /dev/nvidiactl
 		cuda_src_prepare
 		export CUDAHOSTCXX=$(cuda_gccdir)/g++
 	fi

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Aisha Tammy]

commit:     034649747860ad7293f889879441125952b26a51
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Mon Oct 26 00:35:56 2020 +0000
Commit:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Mon Oct 26 00:35:56 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=03464974

sci-libs/pytorch: drop ffmpeg virtual

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>

 .../pytorch/{pytorch-1.4.0_p0.ebuild => pytorch-1.4.0_p0-r1.ebuild}     | 2 +-
 sci-libs/pytorch/{pytorch-1.6.0.ebuild => pytorch-1.6.0-r1.ebuild}      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/pytorch/pytorch-1.4.0_p0.ebuild b/sci-libs/pytorch/pytorch-1.4.0_p0-r1.ebuild
similarity index 99%
rename from sci-libs/pytorch/pytorch-1.4.0_p0.ebuild
rename to sci-libs/pytorch/pytorch-1.4.0_p0-r1.ebuild
index 762608507..ca6a3c251 100644
--- a/sci-libs/pytorch/pytorch-1.4.0_p0.ebuild
+++ b/sci-libs/pytorch/pytorch-1.4.0_p0-r1.ebuild
@@ -53,7 +53,7 @@ DEPEND="
 	atlas? ( sci-libs/atlas )
 	cuda? ( dev-libs/cudnn
 		dev-cpp/eigen[cuda] )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? ( media-video/ffmpeg )
 	gflags? ( dev-cpp/gflags )
 	glog? ( dev-cpp/glog )
 	leveldb? ( dev-libs/leveldb )

diff --git a/sci-libs/pytorch/pytorch-1.6.0.ebuild b/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild
similarity index 99%
rename from sci-libs/pytorch/pytorch-1.6.0.ebuild
rename to sci-libs/pytorch/pytorch-1.6.0-r1.ebuild
index a6f2ee62c..b81be39e6 100644
--- a/sci-libs/pytorch/pytorch-1.6.0.ebuild
+++ b/sci-libs/pytorch/pytorch-1.6.0-r1.ebuild
@@ -75,7 +75,7 @@ RDEPEND="
 	atlas? ( sci-libs/atlas )
 	cuda? ( dev-libs/cudnn
 		dev-cpp/eigen[cuda] )
-	ffmpeg? ( virtual/ffmpeg )
+	ffmpeg? ( media-video/ffmpeg )
 	gflags? ( dev-cpp/gflags )
 	glog? ( dev-cpp/glog )
 	leveldb? ( dev-libs/leveldb )

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Benda XU]

commit:     0a5eeeba7dbe8914197d82015f5d9b8ecfa5a6cc
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 09:11:41 2020 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 09:11:55 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=0a5eeeba

sci-libs/pytorch: Fix patch filename.

Add a necessary build dependency.

Reported-By: Hendrik Klug
Suggested-By: Horea Christian
Closes: https://bugs.gentoo.org/738592
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 sci-libs/pytorch/pytorch-1.6.0.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sci-libs/pytorch/pytorch-1.6.0.ebuild b/sci-libs/pytorch/pytorch-1.6.0.ebuild
index 8c3236244..a6f2ee62c 100644
--- a/sci-libs/pytorch/pytorch-1.6.0.ebuild
+++ b/sci-libs/pytorch/pytorch-1.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 cmake-utils cuda
 
@@ -94,7 +94,9 @@ RDEPEND="
 	eigen? ( dev-cpp/eigen )
 	dev-libs/libuv
 "
-BDEPEND=""
+
+#ATen code generation
+BDEPEND="dev-python/pyyaml"
 
 DEPEND="${RDEPEND}
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
@@ -110,7 +112,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.0-setup.patch
 	"${FILESDIR}"/${PN}-1.6.0-skip-tests.patch
-	"${FILESDIR}"/${PN}-pytorch-1.6.0-global-dlopen.patch
+	"${FILESDIR}"/${PN}-1.6.0-global-dlopen.patch
 	"${FILESDIR}"/0002-Don-t-build-libtorch-again-for-PyTorch-1.4.0.patch
 	"${FILESDIR}"/0003-Change-path-to-caffe2-build-dir-made-by-libtorch.patch
 	"${FILESDIR}"/0005-Change-library-directory-according-to-CMake-build.patch

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Benda XU]

commit:     38b4bac7fdd0a751a05054c086ab021a853a6422
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 13:43:55 2020 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 13:44:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=38b4bac7

sci-libs/pytorch: add myself as a maintainer.

Package-Manager: Portage-2.3.88, Repoman-2.3.18
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 sci-libs/pytorch/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sci-libs/pytorch/metadata.xml b/sci-libs/pytorch/metadata.xml
index 78e46cc35..8bd5a6add 100644
--- a/sci-libs/pytorch/metadata.xml
+++ b/sci-libs/pytorch/metadata.xml
@@ -5,6 +5,10 @@
 		<email>4ernov@gmail.com</email>
 		<name>Alexey Chernov</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>heroxbd@gentoo.org</email>
+		<name>Benda Xu</name>
+	</maintainer>
 	<use>
 		<flag name="asan">Build with address sanitizer (ASAN)</flag>
 		<flag name="atlas">Use ATLAS as BLAS implementation</flag>

[gentoo-commits] proj/sci:master commit in: sci-libs/pytorch/

[Benda XU]

commit:     7ae9a466035dd80007f1a5f69f3af01199c087cf
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 14 02:02:26 2020 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 02:02:47 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=7ae9a466

sci-libs/pytorch: do not rerun compile during install.

This is a workaround for the convolved torch cmake build system.

Package-Manager: Portage-2.3.88, Repoman-2.3.18
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 sci-libs/pytorch/pytorch-1.4.0_p0.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sci-libs/pytorch/pytorch-1.4.0_p0.ebuild b/sci-libs/pytorch/pytorch-1.4.0_p0.ebuild
index 90c7e9a9d..e77582078 100644
--- a/sci-libs/pytorch/pytorch-1.4.0_p0.ebuild
+++ b/sci-libs/pytorch/pytorch-1.4.0_p0.ebuild
@@ -194,6 +194,9 @@ src_configure() {
 	if use python; then
 		CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_configure
 	fi
+
+	# do not rerun cmake and the build process in src_install
+	sed '/RERUN/,+1d' -i ${BUILD_DIR}/build.ninja || die
 }
 
 src_compile() {