From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EC34B158041 for ; Mon, 18 Mar 2024 15:26:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 105FCE29B1; Mon, 18 Mar 2024 15:26:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DFF5CE29B1 for ; Mon, 18 Mar 2024 15:26:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C220933BEEE for ; Mon, 18 Mar 2024 15:26:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3739A14EE for ; Mon, 18 Mar 2024 15:26:42 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1710775585.7e7330cc8c499ec3ca1083e4cceb4748fef19986.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/ceres-solver/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild sci-libs/ceres-solver/ceres-solver-2.2.0.ebuild X-VCS-Directories: sci-libs/ceres-solver/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 7e7330cc8c499ec3ca1083e4cceb4748fef19986 X-VCS-Branch: master Date: Mon, 18 Mar 2024 15:26:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 808db700-bde4-4689-9246-df5f632fe140 X-Archives-Hash: e372c4c60fa4fe4f523d9e93e3dcf928 commit: 7e7330cc8c499ec3ca1083e4cceb4748fef19986 Author: Paul Zander gmail com> AuthorDate: Sat Mar 16 15:00:53 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Mon Mar 18 15:26:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e7330cc sci-libs/ceres-solver: 2.2.0 fix automagic cuda dependency Signed-off-by: Paul Zander gmail.com> Closes: https://github.com/gentoo/gentoo/pull/35779 Signed-off-by: Andrew Ammerlaan gentoo.org> ...r-2.2.0.ebuild => ceres-solver-2.2.0-r1.ebuild} | 26 +++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/sci-libs/ceres-solver/ceres-solver-2.2.0.ebuild b/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild similarity index 77% rename from sci-libs/ceres-solver/ceres-solver-2.2.0.ebuild rename to sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild index 6abc595b8231..747e151d1e59 100644 --- a/sci-libs/ceres-solver/ceres-solver-2.2.0.ebuild +++ b/sci-libs/ceres-solver/ceres-solver-2.2.0-r1.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{10..12} ) DOCS_BUILDER="sphinx" DOCS_DEPEND="dev-python/sphinx-rtd-theme" DOCS_DIR="docs/source" -inherit cmake-multilib flag-o-matic python-any-r1 docs +inherit cmake-multilib cuda flag-o-matic python-any-r1 docs DESCRIPTION="Nonlinear least-squares minimizer" HOMEPAGE="http://ceres-solver.org/" @@ -16,7 +16,7 @@ SRC_URI="http://ceres-solver.org/${P}.tar.gz" LICENSE="sparse? ( BSD ) !sparse? ( LGPL-2.1 )" SLOT="0/1" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="examples gflags lapack +schur sparse test" +IUSE="examples cuda gflags lapack +schur sparse test" REQUIRED_USE="test? ( gflags ) sparse? ( lapack ) abi_x86_32? ( !sparse !lapack )" RESTRICT="!test? ( test )" @@ -28,6 +28,7 @@ BDEPEND="${PYTHON_DEPS} " RDEPEND=" dev-cpp/glog[gflags?,${MULTILIB_USEDEP}] + cuda? ( dev-util/nvidia-cuda-toolkit:= ) lapack? ( virtual/lapack ) sparse? ( sci-libs/amd @@ -61,7 +62,7 @@ src_prepare() { } src_configure() { - # CUSTOM_BLAS=OFF EIGENSPARSE=OFF MINIGLOG=OFF CXX11=OFF + # CUSTOM_BLAS=OFF EIGENSPARSE=OFF MINIGLOG=OFF local mycmakeargs=( -DBUILD_BENCHMARKS=OFF -DBUILD_EXAMPLES=$(usex examples) @@ -72,13 +73,32 @@ src_configure() { -DSCHUR_SPECIALIZATIONS=$(usex schur) -DSUITESPARSE=$(usex sparse) -DEigen3_DIR=/usr/$(get_libdir)/cmake/eigen3 + + -DBUILD_SHARED_LIBS="yes" + -DEIGENMETIS="yes" + -DEIGENSPARSE="yes" + -DMINIGLOG="no" + -DCUSTOM_BLAS="yes" + -DUSE_CUDA="$(usex cuda)" ) + if use cuda; then + : "${CUDAHOSTCXX:=$(cuda_gccdir)}" + : "${CUDAARCHS:=all}" + export CUDAHOSTCXX + export CUDAARCHS + fi + use sparse || mycmakeargs+=( -DEIGENSPARSE=ON ) cmake-multilib_src_configure } +src_test() { + use cuda && cuda_add_sandbox -w + cmake_src_test +} + src_install() { cmake-multilib_src_install