From nobody Tue Oct 17 17:52:56 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S91m90dvfz4xp23; Tue, 17 Oct 2023 17:52:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S91m86mxgz4c9x; Tue, 17 Oct 2023 17:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697565177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LeVpmEGkStiszAi6+ub7IeJsCIgswaGeVKaBi1snIO4=; b=buodLNVnpIfjOPUc9DlT80B3jaEAaHMHzO0987Ee6FJCdPBt+OYE3wbS+JHxQeZAbD8sN5 0UEOVh3xODzo0/YkTnXfUZhqta+U9qcZLVGguucrZyz5aIpoh6GkObZ9KyEtGZ49R/VpZC o5xY1i0GG296Mz4LGzp55E7ODXbzB3/Vq+ZGRtpIzmYyaTwkCG+hePHseuxgKzYBBQTGgo J25QEX5GmxGg3m3HI6Fr8ZJ/b5jSsUxS5lpPJFpH+i4bYM/KL3pKGsWE6fGjGkn8NVZlmH DGsaQYkmVw0ZXgNhvTLQ777RfUoyCxj3zVbB5UZOz9EcylxFcnhuGW7AEY3zhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697565176; a=rsa-sha256; cv=none; b=YhIBlFB+4ikY2JN4EDAFHObQnzW5XVz+t6Mu5uxiDHOdnhPmC4BkhFohRqpckVuC5n3ldv SVgEtL1VuXsPnEeEiywmq/3G1s4jwaB6KTDHgzLxmhz+fFW3++Q0KlrfIeGpKL7FWbO+r5 SiO4KDdnzUVpjxqDpjvOWPAm1JMFSpErVJ4+GyatMwOtB5nqVhHuVVAmrEKYtirIqqGnrQ Gpu71CjQ4y5mgblN721+wR9w+6+fYlewt/t5Aky4eGgXPOjQKwcmGSMK6uJAvOQzglqcp6 KMHaoQLYIR8BKoCmeQLwh7/W8dO6BxXwkugmFXeytjZDnLCuchssz0oLItj/1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697565176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LeVpmEGkStiszAi6+ub7IeJsCIgswaGeVKaBi1snIO4=; b=Q+UbsyqMUQ9DxAAzEs+YX4+iHNXpekLjY8JKPiPHPPDCQwdEiYJyC3QHCnG93ZBna58tSI IHEkGB7J4JsoQoyvXQi9l5z9XcAx9u7lu5MHJ1FDp25hqdcmh5B/Sc+peDytw3BYW07H5e sqXJfkXRwDGRg26IWMQ5DEPzxlWkpGyHz90qeQzjgm8nss+v51uLe2zCmJDsU/riKSy83u cGTffwrdsYRSnQ3h/Kd55AHUWKX/1MZG+FaATpak7SmkcDZR9xCwlmSHTEqKBrf340/t5j wYlOwX2VSodRviTrv/bAUCCJ0HQYZDAT8ITIOGDgsp4DwEsuSt6g24kFrEZ7bA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S91m85r7QzZFv; Tue, 17 Oct 2023 17:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HHquZr028996; Tue, 17 Oct 2023 17:52:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HHquIa028993; Tue, 17 Oct 2023 17:52:56 GMT (envelope-from git) Date: Tue, 17 Oct 2023 17:52:56 GMT Message-Id: <202310171752.39HHquIa028993@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 368835dffef9 - main - math/py-scikit-umfpack: fix with math/suitesparse-umfpack >= 6 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 368835dffef91f7b67e482eb39a463f9a55def33 Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=368835dffef91f7b67e482eb39a463f9a55def33 commit 368835dffef91f7b67e482eb39a463f9a55def33 Author: Thierry Thomas AuthorDate: 2023-10-16 17:27:01 +0000 Commit: Thierry Thomas CommitDate: 2023-10-17 17:52:54 +0000 math/py-scikit-umfpack: fix with math/suitesparse-umfpack >= 6 Patch from . Also add dependencies on gfortran and cblas. PR: 274518 Approved by: yuri (maintainer) --- math/py-scikit-umfpack/Makefile | 7 +- .../files/patch-scikits_umfpack_umfpack.i | 97 ++++++++++++++++++++++ 2 files changed, 100 insertions(+), 4 deletions(-) diff --git a/math/py-scikit-umfpack/Makefile b/math/py-scikit-umfpack/Makefile index ee9e48d76bc5..d89e731dbdb7 100644 --- a/math/py-scikit-umfpack/Makefile +++ b/math/py-scikit-umfpack/Makefile @@ -1,6 +1,6 @@ PORTNAME= scikit-umfpack DISTVERSION= 0.3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,18 +12,17 @@ WWW= https://scikit-umfpack.github.io/scikit-umfpack/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN= does not build with SuiteSparse 6 # https://github.com/scikit-umfpack/scikit-umfpack/issues/78 - BUILD_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ swig:devel/swig LIB_DEPENDS= libamd.so:math/suitesparse-amd \ + libcblas.so:math/cblas \ libopenblas.so:math/openblas \ libumfpack.so:math/suitesparse-umfpack RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} -USES= python +USES= fortran python USE_PYTHON= distutils cython autoplist pytest # tests fail, see https://github.com/scikit-umfpack/scikit-umfpack/issues/77 TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} diff --git a/math/py-scikit-umfpack/files/patch-scikits_umfpack_umfpack.i b/math/py-scikit-umfpack/files/patch-scikits_umfpack_umfpack.i new file mode 100644 index 000000000000..40fc3b86b101 --- /dev/null +++ b/math/py-scikit-umfpack/files/patch-scikits_umfpack_umfpack.i @@ -0,0 +1,97 @@ +--- scikits/umfpack/umfpack.i.orig 2017-10-25 11:44:24 UTC ++++ scikits/umfpack/umfpack.i +@@ -6,6 +6,8 @@ + /* + See umfpack.py for more information. + ++ Patched from ++ + Created by: Robert Cimrman + */ + +@@ -218,18 +220,21 @@ CONF_IN( UMFPACK_INFO ) + }; + + %include +-%include +-%include +-%include +-%include +-%include +-%include + +-%include +-%include +-%include +-%include ++#if UMFPACK_MAIN_VERSION < 6 ++ %include ++ %include ++ %include ++ %include ++ %include ++ %include + ++ %include ++ %include ++ %include ++ %include ++#endif ++ + /* + The order is important below! + */ +@@ -240,21 +245,22 @@ OPAQUE_ARGOUT( void * ) + void **Numeric + } + +-%include +-%include ++#if UMFPACK_MAIN_VERSION < 6 ++ %include ++ %include ++#endif + +- + OPAQUE_ARGINOUT( void * ) + %apply void ** opaque_arginout { + void **Symbolic, + void **Numeric + } + +-%include +-%include ++#if UMFPACK_MAIN_VERSION < 6 ++ %include ++ %include ++#endif + +- +- + /* + * wnbell - attempt to get L,U,P,Q out + */ +@@ -280,8 +286,11 @@ OPAQUE_ARGINOUT( void * ) + SuiteSparse_long *n_col, + SuiteSparse_long *nz_udiag + }; +-%include + ++#if UMFPACK_MAIN_VERSION < 6 ++ %include ++#endif ++ + ARRAY_IN( double, double, DOUBLE ) + %apply double *array { + double Lx [ ], +@@ -326,6 +335,8 @@ ARRAY_IN( SuiteSparse_long, SuiteSparse_long, INT64 ) + }; + %apply long *OUTPUT { SuiteSparse_long *do_recip}; + +-%include +- ++#if UMFPACK_MAIN_VERSION < 6 ++ %include + #endif ++ ++#endif // SWIGPYTHON