Tue May 3 15:14:54 2022 UTC ()

py-scipy: work around undefined PLT symbol "log1pl" on NetBSD. Bump.


(tnn)

diff -r1.55 -r1.56 pkgsrc/math/py-scipy/Makefile
diff -r1.31 -r1.32 pkgsrc/math/py-scipy/distinfo
diff -r0 -r1.1 pkgsrc/math/py-scipy/patches/patch-scipy_special___logit.h

--- pkgsrc/math/py-scipy/Makefile 2022/04/09 12:15:31 1.55
+++ pkgsrc/math/py-scipy/Makefile 2022/05/03 15:14:54 1.56

 @@ -1,16 +1,17 @@
-# $NetBSD: Makefile,v 1.55 2022/04/09 12:15:31 adam Exp $
+# $NetBSD: Makefile,v 1.56 2022/05/03 15:14:54 tnn Exp $
 DISTNAME=	scipy-1.8.0
 PKGREVISION=	1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/scipy/}
 MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	https://www.scipy.org/
 COMMENT=	Scientific Algorithms Library for Python
 LICENSE=	modified-bsd
 DEPENDS+=	${PYPKGPREFIX}-pybind11-[0-9]*:../../devel/py-pybind11
 DEPENDS+=	${PYPKGPREFIX}-pythran>=0.9.11:../../math/py-pythran
 TEST_DEPENDS+=	${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test

--- pkgsrc/math/py-scipy/distinfo 2022/04/12 20:31:43 1.31
+++ pkgsrc/math/py-scipy/distinfo 2022/05/03 15:14:54 1.32

 @@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.31 2022/04/12 20:31:43 tnn Exp $
+$NetBSD: distinfo,v 1.32 2022/05/03 15:14:54 tnn Exp $
 BLAKE2s (scipy-1.8.0.tar.gz) = 45a8dad311d6c459a748f31a7df37ce49ee611c8d4c258649288fd624e5a3a05
 SHA512 (scipy-1.8.0.tar.gz) = 674652728ae76479d17189e6974895bb838a8e83b17b9fb91c5f86faebf2a1387e1466555ac5b51d05c293f9b31b9a72e634f5858105ea984ca94bd2f05bbb4c
 Size (scipy-1.8.0.tar.gz) = 38313602 bytes
 SHA1 (patch-scipy_special___logit.h) = fdec9873512693b36f9763d15e81a60f6ac93630
 SHA1 (patch-scipy_special___round.h) = bc05a935e6423ce8395450ad3b30e88826939422
 SHA1 (patch-scipy_stats___hypotests__pythran.cpp) = e5d70b810ca020ccd25b9ad7068ce44487d8da60

$NetBSD: patch-scipy_special___logit.h,v 1.1 2022/05/03 15:14:54 tnn Exp $

py-scipy: work around undefined PLT symbol "log1pl" on NetBSD

--- scipy/special/_logit.h.orig	2022-01-29 22:59:08.475390400 +0000
+++ scipy/special/_logit.h
@@ -31,15 +31,41 @@ inline T _expit(T x) {
 // obtain accurate results (compared to the naive implementation
 // log(expit(x))).
 //
-template <typename T>
-inline T _log_expit(T x) {
+inline npy_float _log_expit(npy_float x) {
     if (x < 0.0) {
         return x - std::log1p(std::exp(x));
     }
     else {
         return -std::log1p(std::exp(-x));
     }
-};
+}
+inline npy_double _log_expit(npy_double x) {
+    if (x < 0.0) {
+        return x - std::log1p(std::exp(x));
+    }
+    else {
+        return -std::log1p(std::exp(-x));
+    }
+}
+#if defined(__NetBSD__)
+inline npy_longdouble _log_expit(npy_longdouble x) {
+    if (x < 0.0) {
+        return x - std::log(1.0l + std::exp(x));
+    }
+    else {
+        return -std::log(1.0l + std::exp(-x));
+    }
+}
+#else
+inline npy_longdouble _log_expit(npy_longdouble x) {
+    if (x < 0.0) {
+        return x - std::log1p(std::exp(x));
+    }
+    else {
+        return -std::log1p(std::exp(-x));
+    }
+}
+#endif
 
 
 npy_float logitf(npy_float x)  {return _logit(x);};