CVS commit: pkgsrc/math/py-scipy

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue May  3 15:14:54 UTC 2022

Modified Files:
        pkgsrc/math/py-scipy: Makefile distinfo
Added Files:
        pkgsrc/math/py-scipy/patches: patch-scipy_special___logit.h

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


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/math/py-scipy/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/math/py-scipy/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/math/py-scipy/patches/patch-scipy_special___logit.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/py-scipy/Makefile
diff -u pkgsrc/math/py-scipy/Makefile:1.55 pkgsrc/math/py-scipy/Makefile:1.56
--- pkgsrc/math/py-scipy/Makefile:1.55  Sat Apr  9 12:15:31 2022
+++ pkgsrc/math/py-scipy/Makefile       Tue May  3 15:14:54 2022
@@ -1,6 +1,7 @@
-# $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/}

Index: pkgsrc/math/py-scipy/distinfo
diff -u pkgsrc/math/py-scipy/distinfo:1.31 pkgsrc/math/py-scipy/distinfo:1.32
--- pkgsrc/math/py-scipy/distinfo:1.31  Tue Apr 12 20:31:43 2022
+++ pkgsrc/math/py-scipy/distinfo       Tue May  3 15:14:54 2022
@@ -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

Added files:

Index: pkgsrc/math/py-scipy/patches/patch-scipy_special___logit.h
diff -u /dev/null pkgsrc/math/py-scipy/patches/patch-scipy_special___logit.h:1.1
--- /dev/null   Tue May  3 15:14:54 2022
+++ pkgsrc/math/py-scipy/patches/patch-scipy_special___logit.h  Tue May  3 15:14:54 2022
@@ -0,0 +1,51 @@
+$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);};