CVS commit: pkgsrc/math/py-scikit-learn

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Nov 13 10:42:42 UTC 2023

Modified Files:
        pkgsrc/math/py-scikit-learn: Makefile distinfo
Added Files:
        pkgsrc/math/py-scikit-learn/patches:
            patch-sklearn_preprocessing___target__encoder__fast.pyx
            patch-sklearn_tree___tree.pyx

Log Message:
py-scikit-learn: fix build on NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/math/py-scikit-learn/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/math/py-scikit-learn/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/math/py-scikit-learn/patches/patch-sklearn_preprocessing___target__encoder__fast.pyx \
    pkgsrc/math/py-scikit-learn/patches/patch-sklearn_tree___tree.pyx

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-scikit-learn/Makefile
diff -u pkgsrc/math/py-scikit-learn/Makefile:1.25 pkgsrc/math/py-scikit-learn/Makefile:1.26
--- pkgsrc/math/py-scikit-learn/Makefile:1.25   Mon Nov  6 08:40:01 2023
+++ pkgsrc/math/py-scikit-learn/Makefile        Mon Nov 13 10:42:42 2023
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2023/11/06 08:40:01 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2023/11/13 10:42:42 wiz Exp $
 
 DISTNAME=      scikit-learn-1.3.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/scikit-learn/}
 
@@ -21,6 +22,7 @@ USE_LANGUAGES=        c c++ fortran
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 38
 
+BUILDLINK_API_DEPENDS.py-cython+=      ${PYPKGPREFIX}-cython>=3
 .include "../../devel/py-cython/buildlink3.mk"
 .include "../../lang/python/wheel.mk"
 BUILDLINK_API_DEPENDS.py-numpy+=       ${PYPKGPREFIX}-numpy>=1.17.3

Index: pkgsrc/math/py-scikit-learn/distinfo
diff -u pkgsrc/math/py-scikit-learn/distinfo:1.13 pkgsrc/math/py-scikit-learn/distinfo:1.14
--- pkgsrc/math/py-scikit-learn/distinfo:1.13   Wed Nov  1 18:39:36 2023
+++ pkgsrc/math/py-scikit-learn/distinfo        Mon Nov 13 10:42:42 2023
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.13 2023/11/01 18:39:36 adam Exp $
+$NetBSD: distinfo,v 1.14 2023/11/13 10:42:42 wiz Exp $
 
 BLAKE2s (scikit-learn-1.3.2.tar.gz) = 339358d6ca41af1812ecc1c3d7f7c6e79e533783b6d7c04a8fcd824f8f61a9f2
 SHA512 (scikit-learn-1.3.2.tar.gz) = fa48267c3e1784c52a72c40bb0bc6e39fcd9b7d9a80b889d0fa02153c6473a79fe4e51266d56b504bf01179d8a5af4216b29d9008a532afbe133e7eac79cd336
 Size (scikit-learn-1.3.2.tar.gz) = 7510251 bytes
+SHA1 (patch-sklearn_preprocessing___target__encoder__fast.pyx) = 72232f3a7f2d519652a2559185aab90866a3882f
+SHA1 (patch-sklearn_tree___tree.pyx) = 447d0e470bae1ab152bee1d922fa369c990adaa7

Added files:

Index: pkgsrc/math/py-scikit-learn/patches/patch-sklearn_preprocessing___target__encoder__fast.pyx
diff -u /dev/null pkgsrc/math/py-scikit-learn/patches/patch-sklearn_preprocessing___target__encoder__fast.pyx:1.1
--- /dev/null   Mon Nov 13 10:42:42 2023
+++ pkgsrc/math/py-scikit-learn/patches/patch-sklearn_preprocessing___target__encoder__fast.pyx Mon Nov 13 10:42:42 2023
@@ -0,0 +1,12 @@
+$NetBSD: patch-sklearn_preprocessing___target__encoder__fast.pyx,v 1.1 2023/11/13 10:42:42 wiz Exp $
+
+Fix build on NetBSD.
+
+--- sklearn/preprocessing/_target_encoder_fast.pyx.orig        2023-10-23 10:11:35.000000000 +0000
++++ sklearn/preprocessing/_target_encoder_fast.pyx
+@@ -1,4 +1,4 @@
+-from libc.math cimport isnan
++from libcpp.cmath cimport isnan as isnan
+ from libcpp.vector cimport vector
+ 
+ cimport numpy as cnp
Index: pkgsrc/math/py-scikit-learn/patches/patch-sklearn_tree___tree.pyx
diff -u /dev/null pkgsrc/math/py-scikit-learn/patches/patch-sklearn_tree___tree.pyx:1.1
--- /dev/null   Mon Nov 13 10:42:42 2023
+++ pkgsrc/math/py-scikit-learn/patches/patch-sklearn_tree___tree.pyx   Mon Nov 13 10:42:42 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-sklearn_tree___tree.pyx,v 1.1 2023/11/13 10:42:42 wiz Exp $
+
+Fix build on NetBSD.
+
+--- sklearn/tree/_tree.pyx.orig        2023-10-23 10:11:35.000000000 +0000
++++ sklearn/tree/_tree.pyx
+@@ -18,7 +18,7 @@ from libc.stdlib cimport free
+ from libc.string cimport memcpy
+ from libc.string cimport memset
+ from libc.stdint cimport INTPTR_MAX
+-from libc.math cimport isnan
++from libcpp.cmath cimport isnan as isnan
+ from libcpp.vector cimport vector
+ from libcpp.algorithm cimport pop_heap
+ from libcpp.algorithm cimport push_heap