updates for latest cython

ctpfrec/cy.pxi

@@ -5,21 +5,6 @@ from cython.parallel cimport prange
 from scipy.special.cython_special cimport psi, gamma, loggamma
 import time
 
-## Note: As of the end of 2018, MSVC is still stuck with OpenMP 2.0 (released 2002), which does not support
-## parallel for loops with unsigend iterators. If you are using a different compiler, this part can be safely removed
-IF UNAME_SYSNAME == "Windows":
-	obj_ind_type = ctypes.c_longlong
-	ctypedef long long ind_type
-	ctypedef double long_double_type
-	obj_long_double_type = ctypes.c_double
-	LD_HUGE_VAL = HUGE_VAL
-ELSE:
-	obj_ind_type = ctypes.c_size_t
-	ctypedef size_t ind_type
-	ctypedef long double long_double_type
-	obj_long_double_type = ctypes.c_longdouble
-	LD_HUGE_VAL = HUGE_VALL
-
 ### Main function
 #################
 def fit_ctpf(np.ndarray[real_t, ndim=2] Theta_shp, np.ndarray[real_t, ndim=2] Theta_rte,

ctpfrec/cy_double.pyx → ctpfrec/cy_double.pxi

@@ -3,13 +3,7 @@ from scipy.linalg.cython_blas cimport ddot
 from hpfrec import cython_loops_double as cython_loops
 import ctypes
 
-## TODO: use libc.math once Cython 0.30 is released
-# from libc.math cimport log, exp
-cdef extern from "<math.h>":
-	double log(double x) nogil
-	double exp(double x) nogil
-	const double HUGE_VAL
-	const long double HUGE_VALL
+from libc.math cimport log, exp, HUGE_VAL, HUGE_VALL
 
 c_real_t = ctypes.c_double
 ctypedef double real_t

ctpfrec/cy_double_nonwindows.pyx

@@ -0,0 +1,10 @@
+import ctypes
+from libc.math cimport HUGE_VALL
+
+obj_ind_type = ctypes.c_size_t
+ctypedef size_t ind_type
+ctypedef long double long_double_type
+obj_long_double_type = ctypes.c_longdouble
+LD_HUGE_VAL = HUGE_VALL
+
+include "cy_float.pxi"

ctpfrec/cy_double_windows.pyx

@@ -0,0 +1,10 @@
+import ctypes
+from libc.math cimport HUGE_VAL
+
+obj_ind_type = ctypes.c_longlong
+ctypedef long long ind_type
+ctypedef double long_double_type
+obj_long_double_type = ctypes.c_double
+LD_HUGE_VAL = HUGE_VAL
+
+include "cy_double.pxi"

ctpfrec/cy_float.pyx → ctpfrec/cy_float.pxi

@@ -6,16 +6,7 @@ from scipy.special.cython_special cimport psi, gamma
 from hpfrec import cython_loops_float as cython_loops
 import ctypes
 
-## TODO: use libc.math once Cython 0.30 is released
-# from libc.math cimport log, exp
-cdef extern from "<math.h>":
-	double log(double x) nogil
-	float logf(float) nogil
-	double exp(double x) nogil
-	float expf(float) nogil
-	const float HUGE_VALF
-	const double HUGE_VAL
-	const long double HUGE_VALL
+from libc.math cimport log, exp, logf, expf, HUGE_VALF, HUGE_VAL, HUGE_VALL
 
 c_real_t = ctypes.c_float
 ctypedef float real_t

ctpfrec/cy_float_nonwindows.pyx

@@ -0,0 +1,10 @@
+import ctypes
+from libc.math cimport HUGE_VALL
+
+obj_ind_type = ctypes.c_size_t
+ctypedef size_t ind_type
+ctypedef long double long_double_type
+obj_long_double_type = ctypes.c_longdouble
+LD_HUGE_VAL = HUGE_VALL
+
+include "cy_double.pxi"

ctpfrec/cy_float_windows.pyx

@@ -0,0 +1,10 @@
+import ctypes
+from libc.math cimport HUGE_VAL
+
+obj_ind_type = ctypes.c_longlong
+ctypedef long long ind_type
+ctypedef double long_double_type
+obj_long_double_type = ctypes.c_double
+LD_HUGE_VAL = HUGE_VAL
+
+include "cy_float.pxi"

docs/requirements.txt

@@ -1,6 +1,6 @@
-numpy
+numpy>=1.25
 scipy>=1.11.1
-cython
-hpfrec>=0.2.6
-sphinx-rtd-theme
-Sphinx
+cython>=3.0.0
+hpfrec>=0.2.9
+sphinx-rtd-theme>=1.0.0
+Sphinx>=4.2.0

pyproject.toml

@@ -1,2 +1,2 @@
 [build-system]
-requires = ["cython", "setuptools", "wheel", "oldest-supported-numpy", "scipy"]
+requires = ["cython>=3.0.0", "setuptools", "wheel", "numpy>=1.25", "scipy>=1.11.1"]

requirements.txt

@@ -1,5 +1,5 @@
 pandas
-numpy>=1.18
+numpy>=1.25
 scipy>=1.11.1
-cython
+cython>=3.0.0
 hpfrec>=0.2.3

setup.py

@@ -7,6 +7,9 @@
 from Cython.Distutils import build_ext
 import numpy
 import sys, os, subprocess, warnings, re
+import platform
+
+IS_WINDOWS = platform.system() == "Windows"
 
 found_omp = True
 def set_omp_false():
@@ -205,36 +208,37 @@ def test_supports_compile_arg(self, comm, with_omp=False):
 setup(
     name = 'ctpfrec',
     packages = ['ctpfrec'],
-    install_requires=[
-     'pandas>=0.24',
-     'numpy>=1.17',
-     'scipy',
-     'cython',
-     'hpfrec>=0.2.6'
-],
-    version = '0.1.16',
+    version = '0.1.17',
     description = 'Collaborative topic Poisson factorization for recommender systems',
     author = 'David Cortes',
     url = 'https://github.com/david-cortes/ctpfrec',
     keywords = ['collaborative', 'topic', 'modeling', 'poisson', 'probabilistic', 'non-negative', 'factorization',
                             'variational inference', 'collaborative filtering', 'cold-start'],
-    classifiers = [],
-
     cmdclass = {'build_ext': build_ext_subclass},
     ext_modules = [
         Extension(
             "ctpfrec.cy_double",
-            sources=["ctpfrec/cy_double.pyx"],
+            sources=[
+                "ctpfrec/cy_double_nonwindows.pyx"
+                if not IS_WINDOWS
+                else
+                "ctpfrec/cy_double_windows.pyx"
+            ],
             include_dirs=[numpy.get_include()]
         ),
         Extension(
             "ctpfrec.cy_float",
-            sources=["ctpfrec/cy_float.pyx"],
+            sources=[
+                "ctpfrec/cy_float_nonwindows.pyx"
+                if not IS_WINDOWS
+                else
+                "ctpfrec/cy_float_windows.pyx"
+            ],
             include_dirs=[numpy.get_include()]
         ),
         Extension(
             "ctpfrec._check_openmp",
-            sources=["ctpfrec/return1.pyx"],
+            sources=["ctpfrec/return1.pyx" if found_omp else "ctpfrec/return0.pyx"],
             include_dirs=[numpy.get_include()]
         )
     ]