scm2cpp-lasso 0.13.1__tar.gz → 0.13.2__tar.gz

{scm2cpp_lasso-0.13.1 → scm2cpp_lasso-0.13.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scm2cpp-lasso
-Version: 0.13.1
+Version: 0.13.2
 Summary: scikit-learn estimators (lasso, elastic net, ridge, ARD, SVM, SVR, logistic regression, GLMs, Huber, Theil-Sen, F-score selection, RFE, NMF, Gaussian mixture, FastICA, PCA, graphical lasso, RANSAC, SGD, OMP, LARS) translated from Scheme to C++ by scm2cpp; GPU batch solver and CUDA kernels included
 Author: Hirotaka Niitsuma
 License: MIT
@@ -18,6 +18,8 @@ Requires-Dist: numpy>=1.17
 
 # scm2cpp-lasso
 
+[![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/niitsuma/scm2cpp/blob/master/notebooks/compare-sklearn.ipynb)
+
 *[Japanese (README.ja.md)](README.ja.md)*
 
 Lasso by coordinate descent over a Gram matrix, with an optional GPU
@@ -28,8 +30,9 @@ path.  The solver is Scheme, translated to C++ by
 $ pip install scm2cpp-lasso
 ```
 
-On Linux x86_64 and macOS arm64 (macOS 14 or later) this installs a wheel: compiled, with
-OpenBLAS inside, nothing to build.  Elsewhere pip builds the sdist,
+On Linux x86_64, macOS arm64 (macOS 14 or later) and Windows AMD64
+this installs a wheel: compiled, nothing to build (with OpenBLAS
+inside on Linux and macOS; Windows has the loop variants).  Elsewhere pip builds the sdist,
 which needs a C++17 compiler and nothing else.  The wheels carry no
 GPU code (a wheel cannot know the device); for the GPU builds, install
 from the sdist on a machine with `nvcc` on the path:

{scm2cpp_lasso-0.13.1 → scm2cpp_lasso-0.13.2}/README.md

@@ -1,5 +1,7 @@
 # scm2cpp-lasso
 
+[![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/niitsuma/scm2cpp/blob/master/notebooks/compare-sklearn.ipynb)
+
 *[Japanese (README.ja.md)](README.ja.md)*
 
 Lasso by coordinate descent over a Gram matrix, with an optional GPU
@@ -10,8 +12,9 @@ path.  The solver is Scheme, translated to C++ by
 $ pip install scm2cpp-lasso
 ```
 
-On Linux x86_64 and macOS arm64 (macOS 14 or later) this installs a wheel: compiled, with
-OpenBLAS inside, nothing to build.  Elsewhere pip builds the sdist,
+On Linux x86_64, macOS arm64 (macOS 14 or later) and Windows AMD64
+this installs a wheel: compiled, nothing to build (with OpenBLAS
+inside on Linux and macOS; Windows has the loop variants).  Elsewhere pip builds the sdist,
 which needs a C++17 compiler and nothing else.  The wheels carry no
 GPU code (a wheel cannot know the device); for the GPU builds, install
 from the sdist on a machine with `nvcc` on the path:

{scm2cpp_lasso-0.13.1 → scm2cpp_lasso-0.13.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "scm2cpp-lasso"
-version = "0.13.1"
+version = "0.13.2"
 description = "scikit-learn estimators (lasso, elastic net, ridge, ARD, SVM, SVR, logistic regression, GLMs, Huber, Theil-Sen, F-score selection, RFE, NMF, Gaussian mixture, FastICA, PCA, graphical lasso, RANSAC, SGD, OMP, LARS) translated from Scheme to C++ by scm2cpp; GPU batch solver and CUDA kernels included"
 readme = "README.md"
 requires-python = ">=3.8"

{scm2cpp_lasso-0.13.1 → scm2cpp_lasso-0.13.2}/setup.py

@@ -12,6 +12,7 @@ device, or a failed nvcc all leave a working CPU package behind, and
 the batch path notices at import and falls back.
 """
 import os
+import re
 import shutil
 import subprocess
 import sys
@@ -28,7 +29,9 @@ GEN_REL = PKG_REL + "/_generated"
 PKG = HERE / "src" / "scm2cpp_lasso"
 GEN = PKG / "_generated"
 
-CXXFLAGS = ["-O2", "-std=c++17"] if os.name != "nt" else ["/O2", "/std:c++17"]
+# MSVC: /EHsc for C++ exceptions, /bigobj for the large generated files
+MSVC = ["/O2", "/std:c++17", "/EHsc", "/bigobj"]
+CXXFLAGS = ["-O2", "-std=c++17"] if os.name != "nt" else MSVC
 
 kernel = Extension(
     "scm2cpp_lasso._lasso_cov",
@@ -92,12 +95,24 @@ else:
         "scm2cpp_lasso._lasso_derived_loops",
         sources=[GEN_REL + "/derived_loops/lasso_design_capi.cpp"],
         include_dirs=[GEN_REL + "/derived_loops", GEN_REL],
-        extra_compile_args=(["-O3", "-std=c++17"] if os.name != "nt"
-                            else ["/O2", "/std:c++17"]),
+        extra_compile_args=(["-O3", "-std=c++17"] if os.name != "nt" else MSVC),
     )
 
 
 class BuildWithCuda(build_ext):
+    def get_export_symbols(self, ext):
+        # The extensions are plain shared libraries the package loads
+        # through ctypes, not Python modules: no PyInit_ entry point,
+        # and on Windows a DLL shows ctypes only what it exports, so the
+        # exports are the extern "C" wrappers of the -M C API.  (Unix
+        # linkers export everything and ignore this list.)
+        names = []
+        for src in ext.sources:
+            if src.endswith("_capi.cpp"):
+                text = (HERE / src).read_text()
+                names += re.findall(r'extern "C"[^(\n]*?\b(scm2cpp_\w+)\(', text)
+        return names
+
     def build_extensions(self):
         # the kernel is C++ compiled through the usual machinery, so
         # wheels and cross-compilation behave as they always do
@@ -165,7 +180,7 @@ def cuda_home():
 # flags carry: with signed overflow defined the compiler cannot treat
 # the flat index i*p + j as an induction variable, and the linear SVM's
 # sweep runs 25% slower.
-_cls_flags = ["-O3", "-std=c++17", "-fstrict-overflow"] if os.name != "nt" else ["/O2", "/std:c++17"]
+_cls_flags = ["-O3", "-std=c++17", "-fstrict-overflow"] if os.name != "nt" else MSVC
 classifiers = Extension(
     "scm2cpp_lasso._classifiers",
     sources=[GEN_REL + "/classifiers_capi.cpp"],

{scm2cpp_lasso-0.13.1 → scm2cpp_lasso-0.13.2}/src/scm2cpp_lasso/__init__.py

@@ -51,7 +51,7 @@ __all__ = ["CovLasso", "CovRidge", "CovBayesianRidge", "CovLogistic", "CovGroupL
            "SelectPercentile", "GramRFE",
            "CovMultiTaskLasso", "CovMultiTaskLassoCV", "DerivedLasso",
            "cuda_available", "derived_backend", "kernel"]
-__version__ = "0.13.1"
+__version__ = "0.13.2"
 
 _BATCH = load_batch_lib()
 _DP = ctypes.POINTER(ctypes.c_double)

{scm2cpp_lasso-0.13.1 → scm2cpp_lasso-0.13.2}/src/scm2cpp_lasso.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scm2cpp-lasso
-Version: 0.13.1
+Version: 0.13.2
 Summary: scikit-learn estimators (lasso, elastic net, ridge, ARD, SVM, SVR, logistic regression, GLMs, Huber, Theil-Sen, F-score selection, RFE, NMF, Gaussian mixture, FastICA, PCA, graphical lasso, RANSAC, SGD, OMP, LARS) translated from Scheme to C++ by scm2cpp; GPU batch solver and CUDA kernels included
 Author: Hirotaka Niitsuma
 License: MIT
@@ -18,6 +18,8 @@ Requires-Dist: numpy>=1.17
 
 # scm2cpp-lasso
 
+[![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/niitsuma/scm2cpp/blob/master/notebooks/compare-sklearn.ipynb)
+
 *[Japanese (README.ja.md)](README.ja.md)*
 
 Lasso by coordinate descent over a Gram matrix, with an optional GPU
@@ -28,8 +30,9 @@ path.  The solver is Scheme, translated to C++ by
 $ pip install scm2cpp-lasso
 ```
 
-On Linux x86_64 and macOS arm64 (macOS 14 or later) this installs a wheel: compiled, with
-OpenBLAS inside, nothing to build.  Elsewhere pip builds the sdist,
+On Linux x86_64, macOS arm64 (macOS 14 or later) and Windows AMD64
+this installs a wheel: compiled, nothing to build (with OpenBLAS
+inside on Linux and macOS; Windows has the loop variants).  Elsewhere pip builds the sdist,
 which needs a C++17 compiler and nothing else.  The wheels carry no
 GPU code (a wheel cannot know the device); for the GPU builds, install
 from the sdist on a machine with `nvcc` on the path: