multivariate-probit 0.3.1__tar.gz → 0.3.2__tar.gz

{multivariate_probit-0.3.1 → multivariate_probit-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: multivariate-probit
-Version: 0.3.1
+Version: 0.3.2
 Summary: Joint probabilities for correlated binary outcomes: P(any), P(all), patterns and conditionals that agree. Any classifier per outcome; scikit-learn-style API.
 Project-URL: Homepage, https://quantecarlo.com/multivariate-probit
 Project-URL: Source, https://github.com/sign-of-fourier/multivariate-probit

{multivariate_probit-0.3.1 → multivariate_probit-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "multivariate-probit"
-version = "0.3.1"
+version = "0.3.2"
 description = "Joint probabilities for correlated binary outcomes: P(any), P(all), patterns and conditionals that agree. Any classifier per outcome; scikit-learn-style API."
 readme = "README.md"
 license = { file = "LICENSE" }

{multivariate_probit-0.3.1 → multivariate_probit-0.3.2}/src/multivariate_probit/__init__.py

@@ -34,7 +34,7 @@ from .linear import ProbitRegressor
 from .model import MultivariateProbit
 from .results import MultivariateProbitProba
 
-__version__ = "0.3.1"
+__version__ = "0.3.2"
 
 __all__ = [
     "MultivariateProbit",

{multivariate_probit-0.3.1 → multivariate_probit-0.3.2}/src/multivariate_probit/orthant/__init__.py

@@ -60,8 +60,12 @@ def _import_extension(data, modname):
         fd = os.memfd_create(modname)
         try:
             os.write(fd, data)
+            path = "/proc/self/fd/%d" % fd
+            # The path has no .so suffix, so the loader must be given
+            # explicitly; inferred from the path, the spec would be None.
             spec = importlib.util.spec_from_file_location(
-                qualified, "/proc/self/fd/%d" % fd)
+                qualified, path,
+                loader=importlib.machinery.ExtensionFileLoader(qualified, path))
             mod = importlib.util.module_from_spec(spec)
             spec.loader.exec_module(mod)
             return mod
@@ -177,12 +181,10 @@ def _bind():
     key = _read_key()
     if key is not None:
         try:
-            mod = _import_extension(_decrypt_paid(key, tag), "_ocore")
+            data = _decrypt_paid(key, tag)
         except ImportError as e:
-            # Not a key problem: a missing dependency or a binary that won't
-            # load on this platform.  Say so rather than blaming the key.
             notice = ("orthant: key found but the paid binary could not be "
-                      "loaded (%s) -- running in FREE mode (n<=3, "
+                      "decrypted (%s) -- running in FREE mode (n<=3, "
                       "resolution='low').\n" % e)
             if (e.name or "").startswith("cryptography"):
                 notice += "         pip install cryptography\n"
@@ -191,8 +193,15 @@ def _bind():
                       "mode (n<=3, resolution='low').\n"
                       "         Renew or get a key: %s\n" % _URL)
         else:
-            globals()["cdf"] = mod.cdf
-            return "paid"
+            try:
+                globals()["cdf"] = _import_extension(data, "_ocore").cdf
+                return "paid"
+            except Exception as e:
+                # The key was right; loading the binary failed. Say so
+                # rather than blaming the key.
+                notice = ("orthant: key accepted but the paid binary could not "
+                          "be loaded (%s: %s) -- running in FREE mode (n<=3, "
+                          "resolution='low').\n" % (type(e).__name__, e))
     else:
         notice = ("orthant: FREE mode -- n<=3 and resolution='low' only. No key "
                   "in $ORTHANT_KEY or ~/.orthant/key when this module was "

{multivariate_probit-0.3.1 → multivariate_probit-0.3.2}/tests/test_evaluators.py

@@ -198,3 +198,14 @@ def test_orthant_activate_after_import_without_environment(tmp_path):
     )
     assert out.returncode == 0, out.stderr
     assert "FREE mode" not in out.stderr
+
+
+@orthant_built
+def test_orthant_loads_an_extension_from_memory():
+    # The paid binary is loaded from bytes. Where os.memfd_create exists the
+    # path has no .so suffix, which once left the spec without a loader.
+    from multivariate_probit.orthant import _import_extension, _tag
+
+    with open(ORTHANT_DIR / f"_ofree.{_tag()}.so", "rb") as f:
+        mod = _import_extension(f.read(), "_ofree")
+    assert callable(mod.cdf)