Merge pull request #11 from munechika-koyo/develop

🔧 Fix meson.build for windows building
munechika-koyo · Nov 27, 2023 · 188a9a8 · 188a9a8
2 parents bbbd4de + c05037d
commit 188a9a8
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/cherab/inversion/__init__.py b/cherab/inversion/__init__.py
@@ -5,4 +5,4 @@
 from .mfr import Mfr
 
 __all__ = ["compute_svd", "_SVDBase", "Lcurve", "GCV", "Mfr"]
-__version__ = "0.1.3"
+__version__ = "0.1.4"
diff --git a/cherab/inversion/core.py b/cherab/inversion/core.py
@@ -562,7 +562,7 @@ def compute_svd(
 
         .. math::
 
-            PHP^\\mathsf{T} = L^\\mathsf{T} L,
+            PHP^\\mathsf{T} = LL^\\mathsf{T},
 
         where :math:`L` is a lower triangular matrix and :math:`P` is a fill-reducing permutation.
 

diff --git a/cherab/inversion/derivative.pyx b/cherab/inversion/derivative.pyx
@@ -77,7 +77,7 @@ cpdef object compute_dmat(
 
         >>> from raysect.optical import World
         >>> from cherab.phix.tools.raytransfer import import_phix_rtc
-        >>> from cherab.inversion.tools import compute_dmat
+        >>> from cherab.inversion.derivative import compute_dmat
         >>>
         >>> world = World()
         >>> rtc = import_phix_rtc(world)

diff --git a/cherab/inversion/mfr.py b/cherab/inversion/mfr.py
@@ -188,7 +188,8 @@ def solve(
         verbose
             If True, print iteration information regarding SVD computation, by default False
         **kwargs
-            additional keyword arguments passed to the regularizer class's :meth:`solve` method
+            additional keyword arguments passed to the regularizer class's :obj:`~._SVDBase.solve`
+            method
         """
         # validate regularizer
         if not issubclass(regularizer, _SVDBase):

diff --git a/dev.py b/dev.py
@@ -80,13 +80,14 @@ def build(build_dir: str, parallel: int):
         os.remove(temp_init)
         sys.exit(1)
 
-    # === install .so files in source tree ==========================
-    for so_path in BUILD_DIR.glob("**/*.so"):
+    # === install .so/.pyd files in source tree ==========================
+    ext = ".pyd" if sys.platform == "win32" else ".so"
+    for so_path in BUILD_DIR.glob(f"**/*{ext}"):
         src = so_path.resolve()
         dst = BASE_DIR / so_path.relative_to(BUILD_DIR)
         shutil.copy(src, dst)
         print(f"copy {src} into {dst}")
-    print("Install .so files in place.")
+    print(f"Install {ext} files in place.")
 
     # delete temporary __init__.py
     os.remove(temp_init)

diff --git a/meson.build b/meson.build
@@ -3,10 +3,12 @@ project(
   'c',
   'cython',
   # Note that version cannot dinamically changed now.
-  version: '0.1.3',
+  version: '0.1.4',
   meson_version: '>= 0.64.0',
   default_options: [
     'cython_args=-3',
+    'c_std=c99',
+    'buildtype=debugoptimized',
   ],
 )
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -10,7 +10,7 @@ build-backend = "mesonpy"
 [project]
 name = "cherab-inversion"
 description = "Cherab inversion framework"
-version = "0.1.3"
+version = "0.1.4"
 readme = "README.md"
 authors = [
     { name = "Koyo Munechika", email = "[email protected]" },