disko 1.4.2__tar.gz → 1.4.4__tar.gz

{disko-1.4.2 → disko-1.4.4}/CHANGES.md

@@ -1,5 +1,14 @@
 # Changes
 
+## 1.4.4 (2026-06-22)
+
+- Fix `image_visibilities` RAM: use matrix-free blocked adjoint instead of building the full complex Gamma matrix in memory
+
+## 1.4.3 (2026-06-22)
+
+- Make `gmsh` and `meshio` optional dependencies in new `[mesh]` extras group; `uv sync --extra mesh` to install
+- Clear error messages when using `--mesh` without the optional dependencies
+
 ## 1.4.2 (2026-06-22)
 
 - Delegate angle parsing to `angle-parser` library; remove custom `parse_ending` and unit constants from `Resolution`

{disko-1.4.2 → disko-1.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: disko
-Version: 1.4.2
+Version: 1.4.4
 Summary: Discrete Sky Operator (DiSkO) Aperture Synthesis Radio Imaging
 Author-email: Tim Molteno <tim@elec.ac.nz>
 License: GPLv3
@@ -8,12 +8,10 @@ License-File: LICENSE.txt
 Requires-Python: <3.14,>=3.11
 Requires-Dist: angle-parser>=0.2.0
 Requires-Dist: dask-ms<0.3.0,>=0.2.25
-Requires-Dist: gmsh>=4.0
 Requires-Dist: h5py>=3.7
 Requires-Dist: healpy<2.0.0,>=1.15.0
 Requires-Dist: imageio>=0.6.0b1
 Requires-Dist: matplotlib<4.0.0,>=3.1.0
-Requires-Dist: meshio>=5.0
 Requires-Dist: numpy<3.0.0,>=1.2.1
 Requires-Dist: pylops>=2.0
 Requires-Dist: scikit-learn>=1.0.1
@@ -22,6 +20,9 @@ Requires-Dist: svgwrite>=1.4.3
 Requires-Dist: tart-tools>=1.4.0
 Requires-Dist: tart>=1.4.0
 Requires-Dist: toolz>=0.11.2
+Provides-Extra: mesh
+Requires-Dist: gmsh>=4.0; extra == 'mesh'
+Requires-Dist: meshio>=5.0; extra == 'mesh'
 Provides-Extra: ms
 Requires-Dist: tart2ms>=0.9.0; extra == 'ms'
 Description-Content-Type: text/markdown

{disko-1.4.2 → disko-1.4.4}/disko/disko.py

@@ -370,11 +370,10 @@ class DiSkO(object):
 
     def image_visibilities(self, vis_arr, sphere):
         """
-        Create a DiSkO image from visibilities using the direct adjoint of the
-        measurement operator (corresponds to the inverse DFT)
+        Create a DiSkO image from visibilities using the adjoint of the
+        measurement operator (matrix-free, blocked for memory efficiency).
 
         Args:
-
             vis_arr (np.array): An array of complex visibilities
             sphere (FoV):    a sphere to place
         """
@@ -383,12 +382,16 @@ class DiSkO(object):
         logger.info("Imaging Visabilities resolution={}".format(sphere.min_res()))
         t0 = time.time()
 
-        gamma = self.get_harmonics(sphere)  # shape (n_v, n_pix), complex
-        # sum_i conj(vis_i) * H[i,:]  = conj(vis) @ H  =  H.T @ conj(vis) ...
-        # Actually: pixels = sum_i vis_i * h_i  =  vis @ H  =  (H.T @ vis).T
-        # Each column of H is a harmonic for one visibility.
-        # pixels[j] = sum_i vis_i * H[i,j] = (vis @ H)[j]
-        pixels = vis_arr @ gamma  # (n_vis,) @ (n_vis, n_pix) -> (n_pix,)
+        # Build a DiSkOOperator and use its adjoint (A.T @ d)
+        # This is matrix-free and uses blocked computation to avoid
+        # storing the full Gamma matrix.
+        data = self.vis_to_data(vis_arr)
+        frequencies = [self.frequency]
+        A = DiSkOOperator(
+            self.u_arr, self.v_arr, self.w_arr, data, frequencies, sphere
+        )
+        d = data.flatten()
+        pixels = A.T @ d  # shape (n_pix,)
 
         logger.info("Elapsed {}s".format(time.time() - t0))
 

{disko-1.4.2 → disko-1.4.4}/disko/sphere_mesh.py

@@ -11,7 +11,6 @@
 import logging
 
 import h5py
-import meshio
 import numpy as np
 
 try:
@@ -19,6 +18,11 @@ try:
 except ImportError:
     gmsh = None
 
+try:
+    import meshio
+except ImportError:
+    meshio = None
+
 from scipy.spatial import Delaunay
 
 from .resolution import Resolution
@@ -100,8 +104,8 @@ def get_mesh(radius_rad, edge_size):
     Returns (points, cells) where points is (N, 3) scaled by radius_rad
     and cells is (M, 3) integer array of triangle vertex indices.
     """
-    if gmsh is None:
-        raise RuntimeError("gmsh is required for mesh generation")
+    if gmsh is None or meshio is None:
+        raise RuntimeError("gmsh and meshio are required for mesh generation. Install with: uv sync --extra mesh")
 
     logger.info(
         f"Generating Mesh: Radius: {Resolution.from_rad(radius_rad)},"

{disko-1.4.2 → disko-1.4.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "disko"
-version = "1.4.2"
+version = "1.4.4"
 description = "Discrete Sky Operator (DiSkO) Aperture Synthesis Radio Imaging"
 authors = [
     {name = "Tim Molteno",email = "tim@elec.ac.nz"}
@@ -21,8 +21,6 @@ dependencies = [
     "pylops>=2.0",
     "toolz>=0.11.2",
     "imageio>=0.6.0b1",
-    "gmsh>=4.0",
-    "meshio>=5.0",
     "dask-ms>=0.2.25,<0.3.0",
     "angle-parser>=0.2.0",
 ]
@@ -31,6 +29,10 @@ dependencies = [
 ms = [
     "tart2ms>=0.9.0",
 ]
+mesh = [
+    "gmsh>=4.0",
+    "meshio>=5.0",
+]
 
 [dependency-groups]
 dev = [

{disko-1.4.2 → disko-1.4.4}/uv.lock

@@ -379,17 +379,15 @@ wheels = [
 
 [[package]]
 name = "disko"
-version = "1.4.1"
+version = "1.4.2"
 source = { editable = "." }
 dependencies = [
     { name = "angle-parser" },
     { name = "dask-ms" },
-    { name = "gmsh" },
     { name = "h5py" },
     { name = "healpy" },
     { name = "imageio" },
     { name = "matplotlib" },
-    { name = "meshio" },
     { name = "numpy" },
     { name = "pylops" },
     { name = "scikit-learn" },
@@ -401,6 +399,10 @@ dependencies = [
 ]
 
 [package.optional-dependencies]
+mesh = [
+    { name = "gmsh" },
+    { name = "meshio" },
+]
 ms = [
     { name = "tart2ms" },
 ]
@@ -413,14 +415,14 @@ dev = [
 
 [package.metadata]
 requires-dist = [
-    { name = "angle-parser", specifier = "==0.2.0" },
+    { name = "angle-parser", specifier = ">=0.2.0" },
     { name = "dask-ms", specifier = ">=0.2.25,<0.3.0" },
-    { name = "gmsh", specifier = ">=4.9" },
+    { name = "gmsh", marker = "extra == 'mesh'", specifier = ">=4.0" },
     { name = "h5py", specifier = ">=3.7" },
     { name = "healpy", specifier = ">=1.15.0,<2.0.0" },
     { name = "imageio", specifier = ">=0.6.0b1" },
     { name = "matplotlib", specifier = ">=3.1.0,<4.0.0" },
-    { name = "meshio", specifier = ">=5.0" },
+    { name = "meshio", marker = "extra == 'mesh'", specifier = ">=5.0" },
     { name = "numpy", specifier = ">=1.2.1,<3.0.0" },
     { name = "pylops", specifier = ">=2.0" },
     { name = "scikit-learn", specifier = ">=1.0.1" },
@@ -428,10 +430,10 @@ requires-dist = [
     { name = "svgwrite", specifier = ">=1.4.3" },
     { name = "tart", specifier = ">=1.4.0" },
     { name = "tart-tools", specifier = ">=1.4.0" },
-    { name = "tart2ms", marker = "extra == 'ms'", specifier = ">=0.7.1" },
+    { name = "tart2ms", marker = "extra == 'ms'", specifier = ">=0.9.0" },
     { name = "toolz", specifier = ">=0.11.2" },
 ]
-provides-extras = ["ms"]
+provides-extras = ["ms", "mesh"]
 
 [package.metadata.requires-dev]
 dev = [
@@ -1392,6 +1394,23 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/70/b0/eb757336e5a76dfa7911f63252e3b7d1de00935d7705cf772db5b45ec238/scipy-1.17.1-cp313-cp313t-win_arm64.whl", hash = "sha256:a720477885a9d2411f94a93d16f9d89bad0f28ca23c3f8daa521e2dcc3f44d49", size = 24856543, upload-time = "2026-02-23T00:20:45.313Z" },
 ]
 
+[[package]]
+name = "sgp4"
+version = "2.27"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/a8/62/e1282ea86299c76159e182cd36046e6d7980b120fef14c101757e1f650b3/sgp4-2.27.tar.gz", hash = "sha256:06d37247c6985739b707b8b39b6b83e06e8af783b2531e31965501ba983985f9", size = 180401, upload-time = "2026-07-03T12:54:49.443Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/c1/06/01c556ab39ef9c161b44d171fbb0990f59d5079d77959409c1f97685d269/sgp4-2.27-cp311-abi3-macosx_10_9_x86_64.whl", hash = "sha256:5ae1394cf0d91f54418530b02a797b14c10bb28e3f4ab616cad79a3fd67e2399", size = 148927, upload-time = "2026-07-03T12:54:41.296Z" },
+    { url = "https://files.pythonhosted.org/packages/36/d9/05fd166d8f74b326590e78bb13148d6b359ae32be5cd39082fd8a292bf50/sgp4-2.27-cp311-abi3-macosx_11_0_arm64.whl", hash = "sha256:ee68f73cb2383bc950eada2ca1b10357b0165dbf5ab75185962009375bab8761", size = 147745, upload-time = "2026-07-03T12:54:42.31Z" },
+    { url = "https://files.pythonhosted.org/packages/d6/75/633ad7874db149df164168090951e676cdc3541a12d43b2cbb9d20ecb721/sgp4-2.27-cp311-abi3-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:4d3775313120dcb6239535fa0c94cb6d5b089fd84bbfb15220923ae38dec7296", size = 218130, upload-time = "2026-07-03T12:54:43.296Z" },
+    { url = "https://files.pythonhosted.org/packages/bc/bf/a279758ff3eb290cc5658f035845d3107d9728e1d2d52629c9683845313a/sgp4-2.27-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ef915c124cdd9807a4eae0abe655ade89076c2cee5df0392cad172aef456cd0e", size = 219370, upload-time = "2026-07-03T12:54:44.453Z" },
+    { url = "https://files.pythonhosted.org/packages/30/84/8eebceb87dee7e7095d78375c473b57471c964d87b676c138e2da3e901bb/sgp4-2.27-cp311-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:26cfb6b8ace44e56b71cba79294da61af083b96c6b12f6229dc761c4d8c833eb", size = 215592, upload-time = "2026-07-03T12:54:45.493Z" },
+    { url = "https://files.pythonhosted.org/packages/f4/5d/e7f4a9035cc62e4d10e35f22477498458520cb32b20eed5b4a9e7854d15d/sgp4-2.27-cp311-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:63d30826ebd303e66f184b1e3feba30524d01a379e50baacd47732dd447d97ab", size = 214880, upload-time = "2026-07-03T12:54:46.563Z" },
+    { url = "https://files.pythonhosted.org/packages/56/62/c14d2aaa36ff6e749189e3576c70f3ed21f3ba72fa69e924f20581e760c1/sgp4-2.27-cp311-abi3-win32.whl", hash = "sha256:951ec95ea7f0fe0b5307fc2cd9d28c8923048bcf376b11c6cd93739e15b4722d", size = 147271, upload-time = "2026-07-03T12:54:47.498Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/b5/6e76ddece37a130c1c4c33a0ca2ae381c7aad733ca8e3d9b451594711fc0/sgp4-2.27-cp311-abi3-win_amd64.whl", hash = "sha256:827c63feb60987ad177c2c80f3a927e721ead2f444d6560cd2a4337ca90d2490", size = 148879, upload-time = "2026-07-03T12:54:48.448Z" },
+    { url = "https://files.pythonhosted.org/packages/78/cd/06dc91b31f2b919e788396c2cb5ad313d5ce0754321165343fd585c4be53/sgp4-2.27-py3-none-any.whl", hash = "sha256:5f3f5716649988b638fbe7fcda592830e0956f548ca273b93cfa5f75917b9087", size = 123299, upload-time = "2026-07-12T18:53:05.274Z" },
+]
+
 [[package]]
 name = "six"
 version = "1.17.0"
@@ -1424,6 +1443,21 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/dc/0e/57466c742cc4c64f77c44114c9eb463d329b80eed6285b93fa1fa694d0c1/tart-1.4.5-py3-none-any.whl", hash = "sha256:e76f15e773c5e3259ee2dab2a3bc30f3e16b327460f1d8015f2bc7f3174a294d", size = 1075774, upload-time = "2026-01-25T19:24:22.094Z" },
 ]
 
+[[package]]
+name = "tart-catalogue-client"
+version = "0.5.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "astropy" },
+    { name = "numpy" },
+    { name = "requests" },
+    { name = "sgp4" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/f2/85/d8e695a3f154317de11049955dfe316719f56c8c5fa7ae9c9bdd68b1561c/tart_catalogue_client-0.5.1.tar.gz", hash = "sha256:6bcb85bd313c0b04dae079aa8c7dcca1f4655ba689c05e5e2757b298e8eddad8", size = 40752, upload-time = "2026-07-11T03:13:15.052Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/52/56/a064ffd85dbf7c2cd52032ca086bf28fc6943dfe9d7479170b2ad20cf914/tart_catalogue_client-0.5.1-py3-none-any.whl", hash = "sha256:cea788d041df5705035641f3cb53dba58daef1fc9a0bcfe708e52e5779fdd6db", size = 9676, upload-time = "2026-07-11T03:13:13.944Z" },
+]
+
 [[package]]
 name = "tart-tools"
 version = "1.4.5"
@@ -1442,7 +1476,7 @@ wheels = [
 
 [[package]]
 name = "tart2ms"
-version = "0.8.1"
+version = "0.9.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "astropy" },
@@ -1456,11 +1490,12 @@ dependencies = [
     { name = "requests" },
     { name = "scipy" },
     { name = "tart" },
+    { name = "tart-catalogue-client" },
     { name = "tart-tools" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/ec/8f/8eca8444efddd787f19f815294a3f2f6c6ccae08f886af6e4fc6722a0ee8/tart2ms-0.8.1.tar.gz", hash = "sha256:b81222ffd1020b90841aea70e6f12387d491ed3f75fd2ea6f444e181faf1e60b", size = 6360049, upload-time = "2026-06-12T07:10:28.748Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/9b/84/bc1027ab3d56862fb307ccb0e92686298d3ceecf9377aeebcb768a4e8248/tart2ms-0.9.0.tar.gz", hash = "sha256:1b070d0530ec9fdb874875791faedac6ead810862ffcb42ac5a778f8daf50139", size = 6367946, upload-time = "2026-07-11T03:52:23.927Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/0c/5a/59d3ec56bcd20405df0273d07a26f299664556f8af61bcfc00e1a8965229/tart2ms-0.8.1-py3-none-any.whl", hash = "sha256:ecd605eb3c50db4e12c64ff066c812cc3d0b5309ee473ffbc010bb21b9867f1a", size = 6505995, upload-time = "2026-06-12T07:10:27.027Z" },
+    { url = "https://files.pythonhosted.org/packages/ca/24/34718a2e94dd1040785d5d6fc3dc093259b78dc76764443a113fb1ffcc2c/tart2ms-0.9.0-py3-none-any.whl", hash = "sha256:3911cab32a631411eb3a235a650a114db6fb375a180c516a961ef5cf42ce450e", size = 6516693, upload-time = "2026-07-11T03:52:21.862Z" },
 ]
 
 [[package]]