diffct 2.4.4__tar.gz → 2.5.1__tar.gz

{diffct-2.4.4 → diffct-2.5.1}/CHANGELOG.md

@@ -5,7 +5,61 @@ All notable changes to this project are documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [2.5.1] - 2026-11-07
+
+### Fixed
+
+- Saving a solver checkpoint into a step that already exists raises a clear
+  `ValueError` that names the existing directory, instead of a bare
+  `FileExistsError`. The existing checkpoint is not changed. Use a new
+  `checkpoint_directory`, or pass `resume=` to continue from it. Thanks to
+  @cslht11 ([#63](https://github.com/sypsyp97/diffct/pull/63)).
+- `random_trajectory_3d(seed=...)` draws its noise from a private generator
+  and no longer reseeds the process-wide PyTorch generator. Seeded
+  trajectories are unchanged. Thanks to @cslht11
+  ([#64](https://github.com/sypsyp97/diffct/pull/64)).
+
+### Changed
+
+- CPU tests check the FBP, FDK and short-scan Parker accuracy bounds on the
+  portable backend, so CI covers them without a GPU. Thanks to @cslht11
+  ([#65](https://github.com/sypsyp97/diffct/pull/65)).
+- A `.mailmap` joins the commits of one contributor under one name
+  ([#62](https://github.com/sypsyp97/diffct/pull/62)).
+
+### Documentation
+
+- Semantic search on the documentation site is off by default. The
+  embedding model (about 377 MB) downloads only after the visitor enables it
+  ([#66](https://github.com/sypsyp97/diffct/pull/66)).
+
+## [2.5.0] - 2026-10-26
+
+### Added
+
+- Apple Silicon GPU (MPS) support for the portable PyTorch backend, including
+  the solvers, detector surfaces and streamed stores. MPS has no FP64, so ray
+  clipping and entry setup run in FP32 there; `precision="float64"` raises a
+  `ValueError` for MPS data, outputs or trajectories. See `docs/EXECUTION.md`
+  for the FP32 error bound. Thanks to @cslht11
+  ([#57](https://github.com/sypsyp97/diffct/pull/57)).
+- TLA+ protocol models with TLC/Apalache checks and execution trace validation
+  for memory budgets, native admission and distributed collectives, run in a
+  separate CI workflow. They live in `formal/` and do not change library
+  behavior ([#55](https://github.com/sypsyp97/diffct/pull/55)).
+
+### Fixed
+
+- Trajectory constructors reject degenerate inputs instead of building NaN or empty geometry: zero or non-finite `ray_dir_fn` directions in `custom_trajectory_2d_parallel`, `random_trajectory_3d` sources at the isocenter, and view counts that are not positive integers (`TypeError` for floats and booleans, `ValueError` for counts below 1). Explicit angle tensors are still accepted. Thanks to @cslht11 ([#56](https://github.com/sypsyp97/diffct/pull/56)).
+
+### Documentation
+
+- README, documentation landing page, `llms.txt` summary, `CITATION.cff` and package keywords name the native CUDA kernels and the portable backend on CPU, ROCm and Apple Silicon. The landing quickstart has an Apple Silicon (MPS) tab ([#60](https://github.com/sypsyp97/diffct/pull/60)).
+- Every documentation page uses the same three-column layout with the site navigation on the left ([#58](https://github.com/sypsyp97/diffct/pull/58)).
+
+### Changed
+
+- Continuous integration: pull requests that change only `docs/` skip the package, test and formal jobs; the documentation build still runs. Pushes to `main` and release tags run every job ([#59](https://github.com/sypsyp97/diffct/pull/59)).
 
 ## [2.4.4] - 2026-10-25
 

{diffct-2.4.4 → diffct-2.5.1}/CITATION.cff

@@ -2,8 +2,9 @@ cff-version: 1.2.0
 message: "If you use this software, please cite both the software (below) and the technical report listed under preferred-citation."
 title: "diffct: Differentiable Computed Tomography Reconstruction with CUDA"
 abstract: >-
-  Differentiable CUDA projectors for computed tomography (CT) with PyTorch
-  autograd. Each view has its own source and detector geometry, so circular,
+  Differentiable projectors for computed tomography (CT) with PyTorch
+  autograd: native NVIDIA CUDA kernels and a portable PyTorch backend for
+  CPU, ROCm and Apple Silicon (MPS). Each view has its own source and detector geometry, so circular,
   helical, saddle and calibrated scans use the same matched Siddon operator.
   Projections run on one GPU, several GPUs in one process, or across nodes,
   and trajectory tensors receive geometry gradients for calibration.
@@ -13,8 +14,8 @@ authors:
     given-names: Yipeng
     email: yipeng.sun@fau.de
     alias: sypsyp97
-version: 2.4.4
-date-released: "2026-10-25"
+version: 2.5.1
+date-released: "2026-11-07"
 license: Apache-2.0
 repository-code: "https://github.com/sypsyp97/diffct"
 url: "https://sypsyp97.github.io/diffct/"

{diffct-2.4.4 → diffct-2.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: diffct
-Version: 2.4.4
+Version: 2.5.1
 Summary: Differentiable CT projection and reconstruction: precision modes, streaming, distributed execution and geometry gradients
 Project-URL: Homepage, https://github.com/sypsyp97/diffct
 Project-URL: Documentation, https://sypsyp97.github.io/diffct/
@@ -10,7 +10,7 @@ Author-email: Yipeng Sun <yipeng.sun@fau.de>
 License-Expression: Apache-2.0
 License-File: LICENSE
 License-File: NOTICE
-Keywords: CT reconstruction,CUDA,PyTorch,ROCm,computed tomography,differentiable programming
+Keywords: Apple Silicon,CT reconstruction,CUDA,MPS,PyTorch,ROCm,computed tomography,differentiable programming
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: GPU :: NVIDIA CUDA
 Classifier: Intended Audience :: Science/Research
@@ -34,7 +34,8 @@ Description-Content-Type: text/markdown
 <p align="center">English · <a href="https://github.com/sypsyp97/diffct/blob/main/README.zh.md">简体中文</a></p>
 
 <p align="center">
-  Differentiable CUDA projectors for CT: arbitrary trajectories, multi-GPU, multi-node, geometry gradients.
+  Differentiable CT projectors: arbitrary trajectories, multi-GPU, multi-node, geometry gradients.<br>
+  Native NVIDIA CUDA kernels, plus a portable PyTorch backend for CPU, ROCm and Apple Silicon (MPS).
 </p>
 
 <p align="center">
@@ -66,7 +67,7 @@ Description-Content-Type: text/markdown
 </p>
 
 > **Version 2.0** replaces the circular-orbit API of 1.x with per-view trajectories. Code written for 1.x needs changes; see the [migration notes](https://github.com/sypsyp97/diffct/blob/main/docs/MIGRATION.md).
-> For Apple Silicon, use the [MLX port by Linda-Sophie Schneider](https://github.com/Linda-SophieSchneider/DiffCT-MLX).
+> Apple Silicon runs through the built-in MPS support (`backend="torch"`); a community [MLX port by Linda-Sophie Schneider](https://github.com/Linda-SophieSchneider/DiffCT-MLX) also exists.
 
 This README describes the source checkout. Features listed under [Unreleased](CHANGELOG.md#unreleased) require installation from source.
 
@@ -79,7 +80,7 @@ To our knowledge, diffct is the only open-source GPU CT library that combines ar
 - **Matched operators.** `project()` and `backproject()` form an exact adjoint pair for the cell-constant Siddon model. Both support PyTorch autograd, with volume/sinogram gradients and Hessian-vector products.
 - **Large volumes.** Automatic spatial, view and pixel blocks with bounded transfer buffers control working memory. `project_into`/`backproject_into` accept caller-owned tensor or disk stores; tensor autograd keeps complete data on its input device. See [chunked execution](https://github.com/sypsyp97/diffct/blob/main/docs/REFERENCE.md#chunked-execution).
 - **Multi-GPU and multi-node.** Use `devices=[0, 1, 2, 3]` in one process, or torchrun and NCCL across ranks. Views, space and hybrid partitions control replication of volumes and projections. Speedup depends on workload and communication costs.
-- **Precision and training.** Explicit native/PyTorch backends, FP32/FP64 modes, per-axis voxel spacing, leading batch/channel dimensions and data `torch.func` transforms. The portable path supports CPU and PyTorch CUDA/ROCm devices; see [execution contracts](docs/EXECUTION.md).
+- **Precision and training.** Explicit native/PyTorch backends, FP32/FP64 modes, per-axis voxel spacing, leading batch/channel dimensions and data `torch.func` transforms. The portable path supports CPU, PyTorch CUDA/ROCm devices and Apple Silicon GPUs (MPS, `backend="torch"`); see [execution contracts](docs/EXECUTION.md).
 - **Solver API.** `cgls`, `sirt` and `tv_reconstruction` report residual history, tolerances and callbacks, with scan/data fingerprints and complete checkpoint state. `cgls_into` keeps state in bounded mapped blocks.
 - **Differentiable FBP and FDK.** `fbp`, `fdk` and approximate `helical_fdk` compose the public filters, weights and analytical backprojectors. Their backward kernels transpose the actual interpolation stencil; custom filters and weights can be learned. See the [analytical guide](docs/source/analytical_learning.rst).
 
@@ -95,7 +96,7 @@ pip install "diffct[cu12]"    # PyTorch built for CUDA 12
 pip install "diffct[cu13]"    # PyTorch built for CUDA 13
 ```
 
-The extra installs the CUDA compiler libraries Numba needs. For CPU or PyTorch ROCm execution, install the appropriate PyTorch build and plain `pip install diffct`, then select `backend="torch"`. Importing diffct and using this backend require no CUDA runtime; Numba CUDA initializes when native execution is used. Plain installation also works for native execution when a compatible CUDA Toolkit is already present.
+The extra installs the CUDA compiler libraries Numba needs. For CPU, PyTorch ROCm or Apple Silicon (MPS) execution, install the appropriate PyTorch build and plain `pip install diffct`, then select `backend="torch"`. Importing diffct and using this backend require no CUDA runtime; Numba CUDA initializes when native execution is used. Plain installation also works for native execution when a compatible CUDA Toolkit is already present.
 
 From source, with the examples:
 

{diffct-2.4.4 → diffct-2.5.1}/README.md

@@ -3,7 +3,8 @@
 <p align="center">English · <a href="https://github.com/sypsyp97/diffct/blob/main/README.zh.md">简体中文</a></p>
 
 <p align="center">
-  Differentiable CUDA projectors for CT: arbitrary trajectories, multi-GPU, multi-node, geometry gradients.
+  Differentiable CT projectors: arbitrary trajectories, multi-GPU, multi-node, geometry gradients.<br>
+  Native NVIDIA CUDA kernels, plus a portable PyTorch backend for CPU, ROCm and Apple Silicon (MPS).
 </p>
 
 <p align="center">
@@ -35,7 +36,7 @@
 </p>
 
 > **Version 2.0** replaces the circular-orbit API of 1.x with per-view trajectories. Code written for 1.x needs changes; see the [migration notes](https://github.com/sypsyp97/diffct/blob/main/docs/MIGRATION.md).
-> For Apple Silicon, use the [MLX port by Linda-Sophie Schneider](https://github.com/Linda-SophieSchneider/DiffCT-MLX).
+> Apple Silicon runs through the built-in MPS support (`backend="torch"`); a community [MLX port by Linda-Sophie Schneider](https://github.com/Linda-SophieSchneider/DiffCT-MLX) also exists.
 
 This README describes the source checkout. Features listed under [Unreleased](CHANGELOG.md#unreleased) require installation from source.
 
@@ -48,7 +49,7 @@ To our knowledge, diffct is the only open-source GPU CT library that combines ar
 - **Matched operators.** `project()` and `backproject()` form an exact adjoint pair for the cell-constant Siddon model. Both support PyTorch autograd, with volume/sinogram gradients and Hessian-vector products.
 - **Large volumes.** Automatic spatial, view and pixel blocks with bounded transfer buffers control working memory. `project_into`/`backproject_into` accept caller-owned tensor or disk stores; tensor autograd keeps complete data on its input device. See [chunked execution](https://github.com/sypsyp97/diffct/blob/main/docs/REFERENCE.md#chunked-execution).
 - **Multi-GPU and multi-node.** Use `devices=[0, 1, 2, 3]` in one process, or torchrun and NCCL across ranks. Views, space and hybrid partitions control replication of volumes and projections. Speedup depends on workload and communication costs.
-- **Precision and training.** Explicit native/PyTorch backends, FP32/FP64 modes, per-axis voxel spacing, leading batch/channel dimensions and data `torch.func` transforms. The portable path supports CPU and PyTorch CUDA/ROCm devices; see [execution contracts](docs/EXECUTION.md).
+- **Precision and training.** Explicit native/PyTorch backends, FP32/FP64 modes, per-axis voxel spacing, leading batch/channel dimensions and data `torch.func` transforms. The portable path supports CPU, PyTorch CUDA/ROCm devices and Apple Silicon GPUs (MPS, `backend="torch"`); see [execution contracts](docs/EXECUTION.md).
 - **Solver API.** `cgls`, `sirt` and `tv_reconstruction` report residual history, tolerances and callbacks, with scan/data fingerprints and complete checkpoint state. `cgls_into` keeps state in bounded mapped blocks.
 - **Differentiable FBP and FDK.** `fbp`, `fdk` and approximate `helical_fdk` compose the public filters, weights and analytical backprojectors. Their backward kernels transpose the actual interpolation stencil; custom filters and weights can be learned. See the [analytical guide](docs/source/analytical_learning.rst).
 
@@ -64,7 +65,7 @@ pip install "diffct[cu12]"    # PyTorch built for CUDA 12
 pip install "diffct[cu13]"    # PyTorch built for CUDA 13
 ```
 
-The extra installs the CUDA compiler libraries Numba needs. For CPU or PyTorch ROCm execution, install the appropriate PyTorch build and plain `pip install diffct`, then select `backend="torch"`. Importing diffct and using this backend require no CUDA runtime; Numba CUDA initializes when native execution is used. Plain installation also works for native execution when a compatible CUDA Toolkit is already present.
+The extra installs the CUDA compiler libraries Numba needs. For CPU, PyTorch ROCm or Apple Silicon (MPS) execution, install the appropriate PyTorch build and plain `pip install diffct`, then select `backend="torch"`. Importing diffct and using this backend require no CUDA runtime; Numba CUDA initializes when native execution is used. Plain installation also works for native execution when a compatible CUDA Toolkit is already present.
 
 From source, with the examples:
 

{diffct-2.4.4 → diffct-2.5.1}/diffct/__init__.py

@@ -64,7 +64,7 @@ try:
 except ImportError:
     pass
 
-__version__ = '2.4.4'
+__version__ = '2.5.1'
 
 __all__ = [
     'Projector',

{diffct-2.4.4 → diffct-2.5.1}/diffct/_solver_state.py

@@ -12,6 +12,7 @@ import torch.distributed as dist
 from .pipeline import _fragments
 from .storage import NpyStore, TensorStore
 from .distribution import control_status, preflight
+from .utils import _work_dtype
 
 
 def count(value, name, positive=False):
@@ -65,20 +66,46 @@ def scalar_sum(operator, value, kind, *, return_tensor=False):
         dist.all_reduce(accumulator, group=group)
         return accumulator if return_tensor else accumulator.item()
     if return_tensor:
-        return torch.as_tensor(value, dtype=torch.float64, device=result_device)
+        return torch.as_tensor(value, dtype=_work_dtype(result_device), device=result_device)
     return float(value)
 
 
 def squared_norm(operator, value, kind, elements=1048576, *, return_tensor=False):
     store = TensorStore(value) if isinstance(value, torch.Tensor) else value
-    total = torch.zeros((), dtype=torch.float64, device=getattr(store, "device", "cpu"))
+    # Scale every block by its own peak before squaring and track the
+    # running maximum on the device: unscaled FP32 squares overflow for
+    # large measurements and underflow for tiny geometries.
+    device = getattr(store, "device", torch.device("cpu"))
+    if _work_dtype(device) == torch.float64:
+        total = torch.zeros((), dtype=torch.float64, device=device)
+        if owns_values(operator, kind):
+            for selected in _fragments(tuple(store.shape), elements):
+                # Clone even an FP64 view: norms must never alter caller measurements.
+                block = store.read(selected).to(dtype=torch.float64).clone()
+                # Preserve the block reductions and their sequential FP64 order.
+                total.add_(block.square_().sum().to(device=total.device))
+        return scalar_sum(operator, total, kind, return_tensor=return_tensor)
+    # FP32 devices (MPS): squares of large measurements overflow and tiny
+    # geometries underflow, so every block is rescaled by its peak and the
+    # running sum follows the largest peak seen. All block math stays on the
+    # device; the two closing scalar reads fit the per-iteration reduction
+    # budget, and their product leaves FP32 before it can overflow.
+    peak = torch.zeros((), device=device, dtype=torch.float32)
+    total = torch.zeros((), device=device, dtype=torch.float32)
     if owns_values(operator, kind):
         for selected in _fragments(tuple(store.shape), elements):
-            # Clone even an FP64 view: norms must never alter caller measurements.
-            block = store.read(selected).to(dtype=torch.float64).clone()
-            # Preserve the block reductions and their sequential FP64 order.
-            total.add_(block.square_().sum().to(device=total.device))
-    return scalar_sum(operator, total, kind, return_tensor=return_tensor)
+            block = store.read(selected)
+            if not block.numel():
+                continue
+            block_peak = block.detach().abs().amax()
+            safe = torch.where(block_peak > 0, block_peak, torch.ones_like(block_peak))
+            combined = torch.maximum(peak, block_peak)
+            guard = torch.where(combined > 0, combined, torch.ones_like(combined))
+            total = (total * (peak / guard).square()
+                     + (block.detach() / safe).square().sum() * (block_peak / guard).square())
+            peak = combined
+    return scalar_sum(operator, peak.item() ** 2 * total.item(), kind,
+                      return_tensor=return_tensor)
 
 
 def copy_blocks(source, target, elements):
@@ -261,6 +288,11 @@ def save_checkpoint(operator, directory, states, metadata, iteration, history, m
         step = Path(directory).resolve() / f"step-{iteration:06d}"
         step.mkdir(parents=True, exist_ok=True)
         rank = step / f"rank-{getattr(operator, 'rank', 0):05d}"
+        if rank.exists():
+            # Replacing a published step in place could destroy it on a
+            # failed write, and ranks cannot roll back together.
+            raise ValueError(f"checkpoint {rank} already exists; use a new checkpoint_directory "
+                             "or pass resume= to continue from it")
         rank.mkdir()
         for name, source in states.items():
             source = TensorStore(source.detach()) if isinstance(source, torch.Tensor) else source

{diffct-2.4.4 → diffct-2.5.1}/diffct/analytical_execution.py

@@ -160,6 +160,8 @@ class AnalyticalExecution:
             raise TypeError("sinogram store must have dtype float32 or float64")
         self.source = source
         self.output_device = torch.device(getattr(source, "device", "cpu"))
+        if self.dtype == torch.float64 and self.output_device.type == "mps":
+            raise ValueError("precision must be 'fast' or 'float32' on MPS; MPS provides no float64")
         self.detector_shape = tuple(source.shape[1:])
         for component in trajectory:
             _fixed(component, "trajectory")

{diffct-2.4.4 → diffct-2.5.1}/diffct/backends.py

@@ -12,6 +12,7 @@ import torch.distributed as dist
 from torch.autograd import forward_ad
 
 from .chunking import _memory_lower_bounds
+from .utils import _work_dtype
 from .distribution import control_status
 from .surfaces import ParameterizedSurface
 from .constants import _native_spacing
@@ -76,6 +77,16 @@ def _zero_dependency(value):
     return value.unsqueeze(0)[:0].sum()
 
 
+def _constant_like(reference, values):
+    """Build a constant tensor on ``reference``'s device and dtype.
+
+    ``new_tensor`` has no kernel behind a functorch dual on MPS and raises
+    "DispatchKey Undefined doesn't correspond to a device"; an explicit
+    constructor keeps the same constant on every device and transform.
+    """
+    return torch.tensor(values, dtype=reference.dtype, device=reference.device)
+
+
 def voxel_spacing_tuple(spacing, rank):
     """Return positive physical pitches in tensor axis order."""
     values = spacing if isinstance(spacing, (tuple, list)) else (spacing,) * rank
@@ -563,7 +574,14 @@ class ReferenceProjector:
             with torch.no_grad():
                 # Reuse frame transfers across detector chunks. Offset batches
                 # remain bounded and move only when a ray batch needs them.
-                staged = {device: (*tuple(value.to(device=device) for value in geometry[:frame_count]),
+                def _stage(value, target_device):
+                    # FP64 frames must not follow FP64-less compute devices.
+                    target_dtype = _work_dtype(target_device)
+                    if value.dtype.itemsize > target_dtype.itemsize:
+                        return value.to(device=target_device, dtype=target_dtype)
+                    return value.to(device=target_device)
+
+                staged = {device: (*tuple(_stage(value, device) for value in geometry[:frame_count]),
                                     *parameters) for device in set(devices)}
                 batches = (self._admission_batches(staged[devices[0]], plan) if admission
                            else self._batches(*plan[1:]))
@@ -630,7 +648,7 @@ class ReferenceProjector:
         def compose(validate, stats):
             check_range = (validate and owner.beam not in ("parallel", "parallel3d")
                            and owner.dtype == torch.float32 and surface is not None)
-            dtype = torch.float64 if check_range else owner.dtype
+            dtype = _work_dtype(device) if check_range else owner.dtype
             frames = (owner._learnable or owner._trajectory) if geometry is None else geometry[:frame_count]
             native_surface = owner.backend == "numba" and surface is not None
             native_legacy = native_surface and not isinstance(surface, ParameterizedSurface)
@@ -666,7 +684,7 @@ class ReferenceProjector:
             if check_range and not native_surface:
                 # Certify ordinary batches without expanding raw FP64 world points.
                 # L1 norms bound Euclidean distances without squaring tiny bases.
-                pitches = local.new_tensor(self.spacing[::-1])
+                pitches = _constant_like(local, self.spacing[::-1])
                 maximum = local.abs().amax(dim=tuple(range(1, local.ndim - 1)))
                 axis_u = selected[2]
                 if owner.beam == "cone":
@@ -698,7 +716,7 @@ class ReferenceProjector:
             if check_range:
                 # Raw FP64 coordinates preserve the exact admission boundaries.
                 sources = frame(selected[0]).expand_as(points)
-                pitches = points.new_tensor(self.spacing[::-1])
+                pitches = _constant_like(points, self.spacing[::-1])
                 source_distance = torch.linalg.vector_norm(sources / pitches, dim=-1)
                 pixel_distance = torch.linalg.vector_norm(points / pitches, dim=-1)
                 if torch.any(torch.minimum(source_distance, pixel_distance) > 1e6).item():
@@ -725,7 +743,7 @@ class ReferenceProjector:
                 origins, directions = points, frame(selected[0]).expand_as(points)
             else:
                 sources = frame(selected[0]).expand_as(points)
-                pitches = points.new_tensor(self.spacing[::-1])
+                pitches = _constant_like(points, self.spacing[::-1])
                 source_distance = torch.linalg.vector_norm(sources / pitches, dim=-1)
                 pixel_distance = torch.linalg.vector_norm(points / pitches, dim=-1)
                 if validate:
@@ -764,14 +782,14 @@ class ReferenceProjector:
         # Global FP32 segment parameters lose voxel widths when both endpoints
         # are distant. Plane tables below use local physical distances and the
         # chosen precision, including for native data-transform dispatch.
-        origins = origins.to(dtype=torch.float64)
-        directions = directions.to(dtype=torch.float64)
+        origins = origins.to(dtype=_work_dtype(origins.device))
+        directions = directions.to(dtype=_work_dtype(directions.device))
         ray_length = torch.linalg.vector_norm(directions, dim=-1)
         directions = directions / ray_length[:, None]
-        lower = origins.new_tensor([(part.start - size / 2) * pitch
-                                    for part, size, pitch in zip(world_tile, shape, spacing)])
-        upper = origins.new_tensor([(part.stop - size / 2) * pitch
-                                    for part, size, pitch in zip(world_tile, shape, spacing)])
+        lower = _constant_like(origins, [(part.start - size / 2) * pitch
+                                        for part, size, pitch in zip(world_tile, shape, spacing)])
+        upper = _constant_like(origins, [(part.stop - size / 2) * pitch
+                                        for part, size, pitch in zip(world_tile, shape, spacing)])
         constant = directions == 0
         safe_direction = torch.where(constant, torch.ones_like(directions), directions)
         first, last = (lower - origins) / safe_direction, (upper - origins) / safe_direction
@@ -1093,7 +1111,17 @@ class ReferenceProjector:
             # The zero dependency keeps unused inputs connected. With several
             # devices, a pair's loss and the geometry leaves can be on different
             # CUDA devices, so each zero moves to the loss's device.
-            loss = loss + sum(_zero_dependency(value).to(loss.device) for value in inputs)
+            def _zero_to(value, device):
+                zero = _zero_dependency(value)
+                target_dtype = _work_dtype(device)
+                if zero.dtype.itemsize > target_dtype.itemsize:
+                    # Cast on the source device first: a fused device and dtype
+                    # copy routes the float64 gradient back through the
+                    # FP64-less device on the way out.
+                    return zero.to(dtype=target_dtype).to(device=device)
+                return zero.to(device=device)
+
+            loss = loss + sum(_zero_to(value, loss.device) for value in inputs)
             for total, part in zip(totals, torch.autograd.grad(loss, inputs)):
                 total.add_(part)
 

{diffct-2.4.4 → diffct-2.5.1}/diffct/geometry.py

@@ -5,6 +5,7 @@ and custom trajectories for parallel, fan and cone beams, plus rigid transforms.
 """
 
 import math
+import operator
 import torch
 from typing import Callable, Tuple
 
@@ -40,10 +41,20 @@ def transform_trajectory(trajectory, rotation=None, translation=None, *, beam='c
     if rotation is not None:
         if tuple(rotation.shape) not in ((dimensions, dimensions), (views, dimensions, dimensions)):
             raise ValueError("rotation must have shape (d, d) or (views, d, d)")
-        matrix = rotation.detach().double()
+        # MPS provides no float64; the formal harness also loads this module
+        # standalone, so the cast stays inline instead of importing helpers.
+        matrix = rotation.detach().to(dtype=torch.float32 if rotation.device.type == "mps"
+                                      else torch.float64)
         identity = torch.eye(dimensions, device=matrix.device, dtype=matrix.dtype).expand_as(matrix)
+        # Small explicit determinants: linalg.det routes through LU kernels
+        # that MPS does not provide.
+        if dimensions == 2:
+            determinant = (matrix[..., 0, 0] * matrix[..., 1, 1]
+                           - matrix[..., 0, 1] * matrix[..., 1, 0])
+        else:
+            determinant = (matrix[..., 0] * torch.linalg.cross(matrix[..., 1], matrix[..., 2], dim=-1)).sum(-1)
         if (not torch.allclose(matrix.transpose(-1, -2) @ matrix, identity, rtol=1e-4, atol=1e-4)
-                or not torch.allclose(torch.linalg.det(matrix), matrix.new_ones(matrix.shape[:-2]),
+                or not torch.allclose(determinant, matrix.new_ones(matrix.shape[:-2]),
                                       rtol=1e-4, atol=1e-4)):
             raise ValueError("rotation must be orthogonal and proper (determinant +1)")
     if translation is not None and tuple(translation.shape) not in ((dimensions,), (views, dimensions)):
@@ -84,22 +95,50 @@ def _circular_angles(n_views, start_angle, end_angle, device, dtype):
         if not torch.isfinite(n_views).all().item():
             raise ValueError("angles must be finite")
         return n_views, n_views.numel(), n_views.device, n_views.dtype
+    _check_n_views(n_views)
     step = (end_angle - start_angle) / n_views
     angles = start_angle + torch.arange(n_views, device=device, dtype=dtype) * step
     return angles, n_views, device, dtype
 
 
-def _check_source_positions(src_pos):
+def _check_source_positions(src_pos, what="source_path_fn"):
     """Reject non-finite sources and sources at the isocenter, which have no viewing direction."""
     if not torch.isfinite(src_pos).all():
-        raise ValueError("source_path_fn returned non-finite source positions")
+        raise ValueError(f"{what} returned non-finite source positions")
     if (torch.linalg.vector_norm(src_pos.detach(), dim=1) == 0).any():
         raise ValueError(
-            "source_path_fn returned a source at the isocenter; every source needs a "
+            f"{what} returned a source at the isocenter; every source needs a "
             "nonzero distance from the origin"
         )
 
 
+def _check_n_views(n_views):
+    """Reject view counts that are not positive integers.
+
+    A float count would space ``arange(ceil(n))`` views by ``span / n``, and a
+    nonpositive count builds an empty trajectory or divides by zero.
+    """
+    try:
+        count = operator.index(n_views)
+    except TypeError:
+        count = None
+    if count is None or isinstance(n_views, bool):
+        raise TypeError(f"n_views must be a positive integer, got {n_views!r}")
+    if count < 1:
+        raise ValueError(f"n_views must be a positive integer, got {n_views!r}")
+
+
+def _check_ray_directions(ray_dir):
+    """Reject non-finite and zero ray directions, which normalize to NaN."""
+    if not torch.isfinite(ray_dir).all():
+        raise ValueError("ray_dir_fn returned non-finite ray directions")
+    if (torch.linalg.vector_norm(ray_dir.detach(), dim=1) == 0).any():
+        raise ValueError(
+            "ray_dir_fn returned a zero ray direction; every view needs a "
+            "nonzero direction vector"
+        )
+
+
 def circular_trajectory_3d(n_views, sid, sdd, start_angle=0.0, end_angle=None, device='cuda', dtype=torch.float32):
     """Generate circular trajectory geometry for cone-beam CT.
 
@@ -235,18 +274,24 @@ def random_trajectory_3d(n_views, sid_mean, sdd_mean, sid_std=0.0, pos_std=0.0,
     """
     import math
 
-    if seed is not None:
-        torch.manual_seed(seed)
-
     # Start with circular trajectory
     src_pos, det_center, det_u_vec, det_v_vec = circular_trajectory_3d(
         n_views, sid_mean, sdd_mean, device=device, dtype=dtype
     )
 
+    # Angle tensors override the requested device. Keep seeded draws on that
+    # device without changing any process-wide RNG state.
+    generator = None
+    if seed is not None:
+        # No fallback stream: a different generator would change the values.
+        generator = torch.Generator(device=src_pos.device)
+        # Match torch.manual_seed's conversion of bool, NumPy and tensor seeds.
+        generator.manual_seed(int(seed))
+
     # Add random perturbations
     if sid_std > 0.0:
         # Random SID variations
-        sid_perturbations = torch.randn(n_views, device=device, dtype=dtype) * sid_std
+        sid_perturbations = torch.randn(n_views, device=device, dtype=dtype, generator=generator) * sid_std
         sdd_perturbations = sid_perturbations.clone()  # Keep SDD-SID distance approximately constant
 
         # Compute angles from existing positions
@@ -267,12 +312,12 @@ def random_trajectory_3d(n_views, sid_mean, sdd_mean, sid_std=0.0, pos_std=0.0,
 
     if pos_std > 0.0:
         # Random 3D position offsets
-        src_pos += torch.randn_like(src_pos) * pos_std
-        det_center += torch.randn_like(det_center) * pos_std
+        src_pos += torch.empty_like(src_pos).normal_(generator=generator) * pos_std
+        det_center += torch.empty_like(det_center).normal_(generator=generator) * pos_std
 
     if angle_std > 0.0:
         # Random angular perturbations (rotate detector orientation)
-        angle_perturbations = torch.randn(n_views, device=device, dtype=dtype) * angle_std
+        angle_perturbations = torch.randn(n_views, device=device, dtype=dtype, generator=generator) * angle_std
         cos_perturb = torch.cos(angle_perturbations)
         sin_perturb = torch.sin(angle_perturbations)
 
@@ -286,6 +331,8 @@ def random_trajectory_3d(n_views, sid_mean, sdd_mean, sid_std=0.0, pos_std=0.0,
     det_u_vec = det_u_vec / torch.norm(det_u_vec, dim=1, keepdim=True)
     det_v_vec = det_v_vec / torch.norm(det_v_vec, dim=1, keepdim=True)
 
+    _check_source_positions(src_pos, "random_trajectory_3d")
+
     return src_pos, det_center, det_u_vec, det_v_vec
 
 
@@ -334,6 +381,7 @@ def spiral_trajectory_3d(n_views, sid, sdd, z_range=100.0, n_turns=2.0,
     """
     # Generate angles for spiral motion
     end_angle = start_angle + 2 * math.pi * n_turns
+    _check_n_views(n_views)
     step = (end_angle - start_angle) / n_views
     angles = start_angle + torch.arange(n_views, device=device, dtype=dtype) * step
 
@@ -419,6 +467,7 @@ def sinusoidal_trajectory_3d(n_views, sid, sdd, amplitude=50.0, frequency=2.0,
     """
     # Generate angles
     end_angle = start_angle + 2 * math.pi
+    _check_n_views(n_views)
     step = (end_angle - start_angle) / n_views
     angles = start_angle + torch.arange(n_views, device=device, dtype=dtype) * step
 
@@ -505,6 +554,7 @@ def saddle_trajectory_3d(n_views, sid, sdd, z_amplitude=50.0, radial_amplitude=3
     """
     # Generate angles
     end_angle = start_angle + 2 * math.pi
+    _check_n_views(n_views)
     step = (end_angle - start_angle) / n_views
     angles = start_angle + torch.arange(n_views, device=device, dtype=dtype) * step
 
@@ -601,6 +651,7 @@ def custom_trajectory_3d(n_views, sid, sdd,
     """
     # Generate angles
     end_angle = start_angle + 2 * math.pi
+    _check_n_views(n_views)
     step = (end_angle - start_angle) / n_views
     angles = start_angle + torch.arange(n_views, device=device, dtype=dtype) * step
 
@@ -746,6 +797,7 @@ def sinusoidal_trajectory_2d_fan(n_views, sid, sdd, amplitude=50.0, frequency=2.
     """
     # Generate angles
     end_angle = start_angle + 2 * math.pi
+    _check_n_views(n_views)
     step = (end_angle - start_angle) / n_views
     angles = start_angle + torch.arange(n_views, device=device, dtype=dtype) * step
 
@@ -829,6 +881,7 @@ def custom_trajectory_2d_fan(n_views, sid, sdd,
     """
     # Generate angles
     end_angle = start_angle + 2 * math.pi
+    _check_n_views(n_views)
     step = (end_angle - start_angle) / n_views
     angles = start_angle + torch.arange(n_views, device=device, dtype=dtype) * step
 
@@ -973,6 +1026,7 @@ def sinusoidal_trajectory_2d_parallel(n_views, amplitude=50.0, frequency=2.0,
     """
     # Generate angles
     end_angle = start_angle + math.pi
+    _check_n_views(n_views)
     step = (end_angle - start_angle) / n_views
     angles = start_angle + torch.arange(n_views, device=device, dtype=dtype) * step
 
@@ -1055,6 +1109,7 @@ def custom_trajectory_2d_parallel(n_views,
     """
     # Generate angles
     end_angle = start_angle + math.pi
+    _check_n_views(n_views)
     step = (end_angle - start_angle) / n_views
     angles = start_angle + torch.arange(n_views, device=device, dtype=dtype) * step
 
@@ -1069,6 +1124,9 @@ def custom_trajectory_2d_parallel(n_views,
         raise ValueError(f"det_origin_fn must return tensor of shape ({n_views}, 2), "
                         f"got {det_origin.shape}")
 
+    # Reject degenerate directions before normalization turns them into NaN
+    _check_ray_directions(ray_dir)
+
     # Normalize ray directions
     ray_dir = ray_dir / torch.norm(ray_dir, dim=1, keepdim=True)