Merge pull request #139 from oshaughnessy-junior/rift_O4d_junior_calmarg_in_loop

Rift o4d junior calmarg in loop: AFTER main 'distance' merge

Author: oshaughn

.github/workflows/ci.yml

@@ -134,6 +134,27 @@ jobs:
       - name: Run simulation_manager smoke test
         run: bash .travis/test-simulation-manager.sh
 
+  lisa-check:
+    needs: install
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+          cache: 'pip'
+          cache-dependency-path: requirements.txt
+      - name: Enable symlink
+        run: sudo ln -sf $(which python3) /usr/bin/python
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip --break-system-packages
+          python -m pip install -r requirements.txt --break-system-packages
+          python -m pip install coverage pytest --break-system-packages
+          python -m pip install --editable . --break-system-packages
+      - name: Run LISA smoke and contract tests
+        run: bash .travis/test-lisa.sh
+
   integration-check:
     needs: install
     runs-on: ubuntu-latest

.gitlab-ci.yml

@@ -87,6 +87,10 @@ import_check:
   stage: system tests
   script:
     - python .travis/test-all-mod.py
+    - python -m pytest -q MonteCarloMarginalizeCode/Code/test/test_lisa_response_import.py
+    - python -m pytest -q MonteCarloMarginalizeCode/Code/test/test_lisa_lalsimutils_compat.py
+    - python -m pytest -q MonteCarloMarginalizeCode/Code/test/test_lisa_operational_synthetic.py
+    - python -m pytest -q MonteCarloMarginalizeCode/Code/test/test_lisa_helper_contract.py
 
 sim_manager_check:
   stage: unit tests

.travis/test-all-bin.sh

@@ -17,6 +17,10 @@ set -e
 
 # loop over all bin/ scripts
 for EXE in MonteCarloMarginalizeCode/Code/bin/*; do
+   if [[ ! -f ${EXE} ]]; then
+       echo " Not file : " ${EXE}
+       continue
+   fi
    # skip scripts with explicit bilby dependence
    if [[ ${EXE} == *'calibration_reweighting.py' ]]; then
        continue
@@ -70,6 +74,16 @@ for EXE in MonteCarloMarginalizeCode/Code/bin/*; do
          echo "Hyperpipe  " ${EXE}
          continue
    fi   
+   # skip optional JAX driver; base CI does not install the jax extras
+   if [[ ${EXE} == *"integrate_likelihood_extrinsic_jax" ]]; then
+         echo "JAX optional  " ${EXE}
+         continue
+   fi
+   # skip optional HTCondor2 driver; base CI does not install htcondor2
+   if [[ ${EXE} == *"cepp_basic_htcondor" ]]; then
+         echo "HTCondor2 optional  " ${EXE}
+         continue
+   fi
    # skip tests that require condor environment
    if [[ ${EXE} == *"check_CIP_complete_work.py" ]]; then
          continue

.travis/test-all-mod.py

@@ -57,6 +57,20 @@
     r"\ANo module named 'cupy'\Z",
     r"\ANo module named asimov\Z",
     r"\ANo module named 'asimov'\Z",
+    r"\ANo module named jax\Z",
+    r"\ANo module named 'jax'\Z",
+    r"\ANo module named optax\Z",
+    r"\ANo module named 'optax'\Z",
+    r"\ANo module named equinox\Z",
+    r"\ANo module named 'equinox'\Z",
+    r"\ANo module named tinygp\Z",
+    r"\ANo module named 'tinygp'\Z",
+    r"\ANo module named numpyro\Z",
+    r"\ANo module named 'numpyro'\Z",
+    r"\ANo module named flowMC\Z",
+    r"\ANo module named 'flowMC'\Z",
+    r"\ANo module named htcondor2\Z",
+    r"\ANo module named 'htcondor2'\Z",
 ])))
 
 

.travis/test-lisa.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+PYTHON_BIN="${RIFT_LISA_PYTHON:-${PYTHON:-python}}"
+if ! command -v "${PYTHON_BIN}" >/dev/null 2>&1; then
+  PYTHON_BIN="$(command -v python3)"
+fi
+
+"${PYTHON_BIN}" -m pytest -q \
+  MonteCarloMarginalizeCode/Code/test/test_lisa_auxiliary_imports.py \
+  MonteCarloMarginalizeCode/Code/test/test_lisa_response_import.py \
+  MonteCarloMarginalizeCode/Code/test/test_lisa_lalsimutils_compat.py \
+  MonteCarloMarginalizeCode/Code/test/test_lisa_run_checks.py \
+  MonteCarloMarginalizeCode/Code/test/test_lisa_demo_contract.py \
+  MonteCarloMarginalizeCode/Code/test/test_lisa_helper_contract.py \
+  MonteCarloMarginalizeCode/Code/test/test_lisa_pseudo_pipe_contract.py \
+  MonteCarloMarginalizeCode/Code/test/test_lisa_pp_surface.py \
+  MonteCarloMarginalizeCode/Code/test/test_lisa_synthetic_demo.py

CHANGES.rst

@@ -2,6 +2,11 @@
 0.0.18.0
 ------------
 development tree is rift_O4d.
+  - (rc0) O4d base refresh, from rift_O4c to rift_O4d: Python/numpy CI modernization (py3.10-py3.13,
+    numpy 2.x checks), Asimov/RIFT smoke tests, docs deployment, pluggable workflow backends and
+    simulation-manager prototypes, distance-grid/distance-slice likelihood export, container-family and pixi/SWIG
+    canaries, hyperpipeline ASCII workflow support, parsimonious-placement preview, EFPE and standalone NR-frame
+    utilities, plot_RIFT diagnostics, and GPU/CuPy portability fixes.
 
 ** (rc0)
   - parsimonious-placement (preview): new RIFT.misc.tracer_placement engine (SMC+MALA, birth-death,
@@ -37,6 +42,24 @@ development tree is rift_O4d.
   - ascii data format; waveforms (epfe);  container auto-selection framework (first draft); cepp_alternate now feature-parity;
     mcsamplerEnsemble full GPU path
   - multiple demos
+  - (rc1 pending) In-loop calibration marginalization: move calibration draws into ILE, add loop and fused
+    GPU kernels (including distance-marginalized and phase-marginalized paths), export cal/time diagnostics,
+    account for calibration Monte-Carlo error in reported uncertainty, add adaptive/pilot calibration proposal
+    scaffolding, and include a runnable calmarg demo with OSG/container transfer fixes.
+  - (rc1 pending) Extrinsic proposal handoff and sampler robustness: save and consolidate extrinsic GMM
+    breadcrumbs across iterations, seed later ILE jobs from those proposals, add GMM proposal/adaptation
+    controls and diagnostics, improve log-domain covariance/ESS handling, and thread the cal/extrinsic seed
+    barriers through CEPP/puffball workflows.
+  - (rc1 pending) Differentiable JAX likelihood/export work: optional jax_gp interpolators, differentiable
+    export artifacts, quad-GP and RF/GP validation tooling, jax_cip experiments, and a JAX ILE driver with
+    AD-compatible extrinsic likelihood, distance/phase marginalization, network coordinates, and gradient-aware
+    samplers. These remain optional extras and are skipped by base CI when JAX is not installed.
+  - (rc1 pending) LISA support: add a LISA compatibility layer, response import path, standalone helper
+    contract, LISA ILE scaffold, and synthetic operational/import tests.
+  - (rc1 pending) EOS/coordinate and workflow updates: add NMB/PCA/tabular EOS sequence dispatch and
+    single-EOS-index evidence support, coordinate-plugin hooks for posterior plotting and puffing, Morisaki-frame
+    and aligned-spin coordinate helpers for GP/JAX studies, container-universe/OSDF scitokens support, and
+    per-machine container image selection.
 
 0.0.17.9
 ------------

MonteCarloMarginalizeCode/Code/RIFT/LISA/__init__.py

@@ -0,0 +1,2 @@
+"""LISA-specific response and analysis helpers for RIFT."""
+

MonteCarloMarginalizeCode/Code/RIFT/LISA/initial_grid/__init__.py

@@ -0,0 +1 @@
+"""Initial-grid helpers for LISA analyses."""