about summary refs log tree commit diff
path: root/src/routes
diff options
context:
space:
mode:
authorPjotr Prins <pjotr.public01@thebird.nl>2026-10-19 07:13:15 +0000
committerPjotr Prins <pjotr.public01@thebird.nl>2026-10-19 07:13:15 +0000
commitd504b5da9f5deeece9ba2ff4dcd8baf3dfa4dc32 (patch)
treeeaed193876da61ad7d6ae55906dccf4c6198c583 /src/routes
parent477294a2aa9ae7348137271b66831ac93a6149d6 (diff)
downloadgenenetwork4-d504b5da9f5deeece9ba2ff4dcd8baf3dfa4dc32.tar.gz
gemma: compile ravanan's ccwl workflow on demand, don't check in the CWL gemma-cwl-parallel
gemma-loco.cwl was a generated artifact (ccwl compile's output), but
was being committed like hand-written source. Remove it, and have
compute_ravanan compile cwl/gemma/gemma-loco.scm to a throwaway CWL
file under its own cache dir on every call instead -- cheap (pure
macro expansion, no Guix build involved), so there's no real cost to
regenerating it fresh each time, and no risk of a stale compiled file
drifting from its ccwl source.

Config gains a ccwl_cmd knob (default "ccwl", resolved via PATH,
alongside ravanan_cmd/gemma_wrapper_cmd); gemma_ravanan_workflow now
names the .scm source, not a .cwl file. Verified end to end by running
the exact compile-then-run sequence compute_ravanan now performs
against the real ccwl/ravanan/gemma-wrapper binaries and the BXD
fixtures: same correctness and timings as before.
Diffstat (limited to 'src/routes')
-rw-r--r--src/routes/gemma.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/routes/gemma.rs b/src/routes/gemma.rs
index 85672ab..32d1818 100644
--- a/src/routes/gemma.rs
+++ b/src/routes/gemma.rs
@@ -152,8 +152,8 @@ pub async fn compute_gemma(
     description = "Same computation and request/response shape as POST \
 /compute/gemma (gemma-wrapper's K-matrix step, then its LMM association \
 step, both --loco), but driven by ravanan \
-(https://github.com/vepiteski/ravanan) running the CWL workflow at \
-cwl/gemma/gemma-loco.cwl instead of this server's own direct subprocess \
+(https://github.com/vepiteski/ravanan) running a CWL workflow compiled \
+from the ccwl source at cwl/gemma/gemma-loco.scm instead of this server's own direct subprocess \
 calls -- an alternative runner for the same two gemma-wrapper steps, \
 for comparing the two (correctness, timing). Exploratory: no caching of \
 ravanan's own store between requests beyond its --store directory, and \
@@ -204,6 +204,7 @@ pub async fn compute_gemma_ravanan(
     let config = Config::load();
     gemma::compute_ravanan(
         &config.ravanan_cmd,
+        &config.ccwl_cmd,
         &config.gemma_ravanan_workflow,
         &config.gemma_ravanan_manifest,
         &config.ravanan_cache_dir,