Skip to content

Commit 8ba84af

Browse files
authored
Upgrade to ASP 3.7.0 (#13)
Bump pinned ASP 3.6.0 (2025-12-26) → 3.7.0 (2026-06-08) across the Dockerfile, devcontainer fallback args, build-image workflow, and install docs. Adapt the tutorials to 3.7.0 CLI changes: - Drop --aster-use-csm (removed in 3.7.0; CSM is now the ASTER default). - Pass the mapprojection reference DEM to parallel_stereo via --dem instead of as the trailing positional argument (notebooks 01/02/03). mapproject still takes the DEM positionally, so it is unchanged. Fix the stale docs/start/installation.md path in asp-version-check.yml (the file lives at docs/reference/installation.md), which had silently no-op'd the docs portion of the auto-bump.
1 parent a5d5d8c commit 8ba84af

8 files changed

Lines changed: 26 additions & 29 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
FROM mcr.microsoft.com/devcontainers/miniconda:1-3
1414

15-
ARG ASP_VERSION=3.6.0
16-
ARG ASP_BUILD_DATE=2025-12-26
15+
ARG ASP_VERSION=3.7.0
16+
ARG ASP_BUILD_DATE=2026-06-08
1717
ARG ASP_TARBALL=StereoPipeline-${ASP_VERSION}-${ASP_BUILD_DATE}-x86_64-Linux.tar.bz2
1818
ARG ASP_URL=https://github.com/NeoGeographyToolkit/StereoPipeline/releases/download/${ASP_VERSION}/${ASP_TARBALL}
1919

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
// "dockerfile": "Dockerfile",
2020
// "context": "..",
2121
// "args": {
22-
// "ASP_VERSION": "3.6.0",
23-
// "ASP_BUILD_DATE": "2025-12-26"
22+
// "ASP_VERSION": "3.7.0",
23+
// "ASP_BUILD_DATE": "2026-06-08"
2424
// }
2525
// },
2626

.github/workflows/asp-version-check.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ jobs:
137137
# 4. Install docs — the local-install snippet has a literal
138138
# ASP_VERSION=... / ASP_BUILD_DATE=... block, plus a "verify"
139139
# comment showing the version string.
140-
sed -i -E "s|^(ASP_VERSION=)${OLD_V}|\1${NEW_V}|" docs/start/installation.md
141-
sed -i -E "s|^(ASP_BUILD_DATE=)${OLD_D}|\1${NEW_D}|" docs/start/installation.md
142-
sed -i -E "s|(parallel_stereo \(Ames Stereo Pipeline\) )${OLD_V}|\1${NEW_V}|" docs/start/installation.md
140+
sed -i -E "s|^(ASP_VERSION=)${OLD_V}|\1${NEW_V}|" docs/reference/installation.md
141+
sed -i -E "s|^(ASP_BUILD_DATE=)${OLD_D}|\1${NEW_D}|" docs/reference/installation.md
142+
sed -i -E "s|(parallel_stereo \(Ames Stereo Pipeline\) )${OLD_V}|\1${NEW_V}|" docs/reference/installation.md
143143
144144
# Show what changed for the workflow log.
145145
git diff --stat
@@ -166,7 +166,7 @@ jobs:
166166
- `.devcontainer/Dockerfile` — `ARG ASP_VERSION` / `ARG ASP_BUILD_DATE`
167167
- `.devcontainer/devcontainer.json` — fallback build-args (commented block)
168168
- `.github/workflows/build-image.yml` — workflow_dispatch defaults
169-
- `docs/start/installation.md` — local-install snippet + verify line
169+
- `docs/reference/installation.md` — local-install snippet + verify line
170170
171171
### Before merging — quick checklist
172172
- [ ] Read the [ASP release notes](https://github.com/NeoGeographyToolkit/StereoPipeline/releases/tag/${{ steps.asp.outputs.version }}) for breaking changes that might affect the tutorial notebooks (CLI flag renames, new sensor-prep paths, output-file renames).

.github/workflows/build-image.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ on:
3030
workflow_dispatch:
3131
inputs:
3232
asp_version:
33-
description: 'ASP version (e.g. 3.6.0)'
33+
description: 'ASP version (e.g. 3.7.0)'
3434
required: false
35-
default: '3.6.0'
35+
default: '3.7.0'
3636
asp_build_date:
3737
description: 'ASP release build date (YYYY-MM-DD as it appears in the tarball filename)'
3838
required: false
39-
default: '2025-12-26'
39+
default: '2026-06-08'
4040
schedule:
4141
# Monthly rebuild so security updates from the base image flow through
4242
# even when our Dockerfile/environment.yml are unchanged.
@@ -73,8 +73,8 @@ jobs:
7373
- name: Resolve ASP build args
7474
id: asp
7575
run: |
76-
echo "version=${{ github.event.inputs.asp_version || '3.6.0' }}" >> "$GITHUB_OUTPUT"
77-
echo "date=${{ github.event.inputs.asp_build_date || '2025-12-26' }}" >> "$GITHUB_OUTPUT"
76+
echo "version=${{ github.event.inputs.asp_version || '3.7.0' }}" >> "$GITHUB_OUTPUT"
77+
echo "date=${{ github.event.inputs.asp_build_date || '2026-06-08' }}" >> "$GITHUB_OUTPUT"
7878
7979
- name: Compute image tags
8080
id: meta

docs/reference/installation.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ Download the latest release tarball from the [ASP releases page](https://github.
1414

1515
```bash
1616
# Example for Linux x86_64; pick the right tarball for your platform.
17-
ASP_VERSION=3.6.0
18-
ASP_BUILD_DATE=2025-12-26
17+
ASP_VERSION=3.7.0
18+
ASP_BUILD_DATE=2026-06-08
1919
curl -fL -o asp.tar.bz2 \
2020
https://github.com/NeoGeographyToolkit/StereoPipeline/releases/download/${ASP_VERSION}/StereoPipeline-${ASP_VERSION}-${ASP_BUILD_DATE}-x86_64-Linux.tar.bz2
2121

@@ -31,7 +31,7 @@ Verify:
3131

3232
```bash
3333
parallel_stereo --version
34-
# parallel_stereo (Ames Stereo Pipeline) 3.6.0
34+
# parallel_stereo (Ames Stereo Pipeline) 3.7.0
3535
```
3636

3737
## Step 2 — Install `asp-plot`

notebooks/01_aster_rainier.ipynb

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@
103103
"- `-t aster` selects the ASTER session (knows about ASTER cameras).\n",
104104
"- `--stereo-algorithm asp_bm`: plain block matching, fast.\n",
105105
"- `--subpixel-mode 1`: parabolic subpixel refinement, cheaper than Bayes-EM.\n",
106-
"- `--aster-use-csm` uses the Community Sensor Model camera.\n",
107106
"- `--processes 4 --threads-multiprocess 1` matches the 4-core Codespace floor. On a larger machine, bump `--processes` to your core count.\n"
108107
]
109108
},
@@ -121,7 +120,6 @@
121120
" !parallel_stereo -t aster \\\n",
122121
" --stereo-algorithm asp_bm \\\n",
123122
" --subpixel-mode 1 \\\n",
124-
" --aster-use-csm \\\n",
125123
" --processes 4 --threads-multiprocess 1 \\\n",
126124
" {DATA}/out-Band3N.tif {DATA}/out-Band3B.tif \\\n",
127125
" {DATA}/out-Band3N.xml {DATA}/out-Band3B.xml \\\n",
@@ -238,25 +236,24 @@
238236
"if Path(f\"{DATA}/stereo_ortho/run-DEM.tif\").exists():\n",
239237
" print(f\"{DATA}/stereo_ortho/run-DEM.tif exists — skipping mapprojected pass. Delete {DATA}/stereo_ortho/ to reprocess.\")\n",
240238
"else:\n",
241-
" !mapproject --t_srs {T_SRS} --tr 15 --aster-use-csm \\\n",
239+
" !mapproject --t_srs {T_SRS} --tr 15 \\\n",
242240
" {REF_DEM} \\\n",
243241
" {DATA}/out-Band3N.tif {DATA}/out-Band3N.xml \\\n",
244242
" {DATA}/out-Band3N_ortho.tif\n",
245243
"\n",
246-
" !mapproject --t_srs {T_SRS} --tr 15 --aster-use-csm \\\n",
244+
" !mapproject --t_srs {T_SRS} --tr 15 \\\n",
247245
" {REF_DEM} \\\n",
248246
" {DATA}/out-Band3B.tif {DATA}/out-Band3B.xml \\\n",
249247
" {DATA}/out-Band3B_ortho.tif\n",
250248
"\n",
251249
" !parallel_stereo -t aster \\\n",
252250
" --stereo-algorithm asp_mgm \\\n",
253251
" --subpixel-mode 9 \\\n",
254-
" --aster-use-csm \\\n",
252+
" --dem {REF_DEM} \\\n",
255253
" --processes 1 --threads-multiprocess 4 \\\n",
256254
" {DATA}/out-Band3N_ortho.tif {DATA}/out-Band3B_ortho.tif \\\n",
257255
" {DATA}/out-Band3N.xml {DATA}/out-Band3B.xml \\\n",
258-
" {DATA}/stereo_ortho/run \\\n",
259-
" {REF_DEM}\n",
256+
" {DATA}/stereo_ortho/run\n",
260257
"\n",
261258
" !point2dem --tr 30 -r earth --auto-proj-center --errorimage {DATA}/stereo_ortho/run-PC.tif\n",
262259
"\n",

notebooks/02_worldview_ucsd.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
"source": [
182182
"## 5. Stereo + DEM\n",
183183
"\n",
184-
"Stereo on the orthorectified pair. The inputs are now nearly aligned in geographic space, so the matcher's search range is small. Pass the reference DEM as the final argument so the matcher knows the grid.\n",
184+
"Stereo on the orthorectified pair. The inputs are now nearly aligned in geographic space, so the matcher's search range is small. Pass the reference DEM via `--dem` so the matcher knows the grid.\n",
185185
"\n",
186186
"`point2dem` grids the point cloud at 4 m, roughly 4× the image GSD, a common rule of thumb for stereo DEM resolution.\n",
187187
"\n",
@@ -205,12 +205,12 @@
205205
" --threads-singleprocess 4 \\\n",
206206
" --stereo-algorithm asp_mgm \\\n",
207207
" --subpixel-mode 9 \\\n",
208+
" --dem {REF_DEM} \\\n",
208209
" {DATA}/1040010007A93700_P001_ortho.tif \\\n",
209210
" {DATA}/1040010007CA4D00_P001_ortho.tif \\\n",
210211
" {DATA}/1040010007A93700_P001.xml \\\n",
211212
" {DATA}/1040010007CA4D00_P001.xml \\\n",
212-
" {DATA}/stereo/run \\\n",
213-
" {REF_DEM}\n",
213+
" {DATA}/stereo/run\n",
214214
"\n",
215215
" !point2dem --tr 4.0 -r earth --errorimage {DATA}/stereo/run-PC.tif\n",
216216
"\n",

notebooks/03_worldview_ucsd_ba.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
"source": [
240240
"## 6. Stereo + DEM\n",
241241
"\n",
242-
"Stereo on the orthorectified pair. The inputs are now nearly aligned in geographic space, so the matcher's search range is small. Pass the reference DEM as the final argument so the matcher knows the grid.\n",
242+
"Stereo on the orthorectified pair. The inputs are now nearly aligned in geographic space, so the matcher's search range is small. Pass the reference DEM via `--dem` so the matcher knows the grid.\n",
243243
"\n",
244244
"`point2dem` grids the point cloud at 4 m, roughly 4× the image GSD, a common rule of thumb for stereo DEM resolution.\n",
245245
"\n",
@@ -264,12 +264,12 @@
264264
" --stereo-algorithm asp_mgm \\\n",
265265
" --subpixel-mode 9 \\\n",
266266
" --bundle-adjust-prefix {DATA}/ba/run \\\n",
267+
" --dem {REF_DEM} \\\n",
267268
" {DATA}/1040010007A93700_P001_ortho_ba.tif \\\n",
268269
" {DATA}/1040010007CA4D00_P001_ortho_ba.tif \\\n",
269270
" {DATA}/1040010007A93700_P001.xml \\\n",
270271
" {DATA}/1040010007CA4D00_P001.xml \\\n",
271-
" {DATA}/stereo_ba/run \\\n",
272-
" {REF_DEM}\n",
272+
" {DATA}/stereo_ba/run\n",
273273
"\n",
274274
" !point2dem --tr 4.0 -r earth --errorimage {DATA}/stereo_ba/run-PC.tif\n",
275275
"\n",

0 commit comments

Comments
 (0)