Skip to content

Commit c02e3ba

Browse files
Preparing to release ASP 3.1.0
1 parent 1e54e31 commit c02e3ba

File tree

11 files changed

+773
-53
lines changed

11 files changed

+773
-53
lines changed

INSTALLGUIDE.rst

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ from:
1919
No installation steps or administrative rights are necessary. Extract
2020
the archive, and run the executables in the ``bin`` subdirectory as::
2121

22-
tar -xvf StereoPipeline-3.0.0-2021-10-15-x86_64-Linux.tar.bz2
23-
./StereoPipeline-3.0.0-2021-10-15-x86_64-Linux/bin/stereo --help
22+
tar -xvf StereoPipeline-3.1.0-2022-05-18-x86_64-Linux.tar.bz2
23+
./StereoPipeline-3.1.0-2022-05-18-x86_64-Linux/bin/stereo --help
2424

2525
The result of the last command should be a help message.
2626

@@ -63,9 +63,9 @@ found. To do so, follow the ISIS installation instructions, but
6363
create a new conda environment (not the one with your current ISIS),
6464
and right before you would run ``conda install isis``, run ``conda
6565
search isis`` to find all of the versions of ISIS available for
66-
installation. For example, if you wanted to install ISIS 5.0.1, and
66+
installation. For example, if you wanted to install ISIS 6, and
6767
it is available in the ``conda search isis`` listing, you can run
68-
``conda install isis=5.0.1`` and then follow the remainder of the ISIS
68+
``conda install isis=6`` and then follow the remainder of the ISIS
6969
installation instructions.
7070

7171
In closing, running the Stereo Pipeline executables only requires
@@ -176,7 +176,7 @@ Fetching pre-compiled ASP with conda
176176
------------------------------------
177177

178178
ASP's official releases can be fetched with ``conda``. The latest such
179-
release is version 3.0.0, published on July 27, 2021. See
179+
release is version 3.1.0, published on May 18, 2022. See
180180
:numref:`news` for what changed since then. The newer functionality
181181
is available only with the daily build (:numref:`precompiled_binaries`).
182182

@@ -237,9 +237,9 @@ environments, which you don't want.
237237

238238
Install ASP with the command::
239239

240-
conda install stereo-pipeline==3.0.0
240+
conda install stereo-pipeline==3.1.0
241241

242-
This will install ASP 3.0.0 together with ISIS 5.0.1. Note that the
242+
This will install ASP 3.1.0 together with ISIS 6. Note that the
243243
latest build (see above) may have more fixes or features than this
244244
official release.
245245

@@ -258,11 +258,11 @@ found as a set of .yaml files in the ``conda`` subdirectory of the
258258
Stereo Pipeline GitHub repository. So, alternatively, the installation
259259
can happen as::
260260

261-
conda env create -f asp_3.0.0_linux_env.yaml
261+
conda env create -f asp_3.1.0_linux_env.yaml
262262

263263
or::
264264

265-
conda env create -f asp_3.0.0_osx_env.yaml
265+
conda env create -f asp_3.1.0_osx_env.yaml
266266

267267
depending on your platform. Then invoke, as earlier::
268268

@@ -293,11 +293,11 @@ The environments having the ASP dependencies are in the ``conda``
293293
directory of the Stereo Pipeline repository, as above. After
294294
downloading those, one can run on Linux::
295295

296-
conda env create -f asp_deps_3.0.0_linux_env.yaml
296+
conda env create -f asp_deps_3.1.0_linux_env.yaml
297297

298298
or on the Mac::
299299

300-
conda env create -f asp_deps_3.0.0_osx_env.yaml
300+
conda env create -f asp_deps_3.1.0_osx_env.yaml
301301

302302
This will create an ``asp_deps`` environment. Activate it with::
303303

@@ -337,7 +337,7 @@ Building VisionWorkbench and Stereo Pipeline on Linux::
337337
$envPath/bin/git clone \
338338
git@github.com:visionworkbench/visionworkbench.git
339339
cd visionworkbench
340-
git checkout 3.0.0 # check out the desired commit
340+
git checkout 3.1.0 # check out the desired commit
341341
mkdir -p build
342342
cd build
343343
$envPath/bin/cmake .. \
@@ -354,7 +354,7 @@ Building VisionWorkbench and Stereo Pipeline on Linux::
354354
$envPath/bin/git clone \
355355
git@github.com:NeoGeographyToolkit/StereoPipeline.git
356356
cd StereoPipeline
357-
git checkout 3.0.0 # check out the desired commit
357+
git checkout 3.1.0 # check out the desired commit
358358
mkdir -p build
359359
cd build
360360
$envPath/bin/cmake .. \
@@ -374,7 +374,7 @@ Building VisionWorkbench and ASP on OSX (just as above, but omitting the compile
374374
$envPath/bin/git clone \
375375
git@github.com:visionworkbench/visionworkbench.git
376376
cd visionworkbench
377-
git checkout 3.0.0 # check out the desired commit
377+
git checkout 3.1.0 # check out the desired commit
378378
mkdir -p build
379379
cd build
380380
$envPath/bin/cmake .. \
@@ -389,7 +389,7 @@ Building VisionWorkbench and ASP on OSX (just as above, but omitting the compile
389389
$envPath/bin/git clone \
390390
git@github.com:NeoGeographyToolkit/StereoPipeline.git
391391
cd StereoPipeline
392-
git checkout 3.0.0 # check out the desired commit
392+
git checkout 3.1.0 # check out the desired commit
393393
mkdir -p build
394394
cd build
395395
$envPath/bin/cmake .. \

NEWS.rst

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Additions to the latest build (since last official release)
2-
-----------------------------------------------------------
1+
RELEASE 3.1.0, May 18, 2022
2+
----------------------------
33

44
New camera additions:
55
* Added support for the USGSCSM Frame, SAR, and PushFrame sensors
@@ -27,6 +27,19 @@ New tool additions:
2727
alignment transform type (translation, rigid, similarity, affine,
2828
and homography).
2929

30+
isis:
31+
* Using ISIS 6.0.0.
32+
33+
csm:
34+
* Save the camera state on multiple lines. On reading both the
35+
single-line and multiple-line formats are accepted.
36+
* Bundle adjustment, mapproject, and SfS with the CSM model can be
37+
7-15 times faster than done with the corresponding ISIS model.
38+
It is strongly suggested to use CSM for large-scale processing.
39+
* Bugfix in CSM linescan implementation for some LRO NAC sensors.
40+
Also replaced the fixed-point method with the secant method in the
41+
ground-to-image logic for CSM linescan cameras, which is faster.
42+
3043
parallel_stereo:
3144
* Many fixes for reliability of stereo with local epipolar alignment.
3245
* Added the option ``--resume-at-corr``. Start at the correlation stage
@@ -118,16 +131,6 @@ bundle_adjust:
118131
* Add new options for reusing a previous run:
119132
``--match-files-prefix`` and ``--clean-match-files-prefix``.
120133

121-
csm:
122-
* Save the camera state on multiple lines. On reading both the
123-
single-line and multiple-line formats are accepted.
124-
* Bundle adjustment, mapproject, and SfS with the CSM model can be
125-
7-15 times faster than done with the corresponding ISIS model.
126-
It is strongly suggested to use CSM for large-scale processing.
127-
* Bugfix in CSM linescan implementation for some LRO NAC sensors.
128-
Also replaced the fixed-point method with the secant method in the
129-
ground-to-image logic for CSM linescan cameras, which is faster.
130-
131134
sfs:
132135
* SfS was made to work with any camera model supported by ASP,
133136
including for Earth. For non-ISIS and non-CSM cameras, the option

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ you can add the following line to your shell configuration (e.g.,
5454
``~/.bashrc``), replacing ``/path/to/StereoPipeline/bin`` with the location
5555
on your filesystem: ``export PATH=${PATH}:/path/to/StereoPipeline/bin``
5656

57-
*ISIS Users*: Please install USGS ISIS version 5.0.1 or later if you
57+
*ISIS Users*: Please install USGS ISIS version 6 or later if you
5858
would like to process NASA non-terrestrial images. Users wishing to
5959
process Earth images, such as Digital Globe, satellites with RPC
6060
cameras, or various frame/pinhole cameras do not need to download

RELEASEGUIDE

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ https://semver.org for guidance).
9595
Test all binary releases on different machines by running
9696
StereoPipelineTest.
9797

98-
NOTE: The step above is done automatically by running on lunokhod2
98+
NOTE: The step above is done automatically by running on lunokhod1
9999
the script
100100

101101
$HOME/projects/BinaryBuilder/auto_build/launch_master.sh
@@ -108,22 +108,22 @@ The resulting release tarballs will go to BinaryBuilder/asp_tarballs.
108108

109109
8.) Commit and tag the release in the VW and ASP repos. Example:
110110

111-
git tag 3.0.0
111+
git tag 3.1.0
112112

113113
Push the tags to the remote server with:
114114

115-
git push origin 3.0.0 # commit to your branch
116-
git push god 3.0.0 # commit to main branch
115+
git push origin 3.1.0 # commit to your branch
116+
git push god 3.1.0 # commit to main branch
117117

118118
(Here it is assumed that 'origin' points to your own fork and 'god'
119119
points to the parent repository.)
120120

121121
If more commits were made and it is desired to apply this tag to a
122122
different commit, first remove the exiting tag with:
123123

124-
git tag -d 3.0.0
125-
git push origin :refs/tags/3.0.0
126-
git push god :refs/tags/3.0.0
124+
git tag -d 3.1.0
125+
git push origin :refs/tags/3.1.0
126+
git push god :refs/tags/3.1.0
127127

128128
9.) Upload the builds and the pdf documentation to GitHub, in the
129129
release area.
@@ -160,9 +160,9 @@ development, by updating the version number in:
160160

161161
in both the VW and ASP repositories.
162162

163-
If you just released version 3.0.0, we expect that the next feature
164-
release will be 3.1.0, if a major release, or 3.0.1 if a minor
165-
release, so the version tag should be updated to 3.1.0-alpha in
163+
If you just released version 3.1.0, we expect that the next feature
164+
release will be 3.2.0, if a major release, or 3.1.1 if a minor
165+
release, so the version tag should be updated to 3.2.0-alpha in
166166
anticipation (see https://semver.org for guidance).
167167

168168
13.) Reflect any changes in release policy by modifying this document.

0 commit comments

Comments
 (0)