From c02e3ba2a0c59b41a7c667e289f6f77539e94efe Mon Sep 17 00:00:00 2001 From: Oleg Alexandrov Date: Tue, 17 May 2022 21:45:01 -0700 Subject: [PATCH] Preparing to release ASP 3.1.0 --- INSTALLGUIDE.rst | 30 ++--- NEWS.rst | 27 ++-- README.rst | 2 +- RELEASEGUIDE | 20 +-- conda/asp_3.1.0_linux_env.yaml | 190 ++++++++++++++++++++++++++++ conda/asp_3.1.0_osx_env.yaml | 171 +++++++++++++++++++++++++ conda/asp_deps_3.1.0_linux_env.yaml | 188 +++++++++++++++++++++++++++ conda/asp_deps_3.1.0_osx_env.yaml | 169 +++++++++++++++++++++++++ docs/conda_build.rst | 23 ++-- src/CMakeLists.txt | 4 +- src/asp/Core/Bathymetry.cc | 2 +- 11 files changed, 773 insertions(+), 53 deletions(-) create mode 100644 conda/asp_3.1.0_linux_env.yaml create mode 100644 conda/asp_3.1.0_osx_env.yaml create mode 100644 conda/asp_deps_3.1.0_linux_env.yaml create mode 100644 conda/asp_deps_3.1.0_osx_env.yaml diff --git a/INSTALLGUIDE.rst b/INSTALLGUIDE.rst index 57998a406..d4ec0a641 100644 --- a/INSTALLGUIDE.rst +++ b/INSTALLGUIDE.rst @@ -19,8 +19,8 @@ from: No installation steps or administrative rights are necessary. Extract the archive, and run the executables in the ``bin`` subdirectory as:: - tar -xvf StereoPipeline-3.0.0-2021-10-15-x86_64-Linux.tar.bz2 - ./StereoPipeline-3.0.0-2021-10-15-x86_64-Linux/bin/stereo --help + tar -xvf StereoPipeline-3.1.0-2022-05-18-x86_64-Linux.tar.bz2 + ./StereoPipeline-3.1.0-2022-05-18-x86_64-Linux/bin/stereo --help The result of the last command should be a help message. @@ -63,9 +63,9 @@ found. To do so, follow the ISIS installation instructions, but create a new conda environment (not the one with your current ISIS), and right before you would run ``conda install isis``, run ``conda search isis`` to find all of the versions of ISIS available for -installation. For example, if you wanted to install ISIS 5.0.1, and +installation. For example, if you wanted to install ISIS 6, and it is available in the ``conda search isis`` listing, you can run -``conda install isis=5.0.1`` and then follow the remainder of the ISIS +``conda install isis=6`` and then follow the remainder of the ISIS installation instructions. In closing, running the Stereo Pipeline executables only requires @@ -176,7 +176,7 @@ Fetching pre-compiled ASP with conda ------------------------------------ ASP's official releases can be fetched with ``conda``. The latest such -release is version 3.0.0, published on July 27, 2021. See +release is version 3.1.0, published on May 18, 2022. See :numref:`news` for what changed since then. The newer functionality is available only with the daily build (:numref:`precompiled_binaries`). @@ -237,9 +237,9 @@ environments, which you don't want. Install ASP with the command:: - conda install stereo-pipeline==3.0.0 + conda install stereo-pipeline==3.1.0 -This will install ASP 3.0.0 together with ISIS 5.0.1. Note that the +This will install ASP 3.1.0 together with ISIS 6. Note that the latest build (see above) may have more fixes or features than this official release. @@ -258,11 +258,11 @@ found as a set of .yaml files in the ``conda`` subdirectory of the Stereo Pipeline GitHub repository. So, alternatively, the installation can happen as:: - conda env create -f asp_3.0.0_linux_env.yaml + conda env create -f asp_3.1.0_linux_env.yaml or:: - conda env create -f asp_3.0.0_osx_env.yaml + conda env create -f asp_3.1.0_osx_env.yaml depending on your platform. Then invoke, as earlier:: @@ -293,11 +293,11 @@ The environments having the ASP dependencies are in the ``conda`` directory of the Stereo Pipeline repository, as above. After downloading those, one can run on Linux:: - conda env create -f asp_deps_3.0.0_linux_env.yaml + conda env create -f asp_deps_3.1.0_linux_env.yaml or on the Mac:: - conda env create -f asp_deps_3.0.0_osx_env.yaml + conda env create -f asp_deps_3.1.0_osx_env.yaml This will create an ``asp_deps`` environment. Activate it with:: @@ -337,7 +337,7 @@ Building VisionWorkbench and Stereo Pipeline on Linux:: $envPath/bin/git clone \ git@github.com:visionworkbench/visionworkbench.git cd visionworkbench - git checkout 3.0.0 # check out the desired commit + git checkout 3.1.0 # check out the desired commit mkdir -p build cd build $envPath/bin/cmake .. \ @@ -354,7 +354,7 @@ Building VisionWorkbench and Stereo Pipeline on Linux:: $envPath/bin/git clone \ git@github.com:NeoGeographyToolkit/StereoPipeline.git cd StereoPipeline - git checkout 3.0.0 # check out the desired commit + git checkout 3.1.0 # check out the desired commit mkdir -p build cd build $envPath/bin/cmake .. \ @@ -374,7 +374,7 @@ Building VisionWorkbench and ASP on OSX (just as above, but omitting the compile $envPath/bin/git clone \ git@github.com:visionworkbench/visionworkbench.git cd visionworkbench - git checkout 3.0.0 # check out the desired commit + git checkout 3.1.0 # check out the desired commit mkdir -p build cd build $envPath/bin/cmake .. \ @@ -389,7 +389,7 @@ Building VisionWorkbench and ASP on OSX (just as above, but omitting the compile $envPath/bin/git clone \ git@github.com:NeoGeographyToolkit/StereoPipeline.git cd StereoPipeline - git checkout 3.0.0 # check out the desired commit + git checkout 3.1.0 # check out the desired commit mkdir -p build cd build $envPath/bin/cmake .. \ diff --git a/NEWS.rst b/NEWS.rst index ca0d4edb1..f57d5ebd8 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -1,5 +1,5 @@ -Additions to the latest build (since last official release) ------------------------------------------------------------ +RELEASE 3.1.0, May 18, 2022 +---------------------------- New camera additions: * Added support for the USGSCSM Frame, SAR, and PushFrame sensors @@ -27,6 +27,19 @@ New tool additions: alignment transform type (translation, rigid, similarity, affine, and homography). +isis: + * Using ISIS 6.0.0. + +csm: + * Save the camera state on multiple lines. On reading both the + single-line and multiple-line formats are accepted. + * Bundle adjustment, mapproject, and SfS with the CSM model can be + 7-15 times faster than done with the corresponding ISIS model. + It is strongly suggested to use CSM for large-scale processing. + * Bugfix in CSM linescan implementation for some LRO NAC sensors. + Also replaced the fixed-point method with the secant method in the + ground-to-image logic for CSM linescan cameras, which is faster. + parallel_stereo: * Many fixes for reliability of stereo with local epipolar alignment. * Added the option ``--resume-at-corr``. Start at the correlation stage @@ -118,16 +131,6 @@ bundle_adjust: * Add new options for reusing a previous run: ``--match-files-prefix`` and ``--clean-match-files-prefix``. -csm: - * Save the camera state on multiple lines. On reading both the - single-line and multiple-line formats are accepted. - * Bundle adjustment, mapproject, and SfS with the CSM model can be - 7-15 times faster than done with the corresponding ISIS model. - It is strongly suggested to use CSM for large-scale processing. - * Bugfix in CSM linescan implementation for some LRO NAC sensors. - Also replaced the fixed-point method with the secant method in the - ground-to-image logic for CSM linescan cameras, which is faster. - sfs: * SfS was made to work with any camera model supported by ASP, including for Earth. For non-ISIS and non-CSM cameras, the option diff --git a/README.rst b/README.rst index 2bc5fdb53..18563d3e5 100644 --- a/README.rst +++ b/README.rst @@ -54,7 +54,7 @@ you can add the following line to your shell configuration (e.g., ``~/.bashrc``), replacing ``/path/to/StereoPipeline/bin`` with the location on your filesystem: ``export PATH=${PATH}:/path/to/StereoPipeline/bin`` -*ISIS Users*: Please install USGS ISIS version 5.0.1 or later if you +*ISIS Users*: Please install USGS ISIS version 6 or later if you would like to process NASA non-terrestrial images. Users wishing to process Earth images, such as Digital Globe, satellites with RPC cameras, or various frame/pinhole cameras do not need to download diff --git a/RELEASEGUIDE b/RELEASEGUIDE index 52658bb3f..5a05a4fb8 100644 --- a/RELEASEGUIDE +++ b/RELEASEGUIDE @@ -95,7 +95,7 @@ https://semver.org for guidance). Test all binary releases on different machines by running StereoPipelineTest. - NOTE: The step above is done automatically by running on lunokhod2 + NOTE: The step above is done automatically by running on lunokhod1 the script $HOME/projects/BinaryBuilder/auto_build/launch_master.sh @@ -108,12 +108,12 @@ The resulting release tarballs will go to BinaryBuilder/asp_tarballs. 8.) Commit and tag the release in the VW and ASP repos. Example: - git tag 3.0.0 + git tag 3.1.0 Push the tags to the remote server with: - git push origin 3.0.0 # commit to your branch - git push god 3.0.0 # commit to main branch + git push origin 3.1.0 # commit to your branch + git push god 3.1.0 # commit to main branch (Here it is assumed that 'origin' points to your own fork and 'god' points to the parent repository.) @@ -121,9 +121,9 @@ points to the parent repository.) If more commits were made and it is desired to apply this tag to a different commit, first remove the exiting tag with: - git tag -d 3.0.0 - git push origin :refs/tags/3.0.0 - git push god :refs/tags/3.0.0 + git tag -d 3.1.0 + git push origin :refs/tags/3.1.0 + git push god :refs/tags/3.1.0 9.) Upload the builds and the pdf documentation to GitHub, in the release area. @@ -160,9 +160,9 @@ development, by updating the version number in: in both the VW and ASP repositories. -If you just released version 3.0.0, we expect that the next feature -release will be 3.1.0, if a major release, or 3.0.1 if a minor -release, so the version tag should be updated to 3.1.0-alpha in +If you just released version 3.1.0, we expect that the next feature +release will be 3.2.0, if a major release, or 3.1.1 if a minor +release, so the version tag should be updated to 3.2.0-alpha in anticipation (see https://semver.org for guidance). 13.) Reflect any changes in release policy by modifying this document. diff --git a/conda/asp_3.1.0_linux_env.yaml b/conda/asp_3.1.0_linux_env.yaml new file mode 100644 index 000000000..2ce4661c5 --- /dev/null +++ b/conda/asp_3.1.0_linux_env.yaml @@ -0,0 +1,190 @@ +name: asp +channels: + - nasa-ames-stereo-pipeline + - usgs-astrogeology + - conda-forge + - defaults +dependencies: + - _libgcc_mutex=0.1=conda_forge + - _openmp_mutex=4.5=1_gnu + - _sysroot_linux-64_curr_repodata_hack=3=h5bd9786_13 + - ale=0.8.5=py36h605e78d_3 + - armadillo=10.8.2=h7c03176_0 + - arpack=3.7.0=hc6cf775_2 + - binutils_impl_linux-64=2.36.1=h193b22a_2 + - binutils_linux-64=2.36=hf3e587d_9 + - blas=1.1=openblas + - boost=1.68.0=py36h8619c78_1001 + - boost-cpp=1.68.0=h11c811c_1000 + - bullet=2.86.1=0 + - bz2file=0.98=py_0 + - bzip2=1.0.8=h7f98852_4 + - ca-certificates=2021.10.8=ha878542_0 + - cairo=1.14.6=4 + - ceres-solver=1.14.0=hf302a74_15 + - chrpath=0.16=h7f98852_1002 + - cmake=3.15.5=hf94ab9c_0 + - csm=3.0.3.3=hc9558a2_0 + - cspice=66=h7f98852_1015 + - curl=7.64.0=h646f8bb_0 + - dbus=1.13.0=h4e0c4b3_1000 + - decorator=5.1.1=pyhd8ed1ab_0 + - eigen=3.4.0=h4bd325d_0 + - embree=2.16.0=0 + - expat=2.4.8=h27087fc_0 + - ffmpeg=3.4.1=0 + - fftw=3.3.8=nompi_hfc0cae8_1114 + - fgr=isis6=h3fd9d12_0 + - flann=1.9.1=0 + - fontconfig=2.12.1=4 + - freetype=2.7=1 + - gcc_impl_linux-64=11.2.0=h82a94d6_16 + - gcc_linux-64=11.2.0=h39a9532_9 + - geoid=1.0=1 + - geos=3.7.3=he1b5a44_0 + - geotiff=1.4.3=hb6868eb_1001 + - gettext=0.19.8.1=hf34092f_1004 + - gflags=2.2.2=he1b5a44_1004 + - giflib=5.2.1=h36c2ea0_2 + - glib=2.51.4=0 + - glog=0.6.0=h6f12383_0 + - gmm=5.0=0 + - gmp=6.2.1=h58526e2_0 + - gsl=2.7=he838d99_0 + - gst-plugins-base=1.8.0=0 + - gstreamer=1.8.0=2 + - gxx_impl_linux-64=11.2.0=h82a94d6_16 + - gxx_linux-64=11.2.0=hacbe6df_9 + - harfbuzz=1.3.4=2 + - hdf5=1.8.18=3 + - htdp=1.0=1 + - icu=58.2=hf484d3e_1000 + - ilmbase=2.5.5=h780b84a_0 + - imagemagick=isis6=h3fd9d12_0 + - imath=3.1.5=h6239696_0 + - inja=3.3.0=h9c3ff4c_0 + - isis=6.0.0=0 + - jama=125=0 + - jasper=1.900.1=h07fcdf6_1006 + - jpeg=9e=h166bdaf_1 + - kakadu=1=0 + - kernel-headers_linux-64=3.10.0=h4a8ded7_13 + - krb5=1.16.3=hc83ff2d_1000 + - laszip=2.1.0=hf484d3e_1 + - ld_impl_linux-64=2.36.1=hea4e1c9_2 + - libblas=3.9.0=13_linux64_openblas + - libcblas=3.9.0=13_linux64_openblas + - libcurl=7.64.0=h01ee5af_0 + - libedit=3.1.20191231=he28a2e2_2 + - libelas=isis6=h3fd9d12_0 + - libffi=3.2.1=he1b5a44_1007 + - libgcc=7.2.0=h69d50b8_2 + - libgcc-devel_linux-64=11.2.0=h0952999_16 + - libgcc-ng=11.2.0=h1d223b6_15 + - libgdal=2.4.1_isis6=h3fd9d12_0 + - libgfortran=3.0.0=1 + - libgfortran-ng=7.5.0=h14aa051_20 + - libgfortran4=7.5.0=h14aa051_20 + - libglvnd-cos7-x86_64=1.0.1=h9b0a68f_1105 + - libgomp=11.2.0=h1d223b6_15 + - libiconv=1.15=h516909a_1006 + - liblapack=3.9.0=13_linux64_openblas + - liblas=isis6=h3fd9d12_1000 + - libnabo=isis6=h3fd9d12_0 + - libnsl=2.0.0=h7f98852_0 + - libopenblas=0.3.18=hf726d26_0 + - libpng=1.6.37=h21135ba_2 + - libpointmatcher=isis6=h2bc3f7f_0 + - libpq=10.6=h13b8bad_1000 + - libprotobuf=3.9.2=h8b12597_0 + - libsanitizer=11.2.0=he4da1e4_16 + - libssh2=1.8.0=h1ad7b7a_1003 + - libstdcxx-devel_linux-64=11.2.0=h0952999_16 + - libstdcxx-ng=11.2.0=he4da1e4_15 + - libtiff=4.0.10=hc3755c2_1005 + - libuuid=2.32.1=h7f98852_1000 + - libuv=1.43.0=h7f98852_0 + - libwebp=0.5.2=7 + - libxcb=1.13=h7f98852_1004 + - libxml2=2.9.9=h13577e0_2 + - libzlib=1.2.11=h166bdaf_1014 + - llvm-openmp=8.0.1=hc9558a2_0 + - lz4-c=1.9.3=h9c3ff4c_1 + - mesalib=18.3.1=h590aaf7_0 + - metis=5.1.0=h58526e2_1006 + - mpfr=4.1.0=h9202a9a_1 + - mysql=5.7.20=hf484d3e_1001 + - mysql-connector-c=6.1.11=hab6429c_1002 + - nanoflann=1.4.2=ha770c72_0 + - ncurses=6.3=h27087fc_1 + - networkx=2.5=py_0 + - nlohmann_json=3.10.5=h9c3ff4c_0 + - nn=1.86.0=h14c3975_2003 + - numpy=1.13.3=py36_blas_openblas_200 + - openblas=0.2.19=2 + - opencv=3.2.0=np113py36_blas_openblas_203 + - openexr=2.5.5=hf817b99_0 + - openjpeg=2.3.0=hf38bd82_1003 + - openmp=8.0.1=0 + - openssl=1.0.2u=h516909a_0 + - parallel=20220222=ha770c72_0 + - pbzip2=1.1.13=0 + - pcl=1.9.1=h482114b_1002 + - pcre=8.45=h9c3ff4c_0 + - perl=5.32.1=2_h7f98852_perl5 + - pip=21.3.1=pyhd8ed1ab_0 + - pixman=0.34.0=h14c3975_1003 + - postgresql=10.6=h66cca7a_1000 + - proj4=5.2.0=he1b5a44_1006 + - protobuf=3.9.2=py36he1b5a44_1 + - pthread-stubs=0.4=h36c2ea0_1001 + - pvl=1.3.1=pyhd8ed1ab_0 + - python=3.6.7=hd21baee_1002 + - python-dateutil=2.8.2=pyhd8ed1ab_0 + - python_abi=3.6=2_cp36m + - pytz=2022.1=pyhd8ed1ab_0 + - pyyaml=5.4.1=py36h8f6f2f9_1 + - qhull=7.2.0=0 + - qt=5.9.6=7 + - qwt=6.1.3=0 + - readline=7.0=hf8c457e_1001 + - rhash=1.4.1=h7f98852_0 + - s2p-subset=isis6=h3fd9d12_0 + - scipy=1.2.1=py36h09a28d5_1 + - setuptools=58.0.4=py36h5fab9bb_2 + - six=1.16.0=pyh6c4a22f_0 + - spiceypy=2.3.2=py_0 + - sqlite=3.28.0=h8b20d00_0 + - stereo-pipeline=3.1.0=h3fd9d12_0 + - suitesparse=5.10.1=h9e50725_1 + - superlu=5.2.2=hfe2efc7_0 + - sysroot_linux-64=2.17=h4a8ded7_13 + - tbb=2021.5.0=h924138e_1 + - theia=isis6=h3fd9d12_1001 + - tk=8.6.12=h27826a3_0 + - tnt=126=0 + - tzcode=2022a=h166bdaf_0 + - usgscsm=1.6.0_asp3.1.0=h2bc3f7f_0 + - visionworkbench=3.1.0=h3fd9d12_0 + - wheel=0.37.1=pyhd8ed1ab_0 + - x264=20131218=0 + - xerces-c=3.1.4=0 + - xorg-fixesproto=5.0=h7f98852_1002 + - xorg-inputproto=2.3.2=h7f98852_1002 + - xorg-kbproto=1.0.7=h7f98852_1002 + - xorg-libice=1.0.10=h7f98852_0 + - xorg-libsm=1.2.3=hd9c2040_1000 + - xorg-libx11=1.7.2=h7f98852_0 + - xorg-libxau=1.0.9=h7f98852_0 + - xorg-libxdmcp=1.1.3=h7f98852_0 + - xorg-libxext=1.3.4=h7f98852_1 + - xorg-libxfixes=5.0.3=h7f98852_1004 + - xorg-libxi=1.7.10=h7f98852_0 + - xorg-libxrender=0.9.10=h7f98852_1003 + - xorg-renderproto=0.11.1=h7f98852_1002 + - xorg-xextproto=7.3.0=h7f98852_1002 + - xorg-xproto=7.0.31=h7f98852_1007 + - xz=5.2.5=h516909a_1 + - yaml=0.2.5=h7f98852_2 + - zlib=1.2.11=h166bdaf_1014 + - zstd=1.4.9=ha95c52a_0 diff --git a/conda/asp_3.1.0_osx_env.yaml b/conda/asp_3.1.0_osx_env.yaml new file mode 100644 index 000000000..ddb4e376a --- /dev/null +++ b/conda/asp_3.1.0_osx_env.yaml @@ -0,0 +1,171 @@ +name: asp +channels: + - nasa-ames-stereo-pipeline + - usgs-astrogeology + - conda-forge + - defaults +dependencies: + - ale=0.8.5=py36hc61eee1_3 + - armadillo=9.200.4=hcb88e47_1205 + - arpack=3.6.3=h06d5271_1005 + - blas=1.1=openblas + - boost=1.68.0=py36h9888f84_1001 + - boost-cpp=1.68.0=h6f8c590_1000 + - bullet=2.86.1=0 + - bz2file=0.98=py_0 + - bzip2=1.0.8=h0d85af4_4 + - ca-certificates=2021.10.8=h033912b_0 + - cairo=1.14.6=4 + - ceres-solver=1.14.0=h636452b_15 + - certifi=2021.5.30=py36h79c6626_0 + - cmake=3.15.5=h6c18c4b_0 + - csm=3.0.3.3=0 + - cspice=66=h0d85af4_1015 + - curl=7.64.0=heae2a1f_0 + - decorator=5.1.1=pyhd8ed1ab_0 + - eigen=3.4.0=h940c156_0 + - embree=2.16.0=h6834224_0 + - expat=2.4.8=h96cf925_0 + - ffmpeg=3.4.1=0 + - fftw=3.3.8=nompi_h5c49c53_1109 + - fgr=isis6=h01edc0c_0 + - flann=1.9.1=0 + - fontconfig=2.12.1=4 + - freetype=2.7=1 + - geoid=1.0=1 + - geos=3.7.3=h4a8c4bd_0 + - geotiff=1.4.3=h113155d_1001 + - gettext=0.19.8.1=h46ab8bc_1002 + - gflags=2.2.2=hb1e8313_1004 + - giflib=5.2.1=hbcb3906_2 + - glib=2.51.4=0 + - glog=0.6.0=h8ac2a54_0 + - gmm=5.0=h6aef312_0 + - gmp=6.2.1=h2e338ed_0 + - gsl=2.7=h93259b0_0 + - harfbuzz=1.3.4=2 + - hdf5=1.8.18=3 + - htdp=1.0=1 + - icu=58.2=h0a44026_1000 + - ilmbase=2.5.5=hfab91a5_0 + - imagemagick=isis6=h01edc0c_0 + - inja=3.3.0=he49afe7_0 + - isis=6.0.0=0 + - jama=125=0 + - jasper=1.900.1=h636a363_1006 + - jpeg=9e=h5eb16cf_1 + - kakadu=1=0 + - krb5=1.16.3=h24a3359_1000 + - laszip=2.1.0=h0a44026_1 + - libblas=3.9.0=13_osx64_openblas + - libcblas=3.9.0=13_osx64_openblas + - libcurl=7.64.0=h76de61e_0 + - libcxx=14.0.3=hc203e6f_0 + - libedit=3.1.20191231=h0678c8f_2 + - libelas=isis6=0 + - libffi=3.2.1=hb1e8313_1007 + - libgcc=4.8.5=hdbeacc1_10 + - libgdal=2.4.1_isis6=h01edc0c_0 + - libgfortran=3.0.1=0 + - libiconv=1.15=h0b31af3_1006 + - liblapack=3.9.0=13_osx64_openblas + - liblas=isis6=h01edc0c_1000 + - libnabo=isis6=h01edc0c_0 + - libopenblas=0.3.18=h9a5756b_0 + - libpng=1.6.37=h7cec526_2 + - libpointmatcher=isis6=ha5a8b8e_0 + - libpq=10.6=hbe1e24e_1000 + - libprotobuf=3.9.2=hfbae3c0_0 + - libssh2=1.8.0=hf30b1f0_1003 + - libtiff=4.0.10=ha78913b_1005 + - libuv=1.43.0=h0d85af4_0 + - libwebp=0.5.2=7 + - libxcb=1.13=h0d85af4_1004 + - libxml2=2.9.9=hd80cff7_2 + - libzlib=1.2.11=h6c3fc93_1014 + - llvm-openmp=14.0.3=ha654fa7_0 + - lz4-c=1.9.3=he49afe7_1 + - mesalib=21.2.5=h2df1e00_3 + - metis=5.1.0=h2e338ed_1006 + - mpfr=4.1.0=h0f52abe_1 + - mysql=5.7.20=h0a44026_1001 + - mysql-connector-c=6.1.11=had4e77e_1002 + - nanoflann=1.4.2=h694c41f_0 + - ncurses=6.3=h96cf925_1 + - networkx=2.5=py_0 + - nlohmann_json=3.10.5=he49afe7_0 + - nn=1.86.0=h1de35cc_2003 + - numpy=1.13.3=py36_blas_openblas_200 + - openblas=0.2.19=2 + - opencv=3.2.0=np113py36_blas_openblas_203 + - openexr=2.5.5=h7fa7ffa_0 + - openjpeg=2.3.0=h3bf0609_1003 + - openssl=1.0.2u=h0b31af3_0 + - parallel=20220222=h694c41f_0 + - pbzip2=1.1.13=h9d27c22_1 + - pcl=1.9.1=hdd77166_1002 + - pcre=8.45=he49afe7_0 + - perl=5.32.1=2_h0d85af4_perl5 + - pip=21.3.1=pyhd8ed1ab_0 + - pixman=0.34.0=h1de35cc_1003 + - postgresql=10.6=ha1bbaa7_1000 + - proj4=5.2.0=h6de7cb9_1006 + - protobuf=3.9.2=py36h6de7cb9_1 + - pthread-stubs=0.4=hc929b4f_1001 + - pvl=1.3.1=pyhd8ed1ab_0 + - python=3.6.7=h4a56312_1002 + - python-dateutil=2.8.2=pyhd8ed1ab_0 + - python_abi=3.6=2_cp36m + - pytz=2022.1=pyhd8ed1ab_0 + - pyyaml=5.4.1=py36hfa26744_1 + - qhull=7.2.0=0 + - qt=5.9.6=7 + - qwt=6.1.3=0 + - readline=7.0=hcfe32e1_1001 + - rhash=1.4.1=h0d85af4_0 + - s2p-subset=isis6=h01edc0c_0 + - scipy=1.2.1=py36hbd7caa9_1 + - setuptools=58.0.4=py36h79c6626_2 + - six=1.16.0=pyh6c4a22f_0 + - spiceypy=2.3.2=py_0 + - sqlite=3.28.0=h9721f7c_0 + - stereo-pipeline=3.1.0=0 + - suitesparse=5.10.1=h7aff33d_1 + - superlu=5.2.1=hbced767_1205 + - tbb=2021.5.0=hbb4e6a2_1 + - theia=isis6=h01edc0c_1001 + - tk=8.6.12=h5dbffcc_0 + - tnt=126=0 + - tzcode=2022a=h5eb16cf_0 + - usgscsm=1.6.0_asp3.1.0=ha5a8b8e_0 + - visionworkbench=3.1.0=0 + - wheel=0.37.1=pyhd8ed1ab_0 + - x264=20131218=0 + - xerces-c=3.1.4=h10f7eb2_0 + - xorg-damageproto=1.2.1=h0d85af4_1002 + - xorg-fixesproto=5.0=h0d85af4_1002 + - xorg-glproto=1.4.17=h0d85af4_1002 + - xorg-inputproto=2.3.2=h35c211d_1002 + - xorg-kbproto=1.0.7=h35c211d_1002 + - xorg-libice=1.0.10=h0d85af4_0 + - xorg-libsm=1.2.3=h0d85af4_1000 + - xorg-libx11=1.7.2=h0d85af4_0 + - xorg-libxau=1.0.9=h35c211d_0 + - xorg-libxdamage=1.1.5=h0d85af4_1 + - xorg-libxdmcp=1.1.3=h35c211d_0 + - xorg-libxext=1.3.4=h0d85af4_1 + - xorg-libxfixes=5.0.3=h0d85af4_1004 + - xorg-libxi=1.7.10=h0d85af4_0 + - xorg-libxrandr=1.5.2=h0d85af4_1 + - xorg-libxrender=0.9.10=h0d85af4_1003 + - xorg-randrproto=1.5.0=h0d85af4_1001 + - xorg-renderproto=0.11.1=h0d85af4_1002 + - xorg-util-macros=1.19.3=h35c211d_0 + - xorg-xextproto=7.3.0=h35c211d_1002 + - xorg-xf86vidmodeproto=2.3.1=h0d85af4_1002 + - xorg-xproto=7.0.31=h35c211d_1007 + - xz=5.2.5=haf1e3a3_1 + - yaml=0.2.5=h0d85af4_2 + - zlib=1.2.11=h6c3fc93_1014 + - zstd=1.4.9=h582d3a0_0 + diff --git a/conda/asp_deps_3.1.0_linux_env.yaml b/conda/asp_deps_3.1.0_linux_env.yaml new file mode 100644 index 000000000..e2b4b63f8 --- /dev/null +++ b/conda/asp_deps_3.1.0_linux_env.yaml @@ -0,0 +1,188 @@ +name: asp_deps +channels: + - nasa-ames-stereo-pipeline + - usgs-astrogeology + - conda-forge + - defaults +dependencies: + - _libgcc_mutex=0.1=conda_forge + - _openmp_mutex=4.5=1_gnu + - _sysroot_linux-64_curr_repodata_hack=3=h5bd9786_13 + - ale=0.8.5=py36h605e78d_3 + - armadillo=10.8.2=h7c03176_0 + - arpack=3.7.0=hc6cf775_2 + - binutils_impl_linux-64=2.36.1=h193b22a_2 + - binutils_linux-64=2.36=hf3e587d_9 + - blas=1.1=openblas + - boost=1.68.0=py36h8619c78_1001 + - boost-cpp=1.68.0=h11c811c_1000 + - bullet=2.86.1=0 + - bz2file=0.98=py_0 + - bzip2=1.0.8=h7f98852_4 + - ca-certificates=2021.10.8=ha878542_0 + - cairo=1.14.6=4 + - ceres-solver=1.14.0=hf302a74_15 + - chrpath=0.16=h7f98852_1002 + - cmake=3.15.5=hf94ab9c_0 + - csm=3.0.3.3=hc9558a2_0 + - cspice=66=h7f98852_1015 + - curl=7.64.0=h646f8bb_0 + - dbus=1.13.0=h4e0c4b3_1000 + - decorator=5.1.1=pyhd8ed1ab_0 + - eigen=3.4.0=h4bd325d_0 + - embree=2.16.0=0 + - expat=2.4.8=h27087fc_0 + - ffmpeg=3.4.1=0 + - fftw=3.3.8=nompi_hfc0cae8_1114 + - fgr=isis6=h3fd9d12_0 + - flann=1.9.1=0 + - fontconfig=2.12.1=4 + - freetype=2.7=1 + - gcc_impl_linux-64=11.2.0=h82a94d6_16 + - gcc_linux-64=11.2.0=h39a9532_9 + - geoid=1.0=1 + - geos=3.7.3=he1b5a44_0 + - geotiff=1.4.3=hb6868eb_1001 + - gettext=0.19.8.1=hf34092f_1004 + - gflags=2.2.2=he1b5a44_1004 + - giflib=5.2.1=h36c2ea0_2 + - glib=2.51.4=0 + - glog=0.6.0=h6f12383_0 + - gmm=5.0=0 + - gmp=6.2.1=h58526e2_0 + - gsl=2.7=he838d99_0 + - gst-plugins-base=1.8.0=0 + - gstreamer=1.8.0=2 + - gxx_impl_linux-64=11.2.0=h82a94d6_16 + - gxx_linux-64=11.2.0=hacbe6df_9 + - harfbuzz=1.3.4=2 + - hdf5=1.8.18=3 + - htdp=1.0=1 + - icu=58.2=hf484d3e_1000 + - ilmbase=2.5.5=h780b84a_0 + - imagemagick=isis6=h3fd9d12_0 + - imath=3.1.5=h6239696_0 + - inja=3.3.0=h9c3ff4c_0 + - isis=6.0.0=0 + - jama=125=0 + - jasper=1.900.1=h07fcdf6_1006 + - jpeg=9e=h166bdaf_1 + - kakadu=1=0 + - kernel-headers_linux-64=3.10.0=h4a8ded7_13 + - krb5=1.16.3=hc83ff2d_1000 + - laszip=2.1.0=hf484d3e_1 + - ld_impl_linux-64=2.36.1=hea4e1c9_2 + - libblas=3.9.0=13_linux64_openblas + - libcblas=3.9.0=13_linux64_openblas + - libcurl=7.64.0=h01ee5af_0 + - libedit=3.1.20191231=he28a2e2_2 + - libelas=isis6=h3fd9d12_0 + - libffi=3.2.1=he1b5a44_1007 + - libgcc=7.2.0=h69d50b8_2 + - libgcc-devel_linux-64=11.2.0=h0952999_16 + - libgcc-ng=11.2.0=h1d223b6_15 + - libgdal=2.4.1_isis6=h3fd9d12_0 + - libgfortran=3.0.0=1 + - libgfortran-ng=7.5.0=h14aa051_20 + - libgfortran4=7.5.0=h14aa051_20 + - libglvnd-cos7-x86_64=1.0.1=h9b0a68f_1105 + - libgomp=11.2.0=h1d223b6_15 + - libiconv=1.15=h516909a_1006 + - liblapack=3.9.0=13_linux64_openblas + - liblas=isis6=h3fd9d12_1000 + - libnabo=isis6=h3fd9d12_0 + - libnsl=2.0.0=h7f98852_0 + - libopenblas=0.3.18=hf726d26_0 + - libpng=1.6.37=h21135ba_2 + - libpointmatcher=isis6=h2bc3f7f_0 + - libpq=10.6=h13b8bad_1000 + - libprotobuf=3.9.2=h8b12597_0 + - libsanitizer=11.2.0=he4da1e4_16 + - libssh2=1.8.0=h1ad7b7a_1003 + - libstdcxx-devel_linux-64=11.2.0=h0952999_16 + - libstdcxx-ng=11.2.0=he4da1e4_15 + - libtiff=4.0.10=hc3755c2_1005 + - libuuid=2.32.1=h7f98852_1000 + - libuv=1.43.0=h7f98852_0 + - libwebp=0.5.2=7 + - libxcb=1.13=h7f98852_1004 + - libxml2=2.9.9=h13577e0_2 + - libzlib=1.2.11=h166bdaf_1014 + - llvm-openmp=8.0.1=hc9558a2_0 + - lz4-c=1.9.3=h9c3ff4c_1 + - mesalib=18.3.1=h590aaf7_0 + - metis=5.1.0=h58526e2_1006 + - mpfr=4.1.0=h9202a9a_1 + - mysql=5.7.20=hf484d3e_1001 + - mysql-connector-c=6.1.11=hab6429c_1002 + - nanoflann=1.4.2=ha770c72_0 + - ncurses=6.3=h27087fc_1 + - networkx=2.5=py_0 + - nlohmann_json=3.10.5=h9c3ff4c_0 + - nn=1.86.0=h14c3975_2003 + - numpy=1.13.3=py36_blas_openblas_200 + - openblas=0.2.19=2 + - opencv=3.2.0=np113py36_blas_openblas_203 + - openexr=2.5.5=hf817b99_0 + - openjpeg=2.3.0=hf38bd82_1003 + - openmp=8.0.1=0 + - openssl=1.0.2u=h516909a_0 + - parallel=20220222=ha770c72_0 + - pbzip2=1.1.13=0 + - pcl=1.9.1=h482114b_1002 + - pcre=8.45=h9c3ff4c_0 + - perl=5.32.1=2_h7f98852_perl5 + - pip=21.3.1=pyhd8ed1ab_0 + - pixman=0.34.0=h14c3975_1003 + - postgresql=10.6=h66cca7a_1000 + - proj4=5.2.0=he1b5a44_1006 + - protobuf=3.9.2=py36he1b5a44_1 + - pthread-stubs=0.4=h36c2ea0_1001 + - pvl=1.3.1=pyhd8ed1ab_0 + - python=3.6.7=hd21baee_1002 + - python-dateutil=2.8.2=pyhd8ed1ab_0 + - python_abi=3.6=2_cp36m + - pytz=2022.1=pyhd8ed1ab_0 + - pyyaml=5.4.1=py36h8f6f2f9_1 + - qhull=7.2.0=0 + - qt=5.9.6=7 + - qwt=6.1.3=0 + - readline=7.0=hf8c457e_1001 + - rhash=1.4.1=h7f98852_0 + - s2p-subset=isis6=h3fd9d12_0 + - scipy=1.2.1=py36h09a28d5_1 + - setuptools=58.0.4=py36h5fab9bb_2 + - six=1.16.0=pyh6c4a22f_0 + - spiceypy=2.3.2=py_0 + - sqlite=3.28.0=h8b20d00_0 + - suitesparse=5.10.1=h9e50725_1 + - superlu=5.2.2=hfe2efc7_0 + - sysroot_linux-64=2.17=h4a8ded7_13 + - tbb=2021.5.0=h924138e_1 + - theia=isis6=h3fd9d12_1001 + - tk=8.6.12=h27826a3_0 + - tnt=126=0 + - tzcode=2022a=h166bdaf_0 + - usgscsm=1.6.0_asp3.1.0=h2bc3f7f_0 + - wheel=0.37.1=pyhd8ed1ab_0 + - x264=20131218=0 + - xerces-c=3.1.4=0 + - xorg-fixesproto=5.0=h7f98852_1002 + - xorg-inputproto=2.3.2=h7f98852_1002 + - xorg-kbproto=1.0.7=h7f98852_1002 + - xorg-libice=1.0.10=h7f98852_0 + - xorg-libsm=1.2.3=hd9c2040_1000 + - xorg-libx11=1.7.2=h7f98852_0 + - xorg-libxau=1.0.9=h7f98852_0 + - xorg-libxdmcp=1.1.3=h7f98852_0 + - xorg-libxext=1.3.4=h7f98852_1 + - xorg-libxfixes=5.0.3=h7f98852_1004 + - xorg-libxi=1.7.10=h7f98852_0 + - xorg-libxrender=0.9.10=h7f98852_1003 + - xorg-renderproto=0.11.1=h7f98852_1002 + - xorg-xextproto=7.3.0=h7f98852_1002 + - xorg-xproto=7.0.31=h7f98852_1007 + - xz=5.2.5=h516909a_1 + - yaml=0.2.5=h7f98852_2 + - zlib=1.2.11=h166bdaf_1014 + - zstd=1.4.9=ha95c52a_0 diff --git a/conda/asp_deps_3.1.0_osx_env.yaml b/conda/asp_deps_3.1.0_osx_env.yaml new file mode 100644 index 000000000..7b8443d0c --- /dev/null +++ b/conda/asp_deps_3.1.0_osx_env.yaml @@ -0,0 +1,169 @@ +name: asp_deps +channels: + - nasa-ames-stereo-pipeline + - usgs-astrogeology + - conda-forge + - defaults +dependencies: + - ale=0.8.5=py36hc61eee1_3 + - armadillo=9.200.4=hcb88e47_1205 + - arpack=3.6.3=h06d5271_1005 + - blas=1.1=openblas + - boost=1.68.0=py36h9888f84_1001 + - boost-cpp=1.68.0=h6f8c590_1000 + - bullet=2.86.1=0 + - bz2file=0.98=py_0 + - bzip2=1.0.8=h0d85af4_4 + - ca-certificates=2021.10.8=h033912b_0 + - cairo=1.14.6=4 + - ceres-solver=1.14.0=h636452b_15 + - certifi=2021.5.30=py36h79c6626_0 + - cmake=3.15.5=h6c18c4b_0 + - csm=3.0.3.3=0 + - cspice=66=h0d85af4_1015 + - curl=7.64.0=heae2a1f_0 + - decorator=5.1.1=pyhd8ed1ab_0 + - eigen=3.4.0=h940c156_0 + - embree=2.16.0=h6834224_0 + - expat=2.4.8=h96cf925_0 + - ffmpeg=3.4.1=0 + - fftw=3.3.8=nompi_h5c49c53_1109 + - fgr=isis6=h01edc0c_0 + - flann=1.9.1=0 + - fontconfig=2.12.1=4 + - freetype=2.7=1 + - geoid=1.0=1 + - geos=3.7.3=h4a8c4bd_0 + - geotiff=1.4.3=h113155d_1001 + - gettext=0.19.8.1=h46ab8bc_1002 + - gflags=2.2.2=hb1e8313_1004 + - giflib=5.2.1=hbcb3906_2 + - glib=2.51.4=0 + - glog=0.6.0=h8ac2a54_0 + - gmm=5.0=h6aef312_0 + - gmp=6.2.1=h2e338ed_0 + - gsl=2.7=h93259b0_0 + - harfbuzz=1.3.4=2 + - hdf5=1.8.18=3 + - htdp=1.0=1 + - icu=58.2=h0a44026_1000 + - ilmbase=2.5.5=hfab91a5_0 + - imagemagick=isis6=h01edc0c_0 + - inja=3.3.0=he49afe7_0 + - isis=6.0.0=0 + - jama=125=0 + - jasper=1.900.1=h636a363_1006 + - jpeg=9e=h5eb16cf_1 + - kakadu=1=0 + - krb5=1.16.3=h24a3359_1000 + - laszip=2.1.0=h0a44026_1 + - libblas=3.9.0=13_osx64_openblas + - libcblas=3.9.0=13_osx64_openblas + - libcurl=7.64.0=h76de61e_0 + - libcxx=14.0.3=hc203e6f_0 + - libedit=3.1.20191231=h0678c8f_2 + - libelas=isis6=0 + - libffi=3.2.1=hb1e8313_1007 + - libgcc=4.8.5=hdbeacc1_10 + - libgdal=2.4.1_isis6=h01edc0c_0 + - libgfortran=3.0.1=0 + - libiconv=1.15=h0b31af3_1006 + - liblapack=3.9.0=13_osx64_openblas + - liblas=isis6=h01edc0c_1000 + - libnabo=isis6=h01edc0c_0 + - libopenblas=0.3.18=h9a5756b_0 + - libpng=1.6.37=h7cec526_2 + - libpointmatcher=isis6=ha5a8b8e_0 + - libpq=10.6=hbe1e24e_1000 + - libprotobuf=3.9.2=hfbae3c0_0 + - libssh2=1.8.0=hf30b1f0_1003 + - libtiff=4.0.10=ha78913b_1005 + - libuv=1.43.0=h0d85af4_0 + - libwebp=0.5.2=7 + - libxcb=1.13=h0d85af4_1004 + - libxml2=2.9.9=hd80cff7_2 + - libzlib=1.2.11=h6c3fc93_1014 + - llvm-openmp=14.0.3=ha654fa7_0 + - lz4-c=1.9.3=he49afe7_1 + - mesalib=21.2.5=h2df1e00_3 + - metis=5.1.0=h2e338ed_1006 + - mpfr=4.1.0=h0f52abe_1 + - mysql=5.7.20=h0a44026_1001 + - mysql-connector-c=6.1.11=had4e77e_1002 + - nanoflann=1.4.2=h694c41f_0 + - ncurses=6.3=h96cf925_1 + - networkx=2.5=py_0 + - nlohmann_json=3.10.5=he49afe7_0 + - nn=1.86.0=h1de35cc_2003 + - numpy=1.13.3=py36_blas_openblas_200 + - openblas=0.2.19=2 + - opencv=3.2.0=np113py36_blas_openblas_203 + - openexr=2.5.5=h7fa7ffa_0 + - openjpeg=2.3.0=h3bf0609_1003 + - openssl=1.0.2u=h0b31af3_0 + - parallel=20220222=h694c41f_0 + - pbzip2=1.1.13=h9d27c22_1 + - pcl=1.9.1=hdd77166_1002 + - pcre=8.45=he49afe7_0 + - perl=5.32.1=2_h0d85af4_perl5 + - pip=21.3.1=pyhd8ed1ab_0 + - pixman=0.34.0=h1de35cc_1003 + - postgresql=10.6=ha1bbaa7_1000 + - proj4=5.2.0=h6de7cb9_1006 + - protobuf=3.9.2=py36h6de7cb9_1 + - pthread-stubs=0.4=hc929b4f_1001 + - pvl=1.3.1=pyhd8ed1ab_0 + - python=3.6.7=h4a56312_1002 + - python-dateutil=2.8.2=pyhd8ed1ab_0 + - python_abi=3.6=2_cp36m + - pytz=2022.1=pyhd8ed1ab_0 + - pyyaml=5.4.1=py36hfa26744_1 + - qhull=7.2.0=0 + - qt=5.9.6=7 + - qwt=6.1.3=0 + - readline=7.0=hcfe32e1_1001 + - rhash=1.4.1=h0d85af4_0 + - s2p-subset=isis6=h01edc0c_0 + - scipy=1.2.1=py36hbd7caa9_1 + - setuptools=58.0.4=py36h79c6626_2 + - six=1.16.0=pyh6c4a22f_0 + - spiceypy=2.3.2=py_0 + - sqlite=3.28.0=h9721f7c_0 + - suitesparse=5.10.1=h7aff33d_1 + - superlu=5.2.1=hbced767_1205 + - tbb=2021.5.0=hbb4e6a2_1 + - theia=isis6=h01edc0c_1001 + - tk=8.6.12=h5dbffcc_0 + - tnt=126=0 + - tzcode=2022a=h5eb16cf_0 + - usgscsm=1.6.0_asp3.1.0=ha5a8b8e_0 + - wheel=0.37.1=pyhd8ed1ab_0 + - x264=20131218=0 + - xerces-c=3.1.4=h10f7eb2_0 + - xorg-damageproto=1.2.1=h0d85af4_1002 + - xorg-fixesproto=5.0=h0d85af4_1002 + - xorg-glproto=1.4.17=h0d85af4_1002 + - xorg-inputproto=2.3.2=h35c211d_1002 + - xorg-kbproto=1.0.7=h35c211d_1002 + - xorg-libice=1.0.10=h0d85af4_0 + - xorg-libsm=1.2.3=h0d85af4_1000 + - xorg-libx11=1.7.2=h0d85af4_0 + - xorg-libxau=1.0.9=h35c211d_0 + - xorg-libxdamage=1.1.5=h0d85af4_1 + - xorg-libxdmcp=1.1.3=h35c211d_0 + - xorg-libxext=1.3.4=h0d85af4_1 + - xorg-libxfixes=5.0.3=h0d85af4_1004 + - xorg-libxi=1.7.10=h0d85af4_0 + - xorg-libxrandr=1.5.2=h0d85af4_1 + - xorg-libxrender=0.9.10=h0d85af4_1003 + - xorg-randrproto=1.5.0=h0d85af4_1001 + - xorg-renderproto=0.11.1=h0d85af4_1002 + - xorg-util-macros=1.19.3=h35c211d_0 + - xorg-xextproto=7.3.0=h35c211d_1002 + - xorg-xf86vidmodeproto=2.3.1=h0d85af4_1002 + - xorg-xproto=7.0.31=h35c211d_1007 + - xz=5.2.5=haf1e3a3_1 + - yaml=0.2.5=h0d85af4_2 + - zlib=1.2.11=h6c3fc93_1014 + - zstd=1.4.9=h582d3a0_0 + diff --git a/docs/conda_build.rst b/docs/conda_build.rst index 2c7198ce9..85180047a 100644 --- a/docs/conda_build.rst +++ b/docs/conda_build.rst @@ -23,14 +23,14 @@ Search for the latest available ISIS conda package:: conda search -c usgs-astrogeology --override-channels isis -Here it was found that ISIS version 5.0.1 was the latest, which we +Here it was found that ISIS version 6 was the latest, which we will assume throughout the rest of this document. This needs to be adjusted for your circumstances. Create a conda environment for this version of ISIS:: - conda create -n isis5.0.1 python=3.6 - conda activate isis5.0.1 + conda create -n isis6 python=3.6 + conda activate isis6 Add these channels to conda:: @@ -47,7 +47,7 @@ order and above all other channels, except perhaps the Install the desired version of ISIS:: - conda install isis==5.0.1 + conda install isis==6 Search and install the latest version of the ``usgscsm`` package, for example, as:: @@ -64,7 +64,7 @@ See :numref:`packages_to_build` for how to fetch and build this. Save the current environment as follows:: - conda env export > isis5.0.1.yaml + conda env export > isis6.yaml Fetching the build tools ------------------------ @@ -113,10 +113,10 @@ Synchronize the versions with the existing environment For each of the above feedstocks, check the ``recipe/meta.yaml`` file and ensure all dependencies are in sync with what is in the file -``isis5.0.1.yaml`` generated earlier. This can be done automatically +``isis6.yaml`` generated earlier. This can be done automatically with a provided script in the ASP repository:: - python StereoPipeline/conda/update_versions.py isis5.0.1.yaml \ + python StereoPipeline/conda/update_versions.py isis6.yaml \ gdal-feedstock and the same for the other packages. @@ -128,7 +128,7 @@ It is suggested to examine the changed ``meta.yaml`` with great care, and if in doubt, leave the values as they were before modified by this script. -In each of those files manually modify the string ``isis5.0.1`` to +In each of those files manually modify the string ``isis6`` to reflect the current ISIS version. In the ``visionworkbench`` and ``stereopipeline`` recipes update the @@ -175,12 +175,12 @@ Use the ``--force`` option if desired to overwrite any existing package with the same name and version. After a package is uploaded, it can be installed in the existing -``isis5.0.1`` environment as:: +``isis6`` environment as:: conda install -c nasa-ames-stereo-pipeline \ -c usgs-astrogeology \ -c conda-forge \ - gdal==isis5.0.1 + gdal==isis6 To list all packages in that channel, do:: @@ -226,8 +226,7 @@ ones turned out to result in problems at runtime. To install these compilers in a desired environemnt on Linux for use without ``conda build``, do:: - conda install -c conda-forge gcc_linux-64==11.1.0 \ - gxx_linux-64==11.1.0 gfortran_linux-64==11.1.0 + conda install -c conda-forge gcc_linux-64=11 gxx_linux-64=11 It is suggested to install ``cmake`` in the same environment, for both Linux and OSX, with:: diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fe1b4f3fe..64b3fe5f6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,8 +21,8 @@ project (StereoPipeline) # The line below is used by the docs/ so don't change it # without testing the result. Versioning is based on https://semver.org -#set(PACKAGE_VERSION "3.0.0") -set(PACKAGE_VERSION "3.0.1-alpha") +set(PACKAGE_VERSION "3.1.0") +#set(PACKAGE_VERSION "3.0.1-alpha") set(PACKAGE_NAME "NASA Ames Stereo Pipeline") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_BUGREPORT "scott.t.mcmichael@nasa.gov, oleg.alexandrov@nasa.gov") diff --git a/src/asp/Core/Bathymetry.cc b/src/asp/Core/Bathymetry.cc index 4e2a2e132..1b53454e9 100644 --- a/src/asp/Core/Bathymetry.cc +++ b/src/asp/Core/Bathymetry.cc @@ -168,7 +168,7 @@ namespace asp { } // Test Snell's law in projected and unprojected coordinates - bool test_snells_law(std::vector const& plane, + void test_snells_law(std::vector const& plane, vw::cartography::GeoReference const& water_surface_projection, double refraction_index, vw::Vector3 const& out_unproj_xyz,