Skip to content
Browse files

stereo_corr_sub: Wipe this, just use stereo_corr with a flag to do su…

…b only
  • Loading branch information...
1 parent 569be9f commit e3a011364376017cd03d9d801a67a1abee544ff1 @oleg-alexandrov oleg-alexandrov committed
Showing with 8 additions and 52 deletions.
  1. +1 −3 src/asp/Tools/Makefile.am
  2. +2 −3 src/asp/Tools/stereo.h
  3. +0 −43 src/asp/Tools/stereo_corr_sub.cc
  4. +5 −3 src/asp/Tools/stereo_mpi.in
View
4 src/asp/Tools/Makefile.am
@@ -26,12 +26,10 @@ libexec_PROGRAMS =
if MAKE_APP_STEREO
python_tool_scripts += stereo stereo_mpi
- bin_PROGRAMS += stereo_corr stereo_corr_sub stereo_fltr stereo_pprc stereo_rfne stereo_tri
+ bin_PROGRAMS += stereo_corr stereo_fltr stereo_pprc stereo_rfne stereo_tri
libexec_PROGRAMS += stereo_parse
stereo_corr_LDADD = $(APP_STEREO_LIBS)
stereo_corr_SOURCES = stereo_corr.cc stereo.cc
- stereo_corr_sub_LDADD = $(APP_STEREO_LIBS)
- stereo_corr_sub_SOURCES = stereo_corr_sub.cc stereo.cc
stereo_fltr_LDADD = $(APP_STEREO_LIBS)
stereo_fltr_SOURCES = stereo_fltr.cc stereo.cc
stereo_parse_LDADD = $(APP_STEREO_LIBS)
View
5 src/asp/Tools/stereo.h
@@ -79,14 +79,13 @@ namespace asp {
// Checks for obvious user mistakes
void user_safety_check(Options const& opt);
- // Pre-correlation, used in both stereo_corr and stereo_corr_sub
+ // Low-res correlation
void pre_correlation( Options & opt );
// Produces D_sub
void produce_lowres_disparity( Options & opt );
- // Approximate search range by looking at interest point match file,
- // used in both stereo_corr and stereo_corr_sub.
+ // Approximate search range by looking at interest point match file
vw::BBox2i approximate_search_range( std::string const& left_image,
std::string const& right_image,
std::string const& match_filename,
View
43 src/asp/Tools/stereo_corr_sub.cc
@@ -1,43 +0,0 @@
-// __BEGIN_LICENSE__
-// Copyright (c) 2009-2012, United States Government as represented by the
-// Administrator of the National Aeronautics and Space Administration. All
-// rights reserved.
-//
-// The NGT platform is licensed under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance with the
-// License. You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// __END_LICENSE__
-
-#include <asp/Tools/stereo.h>
-#include <vw/InterestPoint.h>
-
-using namespace vw;
-using namespace asp;
-
-int main(int argc, char* argv[]) {
-
- stereo_register_sessions();
- Options opt;
- try {
- handle_arguments( argc, argv, opt,
- CorrelationDescription() );
-
- // Integer correlator requires 1024 px tiles
- //---------------------------------------------------------
- opt.raster_tile_size = Vector2i(1024,1024);
-
- // Internal Processes
- //---------------------------------------------------------
- pre_correlation( opt );
-
- } ASP_STANDARD_CATCHES;
-
- return 0;
-}
View
8 src/asp/Tools/stereo_mpi.in
@@ -296,6 +296,9 @@ if __name__ == '__main__':
args=unescape_vals(args)
+ args_sub = args
+ args_sub.extend(['--compute-low-res-disparity-only'])
+
settings=taste_settings( args )
mpiexec_rank = os.getenv("MPIEXEC_RANK")
@@ -330,7 +333,7 @@ if __name__ == '__main__':
# Correlation
if ( opt.stop_point <= 1 ):
sys.exit()
- run('stereo_corr_sub', args, msg='1: Pre Correlation')
+ run('stereo_corr', args_sub, msg='1: Low-res correlation')
cmd = mpi_cmd + sys.argv + ['-e','1','--stop-point','2']
code = subprocess.call(cmd)
if code != 0:
@@ -385,7 +388,7 @@ if __name__ == '__main__':
if ( opt.entry_point <= 1 ):
if ( opt.stop_point <= 1 ):
sys.exit()
- run('stereo_corr_sub', args, msg='1: Pre Correlation')
+ run('stereo_corr', args_sub, msg='1: Low-res correlation')
parallel_run('stereo_corr', args, settings, tiles, msg='1: Correlation')
if ( opt.entry_point <= 2 ):
if ( opt.stop_point <= 2 ):
@@ -408,4 +411,3 @@ if __name__ == '__main__':
if not opt.debug:
die(e)
raise
-

0 comments on commit e3a0113

Please sign in to comment.
Something went wrong with that request. Please try again.