Revert "Revert "Upgrade Bundler + add support for Ceres solver""

This reverts commit 667ea4e.

Conflicts:
	.gitignore
	install.sh

.gitignore

@@ -8,6 +8,10 @@ odm_texturing-build/
 *.user
 cmvs.tar.gz
 parallel.tar.bz2
+<<<<<<< HEAD
 LAStools.zip
 pcl.tar.gz
 *.pyc
+=======
+pcl.tar.gz
+>>>>>>> parent of 667ea4e... Revert "Upgrade Bundler + add support for Ceres solver"

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "src/bundler"]
+	path = src/bundler
+	url = https://github.com/chris-cooper/bundler_sfm
+[submodule "src/ceres-solver"]
+	path = src/ceres-solver
+	url = https://ceres-solver.googlesource.com/ceres-solver

install.sh

@@ -31,14 +31,15 @@ echo "  - script started - `date`"
 		        INC_PATH="/usr/local/include"
 
             ## source paths
-	      BUNDLER_PATH="$TOOLS_SRC_PATH/bundler"
-	         CMVS_PATH="$TOOLS_SRC_PATH/cmvs"
-	         PMVS_PATH="$TOOLS_SRC_PATH/pmvs"
-	      CLAPACK_PATH="$TOOLS_SRC_PATH/clapack"
-	       VLFEAT_PATH="$TOOLS_SRC_PATH/vlfeat"
-	     PARALLEL_PATH="$TOOLS_SRC_PATH/parallel"
-	          PSR_PATH="$TOOLS_SRC_PATH/PoissonRecon"
-              GRACLUS_PATH="$TOOLS_SRC_PATH/graclus"
+        BUNDLER_PATH="$TOOLS_SRC_PATH/bundler"
+           CMVS_PATH="$TOOLS_SRC_PATH/cmvs"
+           PMVS_PATH="$TOOLS_SRC_PATH/pmvs"
+        CLAPACK_PATH="$TOOLS_SRC_PATH/clapack"
+         VLFEAT_PATH="$TOOLS_SRC_PATH/vlfeat"
+       PARALLEL_PATH="$TOOLS_SRC_PATH/parallel"
+            PSR_PATH="$TOOLS_SRC_PATH/PoissonRecon"
+        GRACLUS_PATH="$TOOLS_SRC_PATH/graclus"
+          CERES_PATH="$TOOLS_SRC_PATH/ceres-solver"
 
                   PCL_PATH="$TOOLS_SRC_PATH/pcl"
              LASTOOLS_PATH="$TOOLS_SRC_PATH/lastools"
@@ -104,6 +105,10 @@ uname -a > "$TOOLS_LOG_PATH/sysinfo.txt"
 echo
 echo "  > installing required packages"
 
+echo "    - installing git submodules"
+git submodule init
+git submodule update
+
 echo "    - updating"
 sudo apt-get update --assume-yes > "$TOOLS_LOG_PATH/apt-get_get.log" 2>&1
 
@@ -123,6 +128,7 @@ sudo apt-get install --assume-yes --install-recommends \
   libcv-dev libcvaux-dev libopencv-dev \
   gdal-bin \
   exiv2 \
+  libgoogle-glog-dev libatlas-base-dev libsuitesparse-dev \
   > "$TOOLS_LOG_PATH/apt-get_install.log" 2>&1
 else
 sudo apt-get install --assume-yes --install-recommends \
@@ -138,6 +144,7 @@ sudo apt-get install --assume-yes --install-recommends \
   libcv-dev libcvaux-dev libopencv-dev \
   gdal-bin \
   exiv2 \
+  libgoogle-glog-dev libatlas-base-dev libsuitesparse-dev \
   > "$TOOLS_LOG_PATH/apt-get_install.log" 2>&1
 fi
 
@@ -166,7 +173,6 @@ do
 done <<EOF
 parallel.tar.bz2  http://ftp.gnu.org/gnu/parallel/parallel-20141022.tar.bz2
 clapack.tgz  http://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz
-bundler.zip  http://phototour.cs.washington.edu/bundler/distr/bundler-v0.4-source.zip
 PoissonRecon.zip http://www.cs.jhu.edu/~misha/Code/PoissonRecon/Version2/PoissonRecon.zip
 vlfeat.tar.gz http://www.vlfeat.org/download/vlfeat-0.9.13-bin.tar.gz
 cmvs.tar.gz http://www.di.ens.fr/cmvs/cmvs-fix2.tar.gz
@@ -196,15 +202,13 @@ wait
 mv -f graclus1.2          "$GRACLUS_PATH"
 mv -f clapack-3.2.1-CMAKE "$CLAPACK_PATH"
 mv -f vlfeat-0.9.13       "$VLFEAT_PATH"
-mv -f bundler-v0.4-source "$BUNDLER_PATH"
 mv -f parallel-20141022   "$PARALLEL_PATH"
 mv -f PoissonRecon        "$PSR_PATH"
 mv -f cmvs                "$CMVS_PATH"
 mv -f pcl-pcl-1.7.2       "$PCL_PATH"
 mv -f LAStools            "$LASTOOLS_PATH"
 
 
-
 echo "  < done - `date`"
 
 
@@ -371,21 +375,34 @@ echo "  > cmvs/pmvs"
 echo "  < done - `date`"
 echo
 
+echo "  > ceres"
+  cd "$CERES_PATH"
+
+  echo "    - configuring ceres"
+  mkdir -p build
+  cd build
+  cmake .. -DCMAKE_INSTALL_PREFIX=$TOOLS_PATH \
+           -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC \
+           -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF  > "$TOOLS_LOG_PATH/ceres_1_config.log" 2>&1
+
+  echo "    - building ceres"
+  make install > "$TOOLS_LOG_PATH/ceres_1_build.log" 2>&1
+
+echo "  < done - `date`"
+echo
 
 echo "  > bundler"
   cd "$BUNDLER_PATH"
 
-  sed -i "$BUNDLER_PATH/src/BundlerApp.h" -e "620c\        BundlerApp();"
-
   echo "    - cleaning bundler"
   make clean > "$TOOLS_LOG_PATH/bundler_1_clean.log" 2>&1
 
   echo "    - building bundler"
   make -j  > "$TOOLS_LOG_PATH/bundler_2_build.log" 2>&1
 
-  cp -f "$BUNDLER_PATH/bin/Bundle2PMVS" "$BUNDLER_PATH/bin/Bundle2Vis" "$BUNDLER_PATH/bin/KeyMatchFull" "$BUNDLER_PATH/bin/KeyMatch" "$BUNDLER_PATH/bin/bundler" "$BUNDLER_PATH/bin/RadialUndistort" "$TOOLS_BIN_PATH/"
+  ln -s "$BUNDLER_PATH/bin/Bundle2PMVS" "$BUNDLER_PATH/bin/Bundle2Vis" "$BUNDLER_PATH/bin/KeyMatchFull" "$BUNDLER_PATH/bin/KeyMatch" "$BUNDLER_PATH/bin/bundler" "$BUNDLER_PATH/bin/RadialUndistort" "$TOOLS_BIN_PATH/"
 
-  cp -f "$BUNDLER_PATH/lib/libANN_char.so" "$TOOLS_LIB_PATH/"
+  ln -s "$BUNDLER_PATH/lib/libANN_char.so" "$TOOLS_LIB_PATH/"
 echo "  < done - `date`"
 echo