diff --git a/install.sh b/install.sh index 519bf523..0eab7214 100755 --- a/install.sh +++ b/install.sh @@ -20,6 +20,7 @@ SIFTFEAT_PATH="$TOOLS_PATH/lib/siftfeat" GRACLUS_PATH="$TOOLS_PATH/lib/graclus" CLAPACK_PATH="$TOOLS_PATH/lib/clapack" OPENCV_PATH="$TOOLS_PATH/lib/openCv" +VLFEAT_PATH="$TOOLS_PATH/lib/vlfeat" echo echo ---- installing required packages ---- @@ -46,6 +47,7 @@ echo echo ---- getting the tools ---- echo + wget -bO clapack.tgz http://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz& PID_CLAPACK_DL=$! wget -bO bundler.zip http://phototour.cs.washington.edu/bundler/distr/bundler-v0.4-source.zip& PID_BUNDLER_DL=$! wget -bO sift.zip http://www.cs.ubc.ca/~lowe/keypoints/siftDemoV4.zip @@ -53,15 +55,15 @@ wget -bO graclus.tar.gz --no-check-certificate https://www.topoi.hu-berlin.de/g wget -bO opencv.tar.bz2 http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.1/OpenCV-2.1.0.tar.bz2/download& PID_OPENCV=$! #wget -O pmvs.tar.gz --no-check-certificate http://grail.cs.washington.edu/software/pmvs/pmvs-2-fix0.tar.gz& PID_PMVS=$! #wget -O siftfeat.tar.gz http://web.engr.oregonstate.edu/~hess/downloads/sift/sift-latest.tar.gz +#wget -bO siftgpu.tgz http://wwwx.cs.unc.edu/~ccwu/cgi-bin/siftgpu.cgi& PID_SIFTGPU_DL=$! wget -O cmvs.tar.gz http://grail.cs.washington.edu/software/cmvs/cmvs-fix1.tar.gz -exit - wait $PID_CLAPACK wait $PID_BUNDLER wait $PID_SIFT wait $PID_GRACLUS wait $PID_OPENCV +wait $PID_VLFEAT echo echo ---- unzipping ---- @@ -69,12 +71,14 @@ echo tar -xzf clapack.tgz& PID_CLAPACK=$! unzip -q bundler.zip& PID_BUNDLER=$! -#tar -xzf pmvs.tar.gz& PID_PMVS=$! tar -xzf cmvs.tar.gz& PID_CMVS=$! tar -xzf graclus.tar.gz& PID_GRACLUS=$! unzip -q sift.zip& PID_SIFT=$! tar -xf opencv.tar.bz2& PID_OPENCV=$! #tar -xzf siftfeat.tar.gz& PID_SIFTFEAT=$! +#tar -xzf pmvs.tar.gz& PID_PMVS=$! + +git clone git://github.com/vlfeat/vlfeat.git& PID_VLFEAT=$! wait $PID_CLAPACK wait $PID_BUNDLER @@ -85,6 +89,7 @@ wait $PID_SIFT wait $PID_OPENCV #wait $PID_SIFTFEAT +rm wget* rm clapack.tgz rm bundler.zip #rm pmvs.tar.gz @@ -104,10 +109,11 @@ mv -f clapack-3.2.1-CMAKE $CLAPACK_PATH mv -f bundler-v0.4-source $BUNDLER_PATH mv -f graclus1.2 $GRACLUS_PATH mv -f siftDemoV4 $SIFT_PATH -#mv -f pmvs $PMVS_PATH mv -f cmvs $CMVS_PATH -#mv -f siftfeat $SIFTFEAT_PATH mv -f OpenCV-2.1.0 $OPENCV_PATH +#mv -f pmvs $PMVS_PATH +#mv -f siftfeat $SIFTFEAT_PATH +mv -f vlfeat $VLFEAT_PATH sudo cp -R $CLAPACK_PATH/INCLUDE $INC_PATH/clapack @@ -143,12 +149,13 @@ fi sed -i $BUNDLER_PATH/bin/extract_focal.pl -e '18c\ $JHEAD_EXE = "jhead";' sed -i $BUNDLER_PATH/bin/ToSift.sh -e '36c\ echo "SIFT -o $key_file -x $d; gzip -f $key_file"' -echo -echo ---- building ---- -echo -sudo chown -R $USER:$USER * -sudo chmod -R 755 * +cho +cho ---- building ---- +cho + +udo chown -R $USER:$USER * +udo chmod -R 755 * cd $OPENCV_PATH cmake . @@ -172,16 +179,20 @@ cd $GRACLUS_PATH sudo make sudo cp lib* /usr/lib/ -#cd $PMVS_PATH/program/main -#sudo make clean -#sudo make depend -#sudo make +cd $PMVS_PATH/program/main +sudo make clean +sudo make depend +sudo make cd $CMVS_PATH/program/main sudo make clean sudo make depend sudo make +cd $VLFEAT_PATH/ +sudo make clean +sudo make + cd $TOOLS_PATH echo @@ -190,12 +201,13 @@ echo mkdir $TOOLS_BIN_PATH cd $TOOLS_BIN_PATH -wget --no-check-certificate https://www.topoi.hu-berlin.de/run.sh -sudo chmod a+x $TOOLS_BIN_PATH/run.sh +#wget --no-check-certificate https://www.topoi.hu-berlin.de/run.sh +#sudo chmod a+x $TOOLS_BIN_PATH/run.sh cp $SIFT_PATH/sift $TOOLS_BIN_PATH/ +cp $VLFEAT_PATH/bin/glx/sift $TOOLS_BIN_PATH/vlsift -cp $SIFTFEAT_PATH/bin/siftfeat $TOOLS_BIN_PATH/ +#cp $SIFTFEAT_PATH/bin/siftfeat $TOOLS_BIN_PATH/ cp $BUNDLER_PATH/bin/Bundle2PMVS $BUNDLER_PATH/bin/Bundle2Vis $BUNDLER_PATH/bin/KeyMatchFull $BUNDLER_PATH/bin/bundler $BUNDLER_PATH/bin/extract_focal.pl $BUNDLER_PATH/bin/RadialUndistort $TOOLS_BIN_PATH/ diff --git a/run-0-mogrify.sh b/run-0-mogrify.sh old mode 100644 new mode 100755 diff --git a/run-1-get-keypoints.sh b/run-1-get-keypoints.sh old mode 100644 new mode 100755 diff --git a/run-1.sh b/run-1.sh old mode 100644 new mode 100755 diff --git a/run-2-match-keypoints.sh b/run-2-match-keypoints.sh old mode 100644 new mode 100755 diff --git a/run-3-bundler.sh b/run-3-bundler.sh old mode 100644 new mode 100755 diff --git a/run-4-bundle2pmvs.sh b/run-4-bundle2pmvs.sh old mode 100644 new mode 100755 diff --git a/run-5-cmvs.sh b/run-5-cmvs.sh old mode 100644 new mode 100755 diff --git a/run-6-genOption.sh b/run-6-genOption.sh old mode 100644 new mode 100755 diff --git a/run-7-pmvs.sh b/run-7-pmvs.sh old mode 100644 new mode 100755 diff --git a/run-all.sh b/run-all.sh old mode 100644 new mode 100755