newer versions fpr pmvs, cmvs

pull/1/head
Daniel 2010-10-30 17:43:31 +02:00
rodzic ba25e13ec6
commit 04db609b4e
1 zmienionych plików z 42 dodań i 34 usunięć

Wyświetl plik

@ -46,45 +46,53 @@ echo
echo ---- getting the tools ---- echo ---- getting the tools ----
echo echo
wget --no-check-certificate http://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz \ wget -bO clapack.tgz http://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz& PID_CLAPACK_DL=$!
http://phototour.cs.washington.edu/bundler/distr/bundler-v0.4-source.zip \ wget -bO bundler.zip http://phototour.cs.washington.edu/bundler/distr/bundler-v0.4-source.zip& PID_BUNDLER_DL=$!
http://www.cs.ubc.ca/~lowe/keypoints/siftDemoV4.zip \ wget -bO sift.zip http://www.cs.ubc.ca/~lowe/keypoints/siftDemoV4.zip
http://grail.cs.washington.edu/software/pmvs/pmvs-2.tar.gz \ wget -bO graclus.tar.gz --no-check-certificate https://www.topoi.hu-berlin.de/graclus1.2.tar.gz& PID_GRACLUS=$!
https://www.topoi.hu-berlin.de/graclus1.2.tar.gz \ wget -bO opencv.tar.bz2 http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.1/OpenCV-2.1.0.tar.bz2/download& PID_OPENCV=$!
http://grail.cs.washington.edu/software/cmvs/cmvs.tar.gz \ #wget -O pmvs.tar.gz --no-check-certificate http://grail.cs.washington.edu/software/pmvs/pmvs-2-fix0.tar.gz& PID_PMVS=$!
http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.1/OpenCV-2.1.0.tar.bz2/download \ #wget -O siftfeat.tar.gz http://web.engr.oregonstate.edu/~hess/downloads/sift/sift-latest.tar.gz
http://web.engr.oregonstate.edu/~hess/downloads/sift/sift-latest.tar.gz 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
echo echo
echo ---- unzipping ---- echo ---- unzipping ----
echo echo
tar -xzf clapack-3.2.1-CMAKE.tgz& PID_CLAPACK=$! tar -xzf clapack.tgz& PID_CLAPACK=$!
unzip -q bundler-v0.4-source.zip& PID_BUNDLER=$! unzip -q bundler.zip& PID_BUNDLER=$!
tar -xzf pmvs-2.tar.gz& PID_PMVS=$! #tar -xzf pmvs.tar.gz& PID_PMVS=$!
tar -xzf cmvs.tar.gz& PID_CMVS=$! tar -xzf cmvs.tar.gz& PID_CMVS=$!
tar -xzf graclus1.2.tar.gz& PID_GRACLUS=$! tar -xzf graclus.tar.gz& PID_GRACLUS=$!
unzip -q siftDemoV4.zip& PID_SIFT=$! unzip -q sift.zip& PID_SIFT=$!
tar -xf OpenCV-2.1.0.tar.bz2& PID_OPENCV=$! tar -xf opencv.tar.bz2& PID_OPENCV=$!
tar -xzf sift-latest.tar.gz& PID_SIFTFEAT=$! #tar -xzf siftfeat.tar.gz& PID_SIFTFEAT=$!
wait $PID_CLAPACK wait $PID_CLAPACK
wait $PID_BUNDLER wait $PID_BUNDLER
wait $PID_PMVS #wait $PID_PMVS
wait $PID_CMVS wait $PID_CMVS
wait $PID_GRACLUS wait $PID_GRACLUS
wait $PID_SIFT wait $PID_SIFT
wait $PID_OPENCV wait $PID_OPENCV
wait $PID_SIFTFEAT #wait $PID_SIFTFEAT
rm clapack-3.2.1-CMAKE.tgz rm clapack.tgz
rm bundler-v0.4-source.zip rm bundler.zip
rm pmvs-2.tar.gz #rm pmvs.tar.gz
rm graclus1.2.tar.gz rm graclus.tar.gz
rm cmvs.tar.gz rm cmvs.tar.gz
rm siftDemoV4.zip rm sift.zip
rm OpenCV-2.1.0.tar.bz2 rm opencv.tar.bz2
rm sift-latest.tar.gz #rm siftfeat.tar.
echo echo
echo ---- renaming ---- echo ---- renaming ----
@ -96,9 +104,9 @@ mv -f clapack-3.2.1-CMAKE $CLAPACK_PATH
mv -f bundler-v0.4-source $BUNDLER_PATH mv -f bundler-v0.4-source $BUNDLER_PATH
mv -f graclus1.2 $GRACLUS_PATH mv -f graclus1.2 $GRACLUS_PATH
mv -f siftDemoV4 $SIFT_PATH mv -f siftDemoV4 $SIFT_PATH
mv -f pmvs-2 $PMVS_PATH #mv -f pmvs $PMVS_PATH
mv -f cmvs $CMVS_PATH mv -f cmvs $CMVS_PATH
mv -f sift $SIFTFEAT_PATH #mv -f siftfeat $SIFTFEAT_PATH
mv -f OpenCV-2.1.0 $OPENCV_PATH mv -f OpenCV-2.1.0 $OPENCV_PATH
sudo cp -R $CLAPACK_PATH/INCLUDE $INC_PATH/clapack sudo cp -R $CLAPACK_PATH/INCLUDE $INC_PATH/clapack
@ -127,10 +135,10 @@ if [ "$ARCH" = "x86_64" ]; then
sed -i $CMVS_PATH/program/main/Makefile -e '24c\ -fopenmp -DNUMBITS=64 ${OPENMP_FLAG}' sed -i $CMVS_PATH/program/main/Makefile -e '24c\ -fopenmp -DNUMBITS=64 ${OPENMP_FLAG}'
fi fi
sed -i $PMVS_PATH/program/main/Makefile -e "11c\#Your INCLUDE path (e.g., -I\/usr\/include)" #sed -i $PMVS_PATH/program/main/Makefile -e "11c\#Your INCLUDE path (e.g., -I\/usr\/include)"
sed -i $PMVS_PATH/program/main/Makefile -e "12c\YOUR_INCLUDE_PATH =-I$INC_PATH" #sed -i $PMVS_PATH/program/main/Makefile -e "12c\YOUR_INCLUDE_PATH =-I$INC_PATH"
sed -i $PMVS_PATH/program/main/Makefile -e "14c\#Your LDLIBRARY path (e.g., -L/usr/lib)" #sed -i $PMVS_PATH/program/main/Makefile -e "14c\#Your LDLIBRARY path (e.g., -L/usr/lib)"
sed -i $PMVS_PATH/program/main/Makefile -e "15c\YOUR_LDLIB_PATH = -L$LIB_PATH" #sed -i $PMVS_PATH/program/main/Makefile -e "15c\YOUR_LDLIB_PATH = -L$LIB_PATH"
sed -i $BUNDLER_PATH/bin/extract_focal.pl -e '18c\ $JHEAD_EXE = "jhead";' 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"' sed -i $BUNDLER_PATH/bin/ToSift.sh -e '36c\ echo "SIFT -o $key_file -x $d; gzip -f $key_file"'
@ -164,10 +172,10 @@ cd $GRACLUS_PATH
sudo make sudo make
sudo cp lib* /usr/lib/ sudo cp lib* /usr/lib/
cd $PMVS_PATH/program/main #cd $PMVS_PATH/program/main
sudo make clean #sudo make clean
sudo make depend #sudo make depend
sudo make #sudo make
cd $CMVS_PATH/program/main cd $CMVS_PATH/program/main
sudo make clean sudo make clean