From 22baf6e2200226bdb1d2674ce4050991381cecb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Poizl?= Date: Wed, 7 Jul 2021 08:04:16 +0200 Subject: [PATCH] Autodetect number of CPU cores --- build-soft-latest.sh | 14 ++++++++------ build-soft-stable.sh | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/build-soft-latest.sh b/build-soft-latest.sh index 8370e4d..8834f60 100755 --- a/build-soft-latest.sh +++ b/build-soft-latest.sh @@ -6,6 +6,8 @@ export CXXFLAGS="-march=native -w -Wno-psabi -D_FILE_OFFSET_BITS=64" CHECKOUT=0 ROOTDIR="$HOME/astro-soft" +JOBS=$(grep -c ^processor /proc/cpuinfo) + [ ! -d "$ROOTDIR" ] && mkdir $ROOTDIR cd "$ROOTDIR" @@ -14,7 +16,7 @@ cd indi git pull origin [ ! -d ../build-indi ] && { cmake -B ../build-indi ../indi -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release || { echo "INDI failed"; exit 1; } } cd ../build-indi -make -j 4 || { echo "INDI failed"; exit 1; } +make -j $JOBS || { echo "INDI failed"; exit 1; } sudo make install || { echo "INDI failed"; exit 1; } cd "$ROOTDIR" @@ -23,12 +25,12 @@ cd indi-3rdparty git pull origin [ ! -d ../build-indi-lib ] && { cmake -B ../build-indi-lib ../indi-3rdparty -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_LIBS=1 -DCMAKE_BUILD_TYPE=Release || { echo "INDI lib failed"; exit 1; } } cd ../build-indi-lib -make -j 4 || { echo "INDI lib failed"; exit 1; } +make -j $JOBS || { echo "INDI lib failed"; exit 1; } sudo make install || { echo "INDI lib failed"; exit 1; } [ ! -d ../build-indi-3rdparty ] && { cmake -B ../build-indi-3rdparty ../indi-3rdparty -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release || { echo "INDI lib failed"; exit 1; } } cd ../build-indi-3rdparty -make -j 4 || { echo "INDI 3rd-party failed"; exit 1; } +make -j $JOBS || { echo "INDI 3rd-party failed"; exit 1; } sudo make install || { echo "INDI lib failed"; exit 1; } cd "$ROOTDIR" @@ -37,7 +39,7 @@ cd stellarsolver git pull origin [ ! -d ../build-stellarsolver ] && { cmake -B ../build-stellarsolver ../stellarsolver -DCMAKE_BUILD_TYPE=Release || { echo "Stellarsolfer failed"; exit 1; } } cd ../build-stellarsolver -make -j 4 || { echo "Stellarsolver failed"; exit 1; } +make -j $JOBS || { echo "Stellarsolver failed"; exit 1; } sudo make install || { echo "Stellarsolver failed"; exit 1; } cd "$ROOTDIR" @@ -46,7 +48,7 @@ cd kstars git pull origin [ ! -d ../build-kstars ] && { cmake -B ../build-kstars -DBUILD_TESTING=Off ../kstars -DCMAKE_BUILD_TYPE=Release || { echo "KStars failed"; exit 1; } } cd ../build-kstars -make -j 4 || { echo "KStars failed"; exit 1; } +make -j $JOBS || { echo "KStars failed"; exit 1; } sudo make install || { echo "KStars failed"; exit 1; } exit @@ -56,5 +58,5 @@ cd phd2 [ $CHECKOUT == 1 ] && git pull origin [ ! -d ../build-phd2 ] && cmake -B ../build-phd2 ../phd2 -DCMAKE_BUILD_TYPE=Release || { echo "PHD2 failed"; exit 1; } cd ../build-phd2 || { echo "PHD2 failed"; exit 1; } -make -j 4 || { echo "PHD2 failed"; exit 1; } +make -j $JOBS || { echo "PHD2 failed"; exit 1; } sudo make install diff --git a/build-soft-stable.sh b/build-soft-stable.sh index fb2bec6..4ed2894 100755 --- a/build-soft-stable.sh +++ b/build-soft-stable.sh @@ -10,6 +10,8 @@ KSTARS_COMMIT="413c9421b0774ff05d3453dfad0eb4b234639dce" ROOTDIR="$HOME/astro-soft-stable" +JOBS=$(grep -c ^processor /proc/cpuinfo) + [ ! -d "$ROOTDIR" ] && mkdir $ROOTDIR cd "$ROOTDIR" @@ -19,7 +21,7 @@ git fetch origin git checkout $INDI_COMMIT [ ! -d ../build-indi ] && { cmake -B ../build-indi ../indi -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release || { echo "INDI failed"; exit 1; } } cd ../build-indi -make -j 4 || { echo "INDI failed"; exit 1; } +make -j $JOBS || { echo "INDI failed"; exit 1; } sudo make install || { echo "INDI failed"; exit 1; } cd "$ROOTDIR" @@ -29,12 +31,12 @@ git fetch origin git checkout $INDI_3RD_COMMIT [ ! -d ../build-indi-lib ] && { cmake -B ../build-indi-lib ../indi-3rdparty -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_LIBS=1 -DCMAKE_BUILD_TYPE=Release || { echo "INDI lib failed"; exit 1; } } cd ../build-indi-lib -make -j 4 || { echo "INDI lib failed"; exit 1; } +make -j $JOBS || { echo "INDI lib failed"; exit 1; } sudo make install || { echo "INDI lib failed"; exit 1; } [ ! -d ../build-indi-3rdparty ] && { cmake -B ../build-indi-3rdparty ../indi-3rdparty -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release || { echo "INDI lib failed"; exit 1; } } cd ../build-indi-3rdparty -make -j 4 || { echo "INDI 3rd-party failed"; exit 1; } +make -j $JOBS || { echo "INDI 3rd-party failed"; exit 1; } sudo make install || { echo "INDI lib failed"; exit 1; } cd "$ROOTDIR" @@ -44,7 +46,7 @@ git fetch origin git checkout $STELLAR_COMMIT [ ! -d ../build-stellarsolver ] && { cmake -B ../build-stellarsolver ../stellarsolver -DCMAKE_BUILD_TYPE=Release || { echo "Stellarsolfer failed"; exit 1; } } cd ../build-stellarsolver -make -j 4 || { echo "Stellarsolver failed"; exit 1; } +make -j $JOBS || { echo "Stellarsolver failed"; exit 1; } sudo make install || { echo "Stellarsolver failed"; exit 1; } cd "$ROOTDIR" @@ -54,7 +56,7 @@ git fetch origin git checkout $KSTARS_COMMIT [ ! -d ../build-kstars ] && { cmake -B ../build-kstars -DBUILD_TESTING=Off ../kstars -DCMAKE_BUILD_TYPE=Release || { echo "KStars failed"; exit 1; } } cd ../build-kstars -make -j 4 || { echo "KStars failed"; exit 1; } +make -j $JOBS || { echo "KStars failed"; exit 1; } sudo make install || { echo "KStars failed"; exit 1; } exit @@ -64,5 +66,5 @@ cd phd2 [ $CHECKOUT == 1 ] && git pull origin [ ! -d ../build-phd2 ] && cmake -B ../build-phd2 ../phd2 -DCMAKE_BUILD_TYPE=Release || { echo "PHD2 failed"; exit 1; } cd ../build-phd2 || { echo "PHD2 failed"; exit 1; } -make -j 4 || { echo "PHD2 failed"; exit 1; } +make -j $JOBS || { echo "PHD2 failed"; exit 1; } sudo make install