diff --git a/build/Makefile b/build/Makefile index b7e03e5a1e3adda6b7f0745c11da667a8782151d..d8b6bf192b8b392e1d2a8c1f0240530ef74e9605 100644 --- a/build/Makefile +++ b/build/Makefile @@ -145,4 +145,4 @@ clean: wipe: rm -rf $(FORTRAN_OBJS) $(NP_LIBNPTM_OBJS) $(NP_CLUSTER_OBJS) $(NP_INCLUSION_OBJS) $(NP_SPHERE_OBJS) $(NP_TRAPPING_OBJS) $(NP_TESTING_OBJS) - rm -rf $(FORTRAN_BINS) $(NPTM_LIB) $(NP_CLUSTER_BINS) $(NP_INCLUSION_BINS) $(NP_SPHERE_BINS) $(NP_TRAPPING_BINS) $(NP_TESTING_BINS) + rm -rf $(FORTRAN_BINS) libnptm/libnptm.a libnptm/libnptm.so $(NP_CLUSTER_BINS) $(NP_INCLUSION_BINS) $(NP_SPHERE_BINS) $(NP_TRAPPING_BINS) $(NP_TESTING_BINS) diff --git a/build/configure.sh b/build/configure.sh index 958071c95ecbb2fe0ea843782be405abee694927..d079c1250f999ab1ecc7184b9265799183a5f7d0 100755 --- a/build/configure.sh +++ b/build/configure.sh @@ -120,7 +120,7 @@ function test_legacy_fortran { J=I-I END EOF - $1 -std=legacy conf_test_fortran.f -o conf_test_fortran > /dev/null 2>error.log + $1 -std=legacy conf_test_fortran.f -o conf_test_fortran > /dev/null 2>>error.log result=$? rm conf_test_fortran.f if [ "x$result" = "x0" ]; then @@ -233,7 +233,7 @@ echo -n "configure: checking for ar... " if [ "x$AR" = "x" ]; then AR="ar" fi -$AR --version > /dev/null 2>error.log +$AR --version > /dev/null 2>>error.log result=$? if [ "x$result" = "x0" ]; then echo "$AR" @@ -268,7 +268,7 @@ else J=I-I END EOF - $FC -ggdb test_fortran.f -o test_fortran > /dev/null 2>error.log + $FC -ggdb test_fortran.f -o test_fortran > /dev/null 2>>error.log result=$? if [ "x$result" = "x0" ]; then echo "yes" @@ -316,7 +316,7 @@ int main() { return (i + j); } EOF -$CXX $CLANGFLAGS test_compiler.cpp -o test_compiler > /dev/null 2>error.log +$CXX $CLANGFLAGS test_compiler.cpp -o test_compiler > /dev/null 2>>error.log result=$? if [ "x$result" = "x0" ]; then echo "yes" @@ -326,7 +326,7 @@ else exit 2 fi echo -n "configure: checking wether $CXX supports -ggdb... " -$CXX $CLANGFLAGS -ggdb test_compiler.cpp -o test_compiler > /dev/null 2>error.log +$CXX $CLANGFLAGS -ggdb test_compiler.cpp -o test_compiler > /dev/null 2>>error.log result=$? if [ "x$result" = "x0" ]; then echo "yes" @@ -357,7 +357,7 @@ int main() { return result; } EOF -$CXX test_compiler.cpp -o test_compiler > /dev/null 2>error.log +$CXX test_compiler.cpp -o test_compiler > /dev/null 2>>error.log result=$? if [ "x$result" = "x0" ]; then ./test_compiler @@ -385,7 +385,7 @@ int main() { return result; } EOF - $CXX -fopenmp test_compiler.cpp -o test_compiler > /dev/null 2>error.log + $CXX -fopenmp test_compiler.cpp -o test_compiler > /dev/null 2>>error.log result=$? if [ "x$result" = "x0" ]; then ./test_compiler @@ -635,7 +635,7 @@ if [ "x$CUBLAS" != "xno" ]; then fi # end of CUDAFLAGS user override protection if [ "x$CUDAFLAGS$CUDALDFLAGS" != "x" ]; then # WARNING: the corresponding test in configure.ac has an error! - CUBLASFLAGS="-DUSE_CUBLAS ${CUDAFLAGS}" + CUBLASFLAGS=" -DUSE_CUBLAS ${CUDAFLAGS}" CUBLASLDFLAGS="${CUDALDFLAGS}" fi if [ "x$CUBLASFLAGS$CUBLASLDFLAGS" = "x" ]; then @@ -700,17 +700,17 @@ if [ "x$MAGMA" != "xno" ]; then magma_pkg=$(for i in "${pkg_array[@]}"; do echo "$i" | cut --delimiter=" " -f1; done | grep magma) MAGMA_INCLUDE=$(pkg-config --cflags-only-I ${magma_pkg}) MAGMA_LIBS_DIR=$(pkg-config --libs-only-L ${magma_pkg}) - MAGMAFLAGS="-DUSE_MAGMA ${MAGMA_ILP64_FLAG} $CUDAFLAGS ${MAGMA_INCLUDE}" + MAGMAFLAGS=" -DUSE_MAGMA ${MAGMA_ILP64_FLAG} $CUDAFLAGS ${MAGMA_INCLUDE}" MAGMALDFLAGS=" ${MAGMA_LIBS_DIR}-lmagma" fi # end of MAGMA decision tree else # search for MAGMA in some standard folders if [ "x$CUDAFLAGS" != "x" ]; then if [ -f /usr/include/magma_v2.h ]; then - MAGMAFLAGS="-DUSE_MAGMA ${MAGMA_ILP64_FLAG} $CUDAFLAGS -I/usr/include" + MAGMAFLAGS=" -DUSE_MAGMA ${MAGMA_ILP64_FLAG} $CUDAFLAGS -I/usr/include" MAGMALDFLAGS=" -lmagma" elif [ -f /usr/local/include/magma_v2.h ]; then - MAGMAFLAGS="-DUSE_MAGMA ${MAGMA_ILP64_FLAG} $CUDAFLAGS -I/usr/local/include" + MAGMAFLAGS=" -DUSE_MAGMA ${MAGMA_ILP64_FLAG} $CUDAFLAGS -I/usr/local/include" MAGMALDFLAGS=" -lmagma" fi fi @@ -722,7 +722,7 @@ if [ "x$MAGMA" != "xno" ]; then elif [ "x${MAGMA_DIR}" != "x" ]; then MAGMA_ROOT="${MAGMA_DIR}" fi - MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 $CUDAFLAGS -I${MAGMA_ROOT}/include" + MAGMAFLAGS=" -DUSE_MAGMA -DMAGMA_ILP64 $CUDAFLAGS -I${MAGMA_ROOT}/include" MAGMALDFLAGS=" -L${MAGMA_ROOT}/lib -lmagma" fi if [ "x$MAGMAFLAGS$MAGMALDFLAGS" = "x" ]; then @@ -767,7 +767,7 @@ EOF result=$? rm conf_test_offload.cpp if [ "x$result" = "x0" ]; then - ./conf_test_offload > /dev/null 2>error.log + ./conf_test_offload > /dev/null 2>>error.log result=$? rm conf_test_offload fi