Revise CUDA and MAGMA detection test (ed848bb0) · Commits · Giacomo Mulas / NP_TMcode

build/configure

+41 −58

Original line number	Diff line number	Diff line
		@@ -25150,37 +25150,30 @@ then :
		MAGMALDFLAGS=""

		else

		if test "x$CUDA_LIB" = "x"; then
		export -p \| grep CUDA
		CUDA_DEF=$?
		if test "x$CUDA_DEF" = "x0"; then
		CUDA_LIB=${CUDA_HOME}/targets/x86_64-linux/lib
		CUDAFLAGS="-I${CUDA_HOME}/targets/x86_64-linux/include"
		else
		CUDA_LIB=/usr/local/cuda/targets/x86_64-linux/lib
		CUDAFLAGS="-I/usr/local/cuda/targets/x86_64-linux/include"
		fi
		fi
		export -p \| grep MAGMA
		MAGMA_DEF=$?
		if test "x$MAGMA_DEF" = "x0"; then
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} ${CUDAFLAGS}"
		export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"
		else
		if test "x$MAGMA_INCLUDE" != "x"; then
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} ${CUDAFLAGS}"
		else
		if test -f /usr/include/magma_v2.h; then
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 ${CUDAFLAGS}"
		if test "x$withval" != "xyes" and "x$withval" != "xauto"; then
		export MAGMA_HOME=$withval
		fi

		if test -f /usr/local/cuda/include/cuda.h; then
		CUDAFLAGS="-I/usr/local/cuda/include"
		CUDALDFLAGS="-L/usr/local/cuda/lib64 -lcudart"
		elif test -f /usr/include/cuda.h; then
		CUDAFLAGS="-I/usr/include"
		CUDALDFLAGS="-lcudart"
		elif text "x$CUDA_HOME" != "x"; then
		CUDAFLAGS="-I${CUDA_HOME}/include"
		CUDALDFLAGS="-L${CUDA_HOME}/lib64 -lcudart"
		fi
		if test "x$MAGMA_LIB" != "x"; then
		export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"
		else
		if test "x$CUDAFLAGS" != "x"; then
		if test -f /usr/include/magma_v2.h; then
		export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -lmagma"
		fi
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 $CUDAFLAGS -I/usr/include"
		export MAGMALDFLAGS="$CUDALDFLAGS -lmagma"
		elif test -f /usr/local/include/magma_v2.h; then
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 $CUDAFLAGS -I/usr/local/include"
		export MAGMALDFLAGS="$CUDALDFLAGS -lmagma"
		elif test "x$MAGMA_HOME" != "x"; then
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 $CUDAFLAGS -I${MAGMA_HOME}/include"
		export MAGMALDFLAGS="$CUDALDFLAGS -L${MAGMA_HOME}/lib -lmagma"
		fi
		fi

		@@ -25204,36 +25197,26 @@ fi
		else case e in #(
		e)

		if test "x$CUDA_LIB" = "x"; then
		export -p \| grep CUDA
		CUDA_DEF=$?
		if test "x$CUDA_DEF" = "x0"; then
		CUDA_LIB=${CUDA_HOME}/targets/x86_64-linux/lib
		CUDAFLAGS="-I${CUDA_HOME}/targets/x86_64-linux/include"
		else
		CUDA_LIB=/usr/local/cuda/targets/x86_64-linux/lib
		CUDAFLAGS="-I/usr/local/cuda/targets/x86_64-linux/include"
		fi
		fi
		export -p \| grep MAGMA
		MAGMA_DEF=$?
		if test "x$MAGMA_DEF" = "x0"; then
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} ${CUDAFLAGS}"
		export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"
		else
		if test "x$MAGMA_INCLUDE" != "x"; then
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} ${CUDAFLAGS}"
		else
		if test -f /usr/local/cuda/include/cuda.h; then
		CUDAFLAGS="-I/usr/local/cuda/include"
		CUDALDFLAGS="-L/usr/local/cuda/lib64 -lcudart"
		elif test -f /usr/include/cuda.h; then
		CUDAFLAGS="-I/usr/include"
		CUDALDFLAGS="-lcudart"
		elif text "x$CUDA_HOME" != "x"; then
		CUDAFLAGS="-I${CUDA_HOME}/include"
		CUDALDFLAGS="-L${CUDA_HOME}/lib64 -lcudart"
		fi
		if test "x$CUDAFLAGS" != "x"; then
		if test -f /usr/include/magma_v2.h; then
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 ${CUDAFLAGS}"
		fi
		fi
		if test "x$MAGMA_LIB" != "x"; then
		export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"
		else
		if test -f /usr/include/magma_v2.h; then
		export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -lmagma"
		fi
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 $CUDAFLAGS -I/usr/include"
		export MAGMALDFLAGS="$CUDALDFLAGS -lmagma"
		elif test -f /usr/local/include/magma_v2.h; then
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 $CUDAFLAGS -I/usr/local/include"
		export MAGMALDFLAGS="$CUDALDFLAGS -lmagma"
		elif test "x$MAGMA_HOME" != "x"; then
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 $CUDAFLAGS -I${MAGMA_HOME}/include"
		export MAGMALDFLAGS="$CUDALDFLAGS -L${MAGMA_HOME}/lib -lmagma"
		fi
		fi

build/configure.ac

+22 −29

Original line number	Diff line number	Diff line
		@@ -39,36 +39,26 @@ m4_define(
		m4_define(
		[M4_DETECT_MAGMA],
		[
		if test "x$CUDA_LIB" = "x"; then
		export -p \| grep CUDA
		CUDA_DEF=$?
		if test "x$CUDA_DEF" = "x0"; then
		CUDA_LIB=${CUDA_HOME}/targets/x86_64-linux/lib
		CUDAFLAGS="-I${CUDA_HOME}/targets/x86_64-linux/include"
		else
		CUDA_LIB=/usr/local/cuda/targets/x86_64-linux/lib
		CUDAFLAGS="-I/usr/local/cuda/targets/x86_64-linux/include"
		fi
		fi
		export -p \| grep MAGMA
		MAGMA_DEF=$?
		if test "x$MAGMA_DEF" = "x0"; then
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} ${CUDAFLAGS}"
		export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"
		else
		if test "x$MAGMA_INCLUDE" != "x"; then
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} ${CUDAFLAGS}"
		else
		if test -f /usr/local/cuda/include/cuda.h; then
		CUDAFLAGS="-I/usr/local/cuda/include"
		CUDALDFLAGS="-L/usr/local/cuda/lib64 -lcudart"
		elif test -f /usr/include/cuda.h; then
		CUDAFLAGS="-I/usr/include"
		CUDALDFLAGS="-lcudart"
		elif text "x$CUDA_HOME" != "x"; then
		CUDAFLAGS="-I${CUDA_HOME}/include"
		CUDALDFLAGS="-L${CUDA_HOME}/lib64 -lcudart"
		fi
		if test "x$CUDAFLAGS" != "x"; then
		if test -f /usr/include/magma_v2.h; then
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 ${CUDAFLAGS}"
		fi
		fi
		if test "x$MAGMA_LIB" != "x"; then
		export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"
		else
		if test -f /usr/include/magma_v2.h; then
		export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -lmagma"
		fi
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 $CUDAFLAGS -I/usr/include"
		export MAGMALDFLAGS="$CUDALDFLAGS -lmagma"
		elif test -f /usr/local/include/magma_v2.h; then
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 $CUDAFLAGS -I/usr/local/include"
		export MAGMALDFLAGS="$CUDALDFLAGS -lmagma"
		elif test "x$MAGMA_HOME" != "x"; then
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 $CUDAFLAGS -I${MAGMA_HOME}/include"
		export MAGMALDFLAGS="$CUDALDFLAGS -L${MAGMA_HOME}/lib -lmagma"
		fi
		fi
		]
		@@ -370,6 +360,9 @@ AC_ARG_WITH(
		AC_SUBST([MAGMAFLAGS], [""])
		AC_SUBST([MAGMALDFLAGS], [""])
		else
		if test "x$withval" != "xyes" and "x$withval" != "xauto"; then
		export MAGMA_HOME=$withval
		fi
		M4_DETECT_MAGMA
		AS_IF(
		[test "x$MAGMALDFLAGS" != "x"],