Ensure that CUDAFLAGS always expand to a meaningful inclusion (c88097c7) · Commits · Giacomo Mulas / NP_TMcode

build/Makefile.am

+12 −12

Original line number	Diff line number	Diff line
		@@ -3,30 +3,30 @@ lib_LTLIBRARIES=libnptm/libnptm.la
		libnptm_libnptm_la_SOURCES=../src/libnptm/algebraic.cpp ../src/libnptm/clu_subs.cpp ../src/libnptm/Commons.cpp ../src/libnptm/Configuration.cpp ../src/libnptm/file_io.cpp ../src/libnptm/lapack_calls.cpp ../src/libnptm/logging.cpp ../src/libnptm/magma_calls.cpp ../src/libnptm/Parsers.cpp ../src/libnptm/sph_subs.cpp ../src/libnptm/tfrfme.cpp ../src/libnptm/TransitionMatrix.cpp ../src/libnptm/tra_subs.cpp
		if BUILDFORTRAN
		PROGS=cluster/edfb_clu cluster/clu cluster/np_cluster sphere/edfb_sph sphere/sph sphere/np_sphere trapping/frfme trapping/lffft trapping/np_trapping testing/test_TEDF testing/test_TTMS
		bin_PROGRAMS=$(PROGS)
		EDFBCLUSOURCES=../src/cluster/edfb_clu.f
		CLUSOURCES=../src/cluster/clu.f
		EDFBSPHSOURCES=../src/sphere/edfb_sph.f
		SPHSOURCES=../src/sphere/sph.f
		FRFMESOURCES=../src/trapping/frfme.f
		LFFFTSOURCES=../src/trapping/lffft.f
		else
		PROGS=cluster/np_cluster sphere/np_sphere trapping/np_trapping testing/test_TEDF testing/test_TTMS
		EDFBCLUSOURCES=
		CLUSOURCES=
		EDFBSPHSOURCES=
		SPHSOURCES=
		FRFMESOURCES=
		LFFFTSOURCES=
		endif
		bin_PROGRAMS=$(PROGS)
		cluster_edfb_clu_SOURCES=$(EDFBCLUSOURCES)
		cluster_clu_SOURCES=$(CLUSOURCES)
		cluster_np_cluster_SOURCES=../src/cluster/np_cluster.cpp ../src/cluster/cluster.cpp
		sphere_edfb_sph_SOURCES=$(EDFBSPHSOURCES)
		sphere_sph_SOURCES=$(SPHSOURCES)
		sphere_np_sphere_SOURCES=../src/sphere/np_sphere.cpp ../src/sphere/sphere.cpp
		trapping_frfme_SOURCES=$(FRFMESOURCES)
		trapping_lffft_SOURCES=$(LFFFTSOURCES)
		cluster_np_cluster_SOURCES=../src/cluster/np_cluster.cpp ../src/cluster/cluster.cpp
		sphere_np_sphere_SOURCES=../src/sphere/np_sphere.cpp ../src/sphere/sphere.cpp
		trapping_np_trapping_SOURCES=../src/trapping/np_trapping.cpp ../src/trapping/cfrfme.cpp ../src/trapping/clffft.cpp
		testing_test_TEDF_SOURCES=../src/testing/test_TEDF.cpp
		testing_test_TTMS_SOURCES=../src/testing/test_TTMS.cpp
		else
		PROGS=cluster/np_cluster sphere/np_sphere trapping/np_trapping testing/test_TEDF testing/test_TTMS
		bin_PROGRAMS=$(PROGS)
		cluster_np_cluster_SOURCES=../src/cluster/np_cluster.cpp ../src/cluster/cluster.cpp
		sphere_np_sphere_SOURCES=../src/sphere/np_sphere.cpp ../src/sphere/sphere.cpp
		trapping_np_trapping_SOURCES=../src/trapping/np_trapping.cpp ../src/trapping/cfrfme.cpp ../src/trapping/clffft.cpp
		testing_test_TEDF_SOURCES=../src/testing/test_TEDF.cpp
		testing_test_TTMS_SOURCES=../src/testing/test_TTMS.cpp
		endif

build/Makefile.in

+67 −38

Original line number	Diff line number	Diff line
		@@ -89,7 +89,8 @@ PRE_UNINSTALL = :
		POST_UNINSTALL = :
		build_triplet = @build@
		host_triplet = @host@
		bin_PROGRAMS = $(am__EXEEXT_1)
		@BUILDFORTRAN_FALSE@bin_PROGRAMS = $(am__EXEEXT_1)
		@BUILDFORTRAN_TRUE@bin_PROGRAMS = $(am__EXEEXT_1)
		subdir = .
		ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
		am__aclocal_m4_deps = $(top_srcdir)/configure.ac
		@@ -164,7 +165,7 @@ am__v_lt_0 = --silent
		am__v_lt_1 =
		am__cluster_clu_SOURCES_DIST = ../src/cluster/clu.f
		@BUILDFORTRAN_TRUE@am__objects_1 = ../src/cluster/clu.$(OBJEXT)
		am_cluster_clu_OBJECTS = $(am__objects_1)
		@BUILDFORTRAN_TRUE@am_cluster_clu_OBJECTS = $(am__objects_1)
		cluster_clu_OBJECTS = $(am_cluster_clu_OBJECTS)
		cluster_clu_LDADD = $(LDADD)
		am__DEPENDENCIES_1 =
		@@ -173,14 +174,20 @@ cluster_clu_DEPENDENCIES = libnptm/libnptm.la $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1)
		am__cluster_edfb_clu_SOURCES_DIST = ../src/cluster/edfb_clu.f
		@BUILDFORTRAN_TRUE@am__objects_2 = ../src/cluster/edfb_clu.$(OBJEXT)
		am_cluster_edfb_clu_OBJECTS = $(am__objects_2)
		@BUILDFORTRAN_TRUE@am_cluster_edfb_clu_OBJECTS = $(am__objects_2)
		cluster_edfb_clu_OBJECTS = $(am_cluster_edfb_clu_OBJECTS)
		cluster_edfb_clu_LDADD = $(LDADD)
		cluster_edfb_clu_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am_cluster_np_cluster_OBJECTS = ../src/cluster/np_cluster.$(OBJEXT) \
		../src/cluster/cluster.$(OBJEXT)
		am__cluster_np_cluster_SOURCES_DIST = ../src/cluster/np_cluster.cpp \
		../src/cluster/cluster.cpp
		@BUILDFORTRAN_FALSE@am_cluster_np_cluster_OBJECTS = \
		@BUILDFORTRAN_FALSE@ ../src/cluster/np_cluster.$(OBJEXT) \
		@BUILDFORTRAN_FALSE@ ../src/cluster/cluster.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_cluster_np_cluster_OBJECTS = \
		@BUILDFORTRAN_TRUE@ ../src/cluster/np_cluster.$(OBJEXT) \
		@BUILDFORTRAN_TRUE@ ../src/cluster/cluster.$(OBJEXT)
		cluster_np_cluster_OBJECTS = $(am_cluster_np_cluster_OBJECTS)
		cluster_np_cluster_LDADD = $(LDADD)
		cluster_np_cluster_DEPENDENCIES = libnptm/libnptm.la \
		@@ -188,14 +195,20 @@ cluster_np_cluster_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am__sphere_edfb_sph_SOURCES_DIST = ../src/sphere/edfb_sph.f
		@BUILDFORTRAN_TRUE@am__objects_3 = ../src/sphere/edfb_sph.$(OBJEXT)
		am_sphere_edfb_sph_OBJECTS = $(am__objects_3)
		@BUILDFORTRAN_TRUE@am_sphere_edfb_sph_OBJECTS = $(am__objects_3)
		sphere_edfb_sph_OBJECTS = $(am_sphere_edfb_sph_OBJECTS)
		sphere_edfb_sph_LDADD = $(LDADD)
		sphere_edfb_sph_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am_sphere_np_sphere_OBJECTS = ../src/sphere/np_sphere.$(OBJEXT) \
		../src/sphere/sphere.$(OBJEXT)
		am__sphere_np_sphere_SOURCES_DIST = ../src/sphere/np_sphere.cpp \
		../src/sphere/sphere.cpp
		@BUILDFORTRAN_FALSE@am_sphere_np_sphere_OBJECTS = \
		@BUILDFORTRAN_FALSE@ ../src/sphere/np_sphere.$(OBJEXT) \
		@BUILDFORTRAN_FALSE@ ../src/sphere/sphere.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_sphere_np_sphere_OBJECTS = \
		@BUILDFORTRAN_TRUE@ ../src/sphere/np_sphere.$(OBJEXT) \
		@BUILDFORTRAN_TRUE@ ../src/sphere/sphere.$(OBJEXT)
		sphere_np_sphere_OBJECTS = $(am_sphere_np_sphere_OBJECTS)
		sphere_np_sphere_LDADD = $(LDADD)
		sphere_np_sphere_DEPENDENCIES = libnptm/libnptm.la \
		@@ -203,19 +216,27 @@ sphere_np_sphere_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am__sphere_sph_SOURCES_DIST = ../src/sphere/sph.f
		@BUILDFORTRAN_TRUE@am__objects_4 = ../src/sphere/sph.$(OBJEXT)
		am_sphere_sph_OBJECTS = $(am__objects_4)
		@BUILDFORTRAN_TRUE@am_sphere_sph_OBJECTS = $(am__objects_4)
		sphere_sph_OBJECTS = $(am_sphere_sph_OBJECTS)
		sphere_sph_LDADD = $(LDADD)
		sphere_sph_DEPENDENCIES = libnptm/libnptm.la $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1)
		am_testing_test_TEDF_OBJECTS = ../src/testing/test_TEDF.$(OBJEXT)
		am__testing_test_TEDF_SOURCES_DIST = ../src/testing/test_TEDF.cpp
		@BUILDFORTRAN_FALSE@am_testing_test_TEDF_OBJECTS = \
		@BUILDFORTRAN_FALSE@ ../src/testing/test_TEDF.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_testing_test_TEDF_OBJECTS = \
		@BUILDFORTRAN_TRUE@ ../src/testing/test_TEDF.$(OBJEXT)
		testing_test_TEDF_OBJECTS = $(am_testing_test_TEDF_OBJECTS)
		testing_test_TEDF_LDADD = $(LDADD)
		testing_test_TEDF_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am_testing_test_TTMS_OBJECTS = ../src/testing/test_TTMS.$(OBJEXT)
		am__testing_test_TTMS_SOURCES_DIST = ../src/testing/test_TTMS.cpp
		@BUILDFORTRAN_FALSE@am_testing_test_TTMS_OBJECTS = \
		@BUILDFORTRAN_FALSE@ ../src/testing/test_TTMS.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_testing_test_TTMS_OBJECTS = \
		@BUILDFORTRAN_TRUE@ ../src/testing/test_TTMS.$(OBJEXT)
		testing_test_TTMS_OBJECTS = $(am_testing_test_TTMS_OBJECTS)
		testing_test_TTMS_LDADD = $(LDADD)
		testing_test_TTMS_DEPENDENCIES = libnptm/libnptm.la \
		@@ -223,7 +244,7 @@ testing_test_TTMS_DEPENDENCIES = libnptm/libnptm.la \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
		am__trapping_frfme_SOURCES_DIST = ../src/trapping/frfme.f
		@BUILDFORTRAN_TRUE@am__objects_5 = ../src/trapping/frfme.$(OBJEXT)
		am_trapping_frfme_OBJECTS = $(am__objects_5)
		@BUILDFORTRAN_TRUE@am_trapping_frfme_OBJECTS = $(am__objects_5)
		trapping_frfme_OBJECTS = $(am_trapping_frfme_OBJECTS)
		trapping_frfme_LDADD = $(LDADD)
		trapping_frfme_DEPENDENCIES = libnptm/libnptm.la $(am__DEPENDENCIES_1) \
		@@ -231,16 +252,23 @@ trapping_frfme_DEPENDENCIES = libnptm/libnptm.la $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1)
		am__trapping_lffft_SOURCES_DIST = ../src/trapping/lffft.f
		@BUILDFORTRAN_TRUE@am__objects_6 = ../src/trapping/lffft.$(OBJEXT)
		am_trapping_lffft_OBJECTS = $(am__objects_6)
		@BUILDFORTRAN_TRUE@am_trapping_lffft_OBJECTS = $(am__objects_6)
		trapping_lffft_OBJECTS = $(am_trapping_lffft_OBJECTS)
		trapping_lffft_LDADD = $(LDADD)
		trapping_lffft_DEPENDENCIES = libnptm/libnptm.la $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
		$(am__DEPENDENCIES_1)
		am_trapping_np_trapping_OBJECTS = \
		../src/trapping/np_trapping.$(OBJEXT) \
		../src/trapping/cfrfme.$(OBJEXT) \
		../src/trapping/clffft.$(OBJEXT)
		am__trapping_np_trapping_SOURCES_DIST = \
		../src/trapping/np_trapping.cpp ../src/trapping/cfrfme.cpp \
		../src/trapping/clffft.cpp
		@BUILDFORTRAN_FALSE@am_trapping_np_trapping_OBJECTS = \
		@BUILDFORTRAN_FALSE@ ../src/trapping/np_trapping.$(OBJEXT) \
		@BUILDFORTRAN_FALSE@ ../src/trapping/cfrfme.$(OBJEXT) \
		@BUILDFORTRAN_FALSE@ ../src/trapping/clffft.$(OBJEXT)
		@BUILDFORTRAN_TRUE@am_trapping_np_trapping_OBJECTS = \
		@BUILDFORTRAN_TRUE@ ../src/trapping/np_trapping.$(OBJEXT) \
		@BUILDFORTRAN_TRUE@ ../src/trapping/cfrfme.$(OBJEXT) \
		@BUILDFORTRAN_TRUE@ ../src/trapping/clffft.$(OBJEXT)
		trapping_np_trapping_OBJECTS = $(am_trapping_np_trapping_OBJECTS)
		trapping_np_trapping_LDADD = $(LDADD)
		trapping_np_trapping_DEPENDENCIES = libnptm/libnptm.la \
		@@ -344,13 +372,15 @@ SOURCES = $(libnptm_libnptm_la_SOURCES) $(cluster_clu_SOURCES) \
		DIST_SOURCES = $(libnptm_libnptm_la_SOURCES) \
		$(am__cluster_clu_SOURCES_DIST) \
		$(am__cluster_edfb_clu_SOURCES_DIST) \
		$(cluster_np_cluster_SOURCES) \
		$(am__cluster_np_cluster_SOURCES_DIST) \
		$(am__sphere_edfb_sph_SOURCES_DIST) \
		$(sphere_np_sphere_SOURCES) $(am__sphere_sph_SOURCES_DIST) \
		$(testing_test_TEDF_SOURCES) $(testing_test_TTMS_SOURCES) \
		$(am__sphere_np_sphere_SOURCES_DIST) \
		$(am__sphere_sph_SOURCES_DIST) \
		$(am__testing_test_TEDF_SOURCES_DIST) \
		$(am__testing_test_TTMS_SOURCES_DIST) \
		$(am__trapping_frfme_SOURCES_DIST) \
		$(am__trapping_lffft_SOURCES_DIST) \
		$(trapping_np_trapping_SOURCES)
		$(am__trapping_np_trapping_SOURCES_DIST)
		am__can_run_installinfo = \
		case $$AM_UPDATE_INFO_DIR in \
		n\|no\|NO) false;; \
		@@ -550,29 +580,28 @@ lib_LTLIBRARIES = libnptm/libnptm.la
		libnptm_libnptm_la_SOURCES = ../src/libnptm/algebraic.cpp ../src/libnptm/clu_subs.cpp ../src/libnptm/Commons.cpp ../src/libnptm/Configuration.cpp ../src/libnptm/file_io.cpp ../src/libnptm/lapack_calls.cpp ../src/libnptm/logging.cpp ../src/libnptm/magma_calls.cpp ../src/libnptm/Parsers.cpp ../src/libnptm/sph_subs.cpp ../src/libnptm/tfrfme.cpp ../src/libnptm/TransitionMatrix.cpp ../src/libnptm/tra_subs.cpp
		@BUILDFORTRAN_FALSE@PROGS = cluster/np_cluster sphere/np_sphere trapping/np_trapping testing/test_TEDF testing/test_TTMS
		@BUILDFORTRAN_TRUE@PROGS = cluster/edfb_clu cluster/clu cluster/np_cluster sphere/edfb_sph sphere/sph sphere/np_sphere trapping/frfme trapping/lffft trapping/np_trapping testing/test_TEDF testing/test_TTMS
		@BUILDFORTRAN_FALSE@EDFBCLUSOURCES =
		@BUILDFORTRAN_TRUE@EDFBCLUSOURCES = ../src/cluster/edfb_clu.f
		@BUILDFORTRAN_FALSE@CLUSOURCES =
		@BUILDFORTRAN_TRUE@CLUSOURCES = ../src/cluster/clu.f
		@BUILDFORTRAN_FALSE@EDFBSPHSOURCES =
		@BUILDFORTRAN_TRUE@EDFBSPHSOURCES = ../src/sphere/edfb_sph.f
		@BUILDFORTRAN_FALSE@SPHSOURCES =
		@BUILDFORTRAN_TRUE@SPHSOURCES = ../src/sphere/sph.f
		@BUILDFORTRAN_FALSE@FRFMESOURCES =
		@BUILDFORTRAN_TRUE@FRFMESOURCES = ../src/trapping/frfme.f
		@BUILDFORTRAN_FALSE@LFFFTSOURCES =
		@BUILDFORTRAN_TRUE@LFFFTSOURCES = ../src/trapping/lffft.f
		cluster_edfb_clu_SOURCES = $(EDFBCLUSOURCES)
		cluster_clu_SOURCES = $(CLUSOURCES)
		cluster_np_cluster_SOURCES = ../src/cluster/np_cluster.cpp ../src/cluster/cluster.cpp
		sphere_edfb_sph_SOURCES = $(EDFBSPHSOURCES)
		sphere_sph_SOURCES = $(SPHSOURCES)
		sphere_np_sphere_SOURCES = ../src/sphere/np_sphere.cpp ../src/sphere/sphere.cpp
		trapping_frfme_SOURCES = $(FRFMESOURCES)
		trapping_lffft_SOURCES = $(LFFFTSOURCES)
		trapping_np_trapping_SOURCES = ../src/trapping/np_trapping.cpp ../src/trapping/cfrfme.cpp ../src/trapping/clffft.cpp
		testing_test_TEDF_SOURCES = ../src/testing/test_TEDF.cpp
		testing_test_TTMS_SOURCES = ../src/testing/test_TTMS.cpp
		@BUILDFORTRAN_TRUE@cluster_edfb_clu_SOURCES = $(EDFBCLUSOURCES)
		@BUILDFORTRAN_TRUE@cluster_clu_SOURCES = $(CLUSOURCES)
		@BUILDFORTRAN_TRUE@sphere_edfb_sph_SOURCES = $(EDFBSPHSOURCES)
		@BUILDFORTRAN_TRUE@sphere_sph_SOURCES = $(SPHSOURCES)
		@BUILDFORTRAN_TRUE@trapping_frfme_SOURCES = $(FRFMESOURCES)
		@BUILDFORTRAN_TRUE@trapping_lffft_SOURCES = $(LFFFTSOURCES)
		@BUILDFORTRAN_FALSE@cluster_np_cluster_SOURCES = ../src/cluster/np_cluster.cpp ../src/cluster/cluster.cpp
		@BUILDFORTRAN_TRUE@cluster_np_cluster_SOURCES = ../src/cluster/np_cluster.cpp ../src/cluster/cluster.cpp
		@BUILDFORTRAN_FALSE@sphere_np_sphere_SOURCES = ../src/sphere/np_sphere.cpp ../src/sphere/sphere.cpp
		@BUILDFORTRAN_TRUE@sphere_np_sphere_SOURCES = ../src/sphere/np_sphere.cpp ../src/sphere/sphere.cpp
		@BUILDFORTRAN_FALSE@trapping_np_trapping_SOURCES = ../src/trapping/np_trapping.cpp ../src/trapping/cfrfme.cpp ../src/trapping/clffft.cpp
		@BUILDFORTRAN_TRUE@trapping_np_trapping_SOURCES = ../src/trapping/np_trapping.cpp ../src/trapping/cfrfme.cpp ../src/trapping/clffft.cpp
		@BUILDFORTRAN_FALSE@testing_test_TEDF_SOURCES = ../src/testing/test_TEDF.cpp
		@BUILDFORTRAN_TRUE@testing_test_TEDF_SOURCES = ../src/testing/test_TEDF.cpp
		@BUILDFORTRAN_FALSE@testing_test_TTMS_SOURCES = ../src/testing/test_TTMS.cpp
		@BUILDFORTRAN_TRUE@testing_test_TTMS_SOURCES = ../src/testing/test_TTMS.cpp
		all: all-am

		.SUFFIXES:

build/configure

+24 −34

Original line number	Diff line number	Diff line
		@@ -25151,25 +25151,23 @@ then :

		else

		if test "x$CUDA_LIB" = "x"; then
		export -p \| grep CUDA
		CUDA_DEF=$?
		if test "x$CUDA_DEF" != "x0"; then
		if test -d "/usr/local/cuda/targets/x86_64-linux/lib"; then
		export CUDA_LIB="/usr/local/cuda/targets/x86_64-linux/lib"
		fi
		if test -d "/usr/local/cuda/targets/x86_64-linux/lib"; then
		export CUDA_INCLUDE="/usr/local/cuda/targets/x86_64-linux/include"
		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}"
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} ${CUDAFLAGS}"
		export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"
		else
		if test "x$CUDA_INCLUDE" != "x"; then
		CUDAFLAGS="-I${CUDA_INCLUDE}"
		fi
		if test "x$MAGMA_INCLUDE" != "x"; then
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} ${CUDAFLAGS}"
		else
		@@ -25177,14 +25175,11 @@ then :
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 ${CUDAFLAGS}"
		fi
		fi
		if test "x$CUDA_LIB" != "x"; then
		CUDALDFLAGS="-L${CUDA_LIB}"
		fi
		if test "x$MAGMA_LIB" != "x"; then
		export MAGMALDFLAGS="${CUDALDFLAGS} -lcudart -L${MAGMA_LIB} -lmagma"
		export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"
		else
		if test -f /usr/include/magma_v2.h; then
		export MAGMALDFLAGS="${CUDALDFLAGS} -lcudart -lmagma"
		export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -lmagma"
		fi
		fi
		fi
		@@ -25209,25 +25204,23 @@ 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
		if test -d "/usr/local/cuda/targets/x86_64-linux/lib"; then
		export CUDA_LIB="/usr/local/cuda/targets/x86_64-linux/lib"
		fi
		if test -d "/usr/local/cuda/targets/x86_64-linux/lib"; then
		export CUDA_INCLUDE="/usr/local/cuda/targets/x86_64-linux/include"
		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}"
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} ${CUDAFLAGS}"
		export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"
		else
		if test "x$CUDA_INCLUDE" != "x"; then
		CUDAFLAGS="-I${CUDA_INCLUDE}"
		fi
		if test "x$MAGMA_INCLUDE" != "x"; then
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} ${CUDAFLAGS}"
		else
		@@ -25235,14 +25228,11 @@ else case e in #(
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 ${CUDAFLAGS}"
		fi
		fi
		if test "x$CUDA_LIB" != "x"; then
		CUDALDFLAGS="-L${CUDA_LIB}"
		fi
		if test "x$MAGMA_LIB" != "x"; then
		export MAGMALDFLAGS="${CUDALDFLAGS} -lcudart -L${MAGMA_LIB} -lmagma"
		export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"
		else
		if test -f /usr/include/magma_v2.h; then
		export MAGMALDFLAGS="${CUDALDFLAGS} -lcudart -lmagma"
		export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -lmagma"
		fi
		fi
		fi

build/configure.ac

+12 −17

Original line number	Diff line number	Diff line
		@@ -39,25 +39,23 @@ 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
		if test -d "/usr/local/cuda/targets/x86_64-linux/lib"; then
		export CUDA_LIB="/usr/local/cuda/targets/x86_64-linux/lib"
		fi
		if test -d "/usr/local/cuda/targets/x86_64-linux/lib"; then
		export CUDA_INCLUDE="/usr/local/cuda/targets/x86_64-linux/include"
		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}"
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} ${CUDAFLAGS}"
		export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"
		else
		if test "x$CUDA_INCLUDE" != "x"; then
		CUDAFLAGS="-I${CUDA_INCLUDE}"
		fi
		if test "x$MAGMA_INCLUDE" != "x"; then
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} ${CUDAFLAGS}"
		else
		@@ -65,14 +63,11 @@ m4_define(
		export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 ${CUDAFLAGS}"
		fi
		fi
		if test "x$CUDA_LIB" != "x"; then
		CUDALDFLAGS="-L${CUDA_LIB}"
		fi
		if test "x$MAGMA_LIB" != "x"; then
		export MAGMALDFLAGS="${CUDALDFLAGS} -lcudart -L${MAGMA_LIB} -lmagma"
		export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"
		else
		if test -f /usr/include/magma_v2.h; then
		export MAGMALDFLAGS="${CUDALDFLAGS} -lcudart -lmagma"
		export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -lmagma"
		fi
		fi
		fi