Commit 52ad3185 authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Enable MAGMA detection through module variables

parent 1d2be181

build/configure

+12 −6
Original line number Diff line number Diff line
@@ -24829,7 +24829,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu 














# Environment setup



























    export -p | grep HDF5_ROOT













    export -p | grep HDF5_ROOT > /dev/null















    result=$?















    if test "x$result" = "x0"; then















      if test "x$HDF5_INCLUDE" = "x"; then









@@ -24839,7 +24839,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu













        export HDF5_LIB=${HDF5_ROOT}/lib















      fi















    fi













    export -p | grep HDF5_DIR













    export -p | grep HDF5_DIR > /dev/null















    result=$?















    if test "x$result" = "x0"; then















      if test "x$HDF5_INCLUDE" = "x"; then










@@ -25110,7 +25110,7 @@ then :



























    else



























    export -p | grep MKL













    export -p | grep MKL > /dev/null















    MKL_DEF=$?















    if test "x$MKL_DEF" = "x0"; then















      export LAPACKFLAGS="-DUSE_LAPACK -DUSE_MKL -DLAPACK_ILP64 -DUSE_ILP64 -I{MKLROOT}/include"










@@ -25142,7 +25142,7 @@ fi













else case e in #(















  e)



























    export -p | grep MKL













    export -p | grep MKL > /dev/null















    MKL_DEF=$?















    if test "x$MKL_DEF" = "x0"; then















      export LAPACKFLAGS="-DUSE_LAPACK -DUSE_MKL -DLAPACK_ILP64 -DUSE_ILP64 -I{MKLROOT}/include"










@@ -25196,7 +25196,7 @@ then :













    elif test -f /usr/include/cuda.h; then















      CUDAFLAGS="-I/usr/include"















      CUDALDFLAGS="-lcudart"













    elif text "x$CUDA_HOME" != "x"; then













    elif test "x$CUDA_HOME" != "x"; then















      CUDAFLAGS="-I${CUDA_HOME}/include"















      CUDALDFLAGS="-L${CUDA_HOME}/lib64 -lcudart"















    fi









@@ -25210,6 +25210,9 @@ then :













      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"













      elif test "x$MAGMA_ROOT" != "x"; then













        export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 $CUDAFLAGS -I${MAGMA_ROOT}/include"













	export MAGMALDFLAGS="$CUDALDFLAGS -L${MAGMA_ROOT}/lib -lmagma"















      fi















    fi
























@@ -25239,7 +25242,7 @@ else case e in #(













    elif test -f /usr/include/cuda.h; then















      CUDAFLAGS="-I/usr/include"















      CUDALDFLAGS="-lcudart"













    elif text "x$CUDA_HOME" != "x"; then













    elif test "x$CUDA_HOME" != "x"; then















      CUDAFLAGS="-I${CUDA_HOME}/include"















      CUDALDFLAGS="-L${CUDA_HOME}/lib64 -lcudart"















    fi









@@ -25253,6 +25256,9 @@ else case e in #(













      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"













      elif test "x$MAGMA_ROOT" != "x"; then













        export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 $CUDAFLAGS -I${MAGMA_ROOT}/include"













	export MAGMALDFLAGS="$CUDALDFLAGS -L${MAGMA_ROOT}/lib -lmagma"















      fi















    fi







































build/configure.ac



+3
−0




























Original line number
Diff line number
Diff line








@@ -91,6 +91,9 @@ m4_define(













      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"













      elif test "x$MAGMA_ROOT" != "x"; then













        export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 $CUDAFLAGS -I${MAGMA_ROOT}/include"













	export MAGMALDFLAGS="$CUDALDFLAGS -L${MAGMA_ROOT}/lib -lmagma"















      fi















    fi















  ]