Commit c2ab5706 authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Improve CUDA diagnostic in MAGMA detection test

parent 14d259f0

build/configure

+14 −20
Original line number Original line Diff line number Diff line
@@ -25151,14 +25151,11 @@ then : 
















    else







    else



























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














    export -p | grep CUDA







    export -p | grep CUDA











    CUDA_DEF=$?







    CUDA_DEF=$?











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







    if test "x$CUDA_DEF" != "x0"; then











        CUDA_LIB=${CUDA_HOME}/targets/x86_64-linux/lib







      export CUDA_LIB=/usr/local/cuda/targets/x86_64-linux/lib











      else







      export CUDA_INCLUDE=/usr/local/cuda/targets/x86_64-linux/include











        CUDA_LIB=/usr/local/cuda/targets/x86_64-linux/lib














      fi














    fi







    fi











    export -p | grep MAGMA







    export -p | grep MAGMA











    MAGMA_DEF=$?







    MAGMA_DEF=$?









@@ -25167,10 +25164,10 @@ then :









      export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"







      export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"











    else







    else











      if test "x$MAGMA_INCLUDE" != "x"; then







      if test "x$MAGMA_INCLUDE" != "x"; then











        export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE}"







        export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} -I${CUDA_INCLUDE}"











      else







      else











        if test -f /usr/include/magma_v2.h; then







        if test -f /usr/include/magma_v2.h; then











          export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64"







          export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${CUDA_INCLUDE}"











	fi







	fi











      fi







      fi











      if test "x$MAGMA_LIB" != "x"; then







      if test "x$MAGMA_LIB" != "x"; then










@@ -25202,14 +25199,11 @@ fi









else case e in #(







else case e in #(











  e)







  e)



























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














    export -p | grep CUDA







    export -p | grep CUDA











    CUDA_DEF=$?







    CUDA_DEF=$?











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







    if test "x$CUDA_DEF" != "x0"; then











        CUDA_LIB=${CUDA_HOME}/targets/x86_64-linux/lib







      export CUDA_LIB=/usr/local/cuda/targets/x86_64-linux/lib











      else







      export CUDA_INCLUDE=/usr/local/cuda/targets/x86_64-linux/include











        CUDA_LIB=/usr/local/cuda/targets/x86_64-linux/lib














      fi














    fi







    fi











    export -p | grep MAGMA







    export -p | grep MAGMA











    MAGMA_DEF=$?







    MAGMA_DEF=$?









@@ -25218,10 +25212,10 @@ else case e in #(









      export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"







      export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"











    else







    else











      if test "x$MAGMA_INCLUDE" != "x"; then







      if test "x$MAGMA_INCLUDE" != "x"; then











        export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE}"







        export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} -I${CUDA_INCLUDE}"











      else







      else











        if test -f /usr/include/magma_v2.h; then







        if test -f /usr/include/magma_v2.h; then











          export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64"







          export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${CUDA_INCLUDE}"











	fi







	fi











      fi







      fi











      if test "x$MAGMA_LIB" != "x"; then







      if test "x$MAGMA_LIB" != "x"; then

























build/configure.ac



+7
−10




























Original line number
Original line
Diff line number
Diff line








@@ -39,14 +39,11 @@ m4_define(









m4_define(







m4_define(











  [M4_DETECT_MAGMA],







  [M4_DETECT_MAGMA],











  [







  [











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














    export -p | grep CUDA







    export -p | grep CUDA











    CUDA_DEF=$?







    CUDA_DEF=$?











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







    if test "x$CUDA_DEF" != "x0"; then











        CUDA_LIB=${CUDA_HOME}/targets/x86_64-linux/lib







      export CUDA_LIB=/usr/local/cuda/targets/x86_64-linux/lib











      else







      export CUDA_INCLUDE=/usr/local/cuda/targets/x86_64-linux/include











        CUDA_LIB=/usr/local/cuda/targets/x86_64-linux/lib














      fi














    fi







    fi











    export -p | grep MAGMA







    export -p | grep MAGMA











    MAGMA_DEF=$?







    MAGMA_DEF=$?









@@ -55,10 +52,10 @@ m4_define(









      export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"







      export MAGMALDFLAGS="-L${CUDA_LIB} -lcudart -L${MAGMA_LIB} -lmagma"











    else







    else











      if test "x$MAGMA_INCLUDE" != "x"; then







      if test "x$MAGMA_INCLUDE" != "x"; then











        export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE}"







        export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${MAGMA_INCLUDE} -I${CUDA_INCLUDE}"











      else







      else











        if test -f /usr/include/magma_v2.h; then







        if test -f /usr/include/magma_v2.h; then











          export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64"







          export MAGMAFLAGS="-DUSE_MAGMA -DMAGMA_ILP64 -I${CUDA_INCLUDE}"











	fi







	fi











      fi







      fi











      if test "x$MAGMA_LIB" != "x"; then







      if test "x$MAGMA_LIB" != "x"; then