CFD/hypre
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure fix for last merged PR

Browse Source
This commit is contained in:
Ruipeng Li 2021-03-04 01:02:38 -08:00
parent 8c00f18a95
commit b5070c14e2
2 changed files with 40 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/config/configure.in
View File

@ -1809,32 +1809,30 @@ then
fi
fi
if [ test "x$hypre_using_um" = "xyes"]
if [test "x$hypre_using_um" = "xyes"]
then
if [test "$hypre_using_cuda" = "yes" || test "$hypre_using_device_openmp" = "yes"]
then
AC_CHECK_HEADERS(["${CUDA_HOME}/include/cuda.h"], [hypre_found_cuda=yes; HYPRE_CUDA_PATH=${CUDA_HOME}])
if test "x$hypre_found_cuda" != "xyes"
then
AC_CHECK_HEADERS(["${CUDA_PATH}/include/cuda.h"], [hypre_found_cuda=yes; HYPRE_CUDA_PATH=${CUDA_PATH}])
fi
if test "x$hypre_found_cuda" != "xyes"
then
AC_MSG_ERROR([unable to find cuda.h ... Ensure that CUDA_HOME or CUDA_PATH is set])
fi
dnl if not using cuda, make sure we're using hip
dnl if not error. if we are, HIP will be checked below.
else
if [test "x$hypre_using_hip" != "xyes"]
then
AC_MSG_ERROR([Asked for unified memory, but not using CUDA, HIP, or device OpenMP!])
fi
fi
if [test "x$hypre_using_cuda" != "yes" && test "x$hypre_using_device_openmp" != "xyes" && test "x$hypre_using_hip" != "xyes"]
then
AC_MSG_ERROR([Asked for unified memory, but not using CUDA, HIP, or device OpenMP!])
fi
fi dnl hypre_using_um
dnl CUDA
if [test "$hypre_using_cuda" = "yes" || test "$hypre_using_device_openmp" = "yes"]
then
AC_CHECK_HEADERS(["${CUDA_HOME}/include/cuda.h"], [hypre_found_cuda=yes; HYPRE_CUDA_PATH=${CUDA_HOME}])
if test "x$hypre_found_cuda" != "xyes"
then
AC_CHECK_HEADERS(["${CUDA_PATH}/include/cuda.h"], [hypre_found_cuda=yes; HYPRE_CUDA_PATH=${CUDA_PATH}])
fi
if test "x$hypre_found_cuda" != "xyes"
then
AC_MSG_ERROR([unable to find cuda.h ... Ensure that CUDA_HOME or CUDA_PATH is set])
fi
fi
dnl *********************************************************************
dnl * Check for HIP header
dnl *********************************************************************

51
src/configure vendored
View File

@ -742,7 +742,6 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
@ -904,7 +903,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@ -1157,15 +1155,6 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@ -1303,7 +1292,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir runstatedir
libdir localedir mandir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@ -1456,7 +1445,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@ -8403,12 +8391,16 @@ $as_echo "$as_me: WARNING: *****************************************************
fi
fi
if test "x$hypre_using_um" = "xyes"
if test "x$hypre_using_um" = "xyes"
then
if test "$hypre_using_cuda" = "yes" || test "$hypre_using_device_openmp" = "yes"
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
if test "x$hypre_using_cuda" != "yes" && test "x$hypre_using_device_openmp" != "xyes" && test "x$hypre_using_hip" != "xyes"
then
as_fn_error $? "Asked for unified memory, but not using CUDA, HIP, or device OpenMP!" "$LINENO" 5
fi
fi
if test "$hypre_using_cuda" = "yes" || test "$hypre_using_device_openmp" = "yes"
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
if ${ac_cv_header_stdc+:} false; then :
$as_echo_n "(cached) " >&6
@ -8559,9 +8551,9 @@ fi
done
if test "x$hypre_found_cuda" != "xyes"
then
for ac_header in "${CUDA_PATH}/include/cuda.h"
if test "x$hypre_found_cuda" != "xyes"
then
for ac_header in "${CUDA_PATH}/include/cuda.h"
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@ -8574,20 +8566,15 @@ fi
done
fi
fi
if test "x$hypre_found_cuda" != "xyes"
then
as_fn_error $? "unable to find cuda.h ... Ensure that CUDA_HOME or CUDA_PATH is set" "$LINENO" 5
fi
else
if test "x$hypre_using_hip" != "xyes"
then
as_fn_error $? "Asked for unified memory, but not using CUDA, HIP, or device OpenMP!" "$LINENO" 5
fi
fi
if test "x$hypre_found_cuda" != "xyes"
then
as_fn_error $? "unable to find cuda.h ... Ensure that CUDA_HOME or CUDA_PATH is set" "$LINENO" 5
fi
fi
if test x"$hypre_using_hip" == x"yes" ; then :
if test -n "$ROCM_PATH"; then :
HYPRE_ROCM_PREFIX=$ROCM_PATH