portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-09 21:50:45 +01:00
Code Releases Activity

resolved merge conflict

Browse Source
This commit is contained in:
nils meyer 2020-04-24 10:14:21 +02:00
commit 345721220e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -199,7 +199,7 @@ if test "${ac_MKL}x" != "nox"; then
fi fi
if test "${ac_IPP}x" != "nox"; then if test "${ac_IPP}x" != "nox"; then
AC_SEARCH_LIBS([ippsCRC32C_8u], [ippdc], AC_SEARCH_LIBS([ippsCRC32C_8u], [ippdc],
[LIBS="${LIBS} -lippdc -lippvm -lipps -lippcore"], [LIBS="${LIBS} -lippdc -lippvm -lipps -lippcore"],
[AC_MSG_ERROR("Intel IPP enabled but library not found")]) [AC_MSG_ERROR("Intel IPP enabled but library not found")])
fi fi
@ -274,8 +274,8 @@ case ${ac_gen_scalar} in
esac esac
##################### Compiler dependent choices ##################### Compiler dependent choices
case ${CXX} in case ${CXX} in
nvcc) nvcc)
# CXX="nvcc -keep -v -x cu " # CXX="nvcc -keep -v -x cu "
# CXXLD="nvcc -v -link" # CXXLD="nvcc -v -link"
CXX="nvcc -x cu " CXX="nvcc -x cu "
@ -288,9 +288,7 @@ case ${CXX} in
;; ;;
*) *)
CXXLD=${CXX} CXXLD=${CXX}
#
CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
#CXXFLAGS="$CXXFLAGS"
;; ;;
esac esac
@ -632,4 +630,3 @@ AC_OUTPUT
echo "" echo ""
cat grid.configure.summary cat grid.configure.summary
echo "" echo ""