diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2019-09-27 15:16:26 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2019-09-27 15:16:26 +0200 |
| commit | 54af7e8e22a3f1c9d90b13291b28d39778c05564 (patch) | |
| tree | 260310b16d624261bb80f82979af27750022259b /build | |
| parent | 1fec36f7ccadd5f7dcf2bb59b0654dc53653b0f3 (diff) | |
| parent | b629db207bb263495bfff2e61ce189ccac27b4b9 (diff) | |
| download | astra-54af7e8e22a3f1c9d90b13291b28d39778c05564.tar.gz astra-54af7e8e22a3f1c9d90b13291b28d39778c05564.tar.bz2 astra-54af7e8e22a3f1c9d90b13291b28d39778c05564.tar.xz astra-54af7e8e22a3f1c9d90b13291b28d39778c05564.zip | |
Merge branch 'consistent_scaling'
Diffstat (limited to 'build')
| -rw-r--r-- | build/linux/Makefile.in | 2 | ||||
| -rw-r--r-- | build/linux/acinclude.m4 | 17 | ||||
| -rw-r--r-- | build/linux/configure.ac | 8 |
3 files changed, 25 insertions, 2 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 209206e..f478bb7 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -257,8 +257,6 @@ endif TEST_OBJECTS=\ tests/main.o \ tests/test_AstraObjectManager.o \ - tests/test_ParallelBeamLineKernelProjector2D.o \ - tests/test_ParallelBeamLinearKernelProjector2D.o \ tests/test_Float32Data2D.o \ tests/test_VolumeGeometry2D.o \ tests/test_ParallelProjectionGeometry2D.o \ diff --git a/build/linux/acinclude.m4 b/build/linux/acinclude.m4 index 92f263a..4d278c7 100644 --- a/build/linux/acinclude.m4 +++ b/build/linux/acinclude.m4 @@ -166,3 +166,20 @@ fi rm -f conftest.cu conftest.o conftest.nvcc.out ]) +dnl ASTRA_CHECK_CUDA_BOOST(action-if-ok, action-if-not-ok) +dnl Check for a specific incompatibility between boost and cuda version +dnl (See https://github.com/boostorg/config/pull/175 ) +AC_DEFUN([ASTRA_CHECK_CUDA_BOOST],[ +cat >conftest.cu <<_ACEOF +#include <boost/shared_ptr.hpp> +int main() { + return 0; +} +_ACEOF +ASTRA_RUN_LOGOUTPUT([$NVCC -c -o conftest.o conftest.cu $NVCCFLAGS]) +AS_IF([test $? = 0],[$1],[ + AS_ECHO(["$as_me: failed program was:"]) >&AS_MESSAGE_LOG_FD + sed 's/^/| /' conftest.cu >&AS_MESSAGE_LOG_FD + $2]) +]) + diff --git a/build/linux/configure.ac b/build/linux/configure.ac index 0a9024e..bb4d113 100644 --- a/build/linux/configure.ac +++ b/build/linux/configure.ac @@ -122,6 +122,14 @@ if test x"$HAVECUDA" = xyes; then AC_MSG_RESULT($HAVECUDA) fi +if test x"$HAVECUDA" = xyes; then + AC_MSG_CHECKING([if boost and CUDA versions are compatible]) + ASTRA_CHECK_CUDA_BOOST(AC_MSG_RESULT([yes]),[ + AC_MSG_RESULT([no]) + AC_MSG_ERROR([Boost and CUDA versions are incompatible. You probably have to upgrade boost.]) + ]) +fi + AC_ARG_WITH(cuda_compute, [[ --with-cuda-compute=archs comma separated list of CUDA compute models (optional)]],,) if test x"$HAVECUDA" = xyes; then AC_MSG_CHECKING([for nvcc archs]) |