Remove boost requirement

Boost remains in use in Windows builds for threading.
bigfly-nb · Aug 23, 2023 · 51cb553 · 51cb553
1 parent ae76b99
commit 51cb553
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 58 deletions.
diff --git a/build/linux/acinclude.m4 b/build/linux/acinclude.m4
@@ -1,20 +1,3 @@
-AC_DEFUN([ASTRA_CHECK_BOOST_THREAD],[
-BOOST_BACKUP_LIBS="$LIBS"
-LIBS="$LIBS $1"
-AC_LINK_IFELSE([AC_LANG_SOURCE([
-#include <boost/thread.hpp>
-int main()
-{
-  boost::thread t;
-  boost::posix_time::milliseconds m(1);
-  t.timed_join(m);
-  return 0;
-}
-])],[$2],[$3])
-LIBS="$BOOST_BACKUP_LIBS"
-unset BOOST_BACKUP_LIBS
-])
-
 AC_DEFUN([ASTRA_CHECK_BOOST_UNIT_TEST_FRAMEWORK],[
 BOOST_BACKUP_LIBS="$LIBS"
 LIBS="$LIBS $1"
@@ -169,21 +152,3 @@ else
 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
@@ -72,18 +72,6 @@ fi
 AC_SUBST(HAVEBOOSTUTF)
 AC_SUBST(LIBS_BOOSTUTF)
 
-BOOSTok=yes
-dnl AC_CHECK_HEADER([boost/any.hpp],[],[BOOSTok=no],[])
-dnl AC_CHECK_HEADER([boost/thread.hpp],[],[BOOSTok=no],[])
-dnl AC_CHECK_HEADER([boost/bind.hpp],[],[BOOSTok=no],[])
-dnl AC_CHECK_HEADER([boost/static_assert.hpp],[],[BOOSTok=no],[])
-dnl AC_CHECK_HEADER([boost/throw_exception.hpp],[],[BOOSTok=no],[])
-AC_CHECK_HEADER([boost/shared_ptr.hpp],[],[BOOSTok=no],[])
-
-if test x$BOOSTok = xno; then
-  AC_MSG_ERROR([boost not found])
-fi
-
 # nvcc, cuda
 
 AC_ARG_WITH(cuda, [[  --with-cuda=path        path of CUDA (optional)]],,)
@@ -123,14 +111,6 @@ 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])

diff --git a/python/conda/astra-toolbox/meta.yaml b/python/conda/astra-toolbox/meta.yaml
@@ -27,7 +27,6 @@ requirements:
   host:
     - python
     - cython >=0.13
-    - boost # [osx or linux]
     - nomkl # [not win]
     - numpy {{ numpy }}
     - scipy

diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml
@@ -15,7 +15,6 @@ requirements:
   build:
     - {{ compiler('c') }}    # [win or linux]
     - {{ compiler('cxx') }}  # [linux]
-    - boost # [osx]
     - automake # [osx]
     - autoconf # [osx]
     - libtool # [osx]
@@ -27,7 +26,6 @@ requirements:
     - libgomp <9.3 # [linux]
     {% endif %}
   host:
-    - boost # [osx or linux]
     - cudatoolkit {{ cudatoolkit_dep }} # [win or linux]
     {% if linux and cxx_compiler_version in ['5.4', '7.3'] -%}
     - libstdcxx-ng <9.3 # [linux]