use boost submodules

tcaduser · tcaduser · commit 6dc124e54812 · 2022-09-19T23:58:03.000-05:00
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,12 @@
 [submodule "external/eigen"]
 	path = external/eigen
 	url = https://gitlab.com/libeigen/eigen.git
+[submodule "external/boostorg/multiprecision"]
+	path = external/boostorg/multiprecision
+	url = https://github.com/boostorg/multiprecision
+[submodule "external/boostorg/config"]
+	path = external/boostorg/config
+	url = https://github.com/boostorg/config
+[submodule "external/boostorg/math"]
+	path = external/boostorg/math
+	url = https://github.com/boostorg/math
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,6 +4,10 @@
 
 Please see the release notes in doc/devsim.pdf or at https://devsim.net for more detailed information about changes.
 
+## Version TBD
+
+Boost is now added as a submodule, instead of using system libraries or Anaconda Python versions.  The Centos 7 build no longer requires Anaconda Python.
+
 ## Version 2.2.0
 
 It is possible to delete devices using the ``delete_device`` command.  Meshes used to instantiate devices may be deleted using the ``delete_mesh`` command.  Parameters set on a device and its regions are also cleared from the parameter database.
diff --git a/cmake/appveyor.cmake b/cmake/appveyor.cmake
@@ -7,7 +7,9 @@
 #SET (CMAKE_CXX_WARNING_LEVEL 4)
 SET (FLEX  "C:/msys64/usr/bin/flex.exe")
 SET (BISON "C:/msys64/usr/bin/bison.exe")
-SET (BOOST_INCLUDE "${CONDA_PREFIX}/Library/include")
+SET (EXTERNAL_LIB ${PROJECT_SOURCE_DIR}/external)
+SET (BOOST_INCLUDE ${EXTERNAL_LIB}/boostorg/config/include ${EXTERNAL_LIB}/boostorg/math/include ${EXTERNAL_LIB}/boostorg/multiprecision/include)
+ADD_DEFINITIONS(-DBOOST_MP_STANDALONE -DBOOST_MP_MATH_AVAILABLE)
 
 ADD_DEFINITIONS(-DSTATIC_BUILD -D_USE_MATH_DEFINES)
 #Math stuff
diff --git a/cmake/centos_6.cmake b/cmake/centos_6.cmake
@@ -1,11 +1,10 @@
-ADD_COMPILE_OPTIONS(-Wall -fvisibility=hidden)
-
 SET (EXTERNAL_LIB ${PROJECT_SOURCE_DIR}/external)
 
 SET (FLEX /usr/bin/flex)
 SET (BISON /usr/bin/bison)
 
-SET (BOOST_INCLUDE "${EXTERNAL_LIB}/boost_1_80_0")
+SET (BOOST_INCLUDE ${EXTERNAL_LIB}/boostorg/config/include ${EXTERNAL_LIB}/boostorg/math/include ${EXTERNAL_LIB}/boostorg/multiprecision/include)
+ADD_DEFINITIONS(-DBOOST_MP_STANDALONE -DBOOST_MP_MATH_AVAILABLE)
 
 SET (QUADMATH_ARCHIVE "-lquadmath")
 
@@ -36,6 +35,6 @@ SET (SYMDIFF_ARCHIVE ${EXTERNAL_LIB}/symdiff/lib/libsymdiff_dynamic.a)
 #SET (PYTHON3_INCLUDE   ${CONDA_PREFIX}/include/python3.8)
 #SET (PYTHON3_ARCHIVE -L${CONDA_PREFIX}/lib   -lpython3.8m)
 
-# important flag for dynamic linking of static archives on linux
+ADD_COMPILE_OPTIONS(-Wall -fvisibility=hidden)
 SET (CMAKE_POSITION_INDEPENDENT_CODE ON)
 
diff --git a/cmake/msys.cmake b/cmake/msys.cmake
@@ -1,9 +1,12 @@
+SET (EXTERNAL_LIB ${PROJECT_SOURCE_DIR}/external)
+
 ADD_COMPILE_OPTIONS(-Wall)
 SET (FLEX flex)
 SET (BISON bison)
 
-SET (BOOST_INCLUDE "${CONDA_PREFIX}/Library/include")
+SET (BOOST_INCLUDE ${EXTERNAL_LIB}/boostorg/config/include ${EXTERNAL_LIB}/boostorg/math/include ${EXTERNAL_LIB}/boostorg/multiprecision/include)
 ADD_DEFINITIONS(-DBOOST_NO_CXX14_CONSTEXPR)
+ADD_DEFINITIONS(-DBOOST_MP_STANDALONE -DBOOST_MP_MATH_AVAILABLE)
 #ADD_DEFINITIONS(-DSTATIC_BUILD -D_USE_MATH_DEFINES)
 
 #SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:strict /EHsc ${WARNINGS_IGNORE}")
diff --git a/cmake/osx_10.10.cmake b/cmake/osx_10.10.cmake
@@ -5,7 +5,8 @@ SET (EXTERNAL_LIB ${PROJECT_SOURCE_DIR}/external)
 SET (FLEX /usr/bin/flex)
 SET (BISON /usr/bin/bison)
 
-SET (BOOST_INCLUDE "${CONDA_PREFIX}/include")
+SET (BOOST_INCLUDE ${EXTERNAL_LIB}/boostorg/config/include ${EXTERNAL_LIB}/boostorg/math/include ${EXTERNAL_LIB}/boostorg/multiprecision/include)
+ADD_DEFINITIONS(-DBOOST_MP_STANDALONE -DBOOST_MP_MATH_AVAILABLE)
 
 SET (BLAS_ARCHIVE  -weak-lblas -weak-llapack)
 SET (EXTERNAL_LIB ${PROJECT_SOURCE_DIR}/external)
@@ -21,3 +22,4 @@ SET (SYMDIFF_ARCHIVE ${EXTERNAL_LIB}/symdiff/lib/libsymdiff_static.a)
 SET (SYMDIFF_INCLUDE ${EXTERNAL_LIB}/symdiff/include)
 SET (ADD_LINKER_FLAGS " -flat_namespace")
 
+
diff --git a/cmake/osx_gcc.cmake b/cmake/osx_gcc.cmake
@@ -5,7 +5,8 @@ SET (EXTERNAL_LIB ${PROJECT_SOURCE_DIR}/external)
 SET (FLEX /usr/bin/flex)
 SET (BISON /usr/bin/bison)
 
-SET (BOOST_INCLUDE "${CONDA_PREFIX}/include")
+SET (BOOST_INCLUDE ${EXTERNAL_LIB}/boostorg/config/include ${EXTERNAL_LIB}/boostorg/math/include ${EXTERNAL_LIB}/boostorg/multiprecision/include)
+ADD_DEFINITIONS(-DBOOST_MP_STANDALONE -DBOOST_MP_MATH_AVAILABLE)
 
 SET (QUADMATH_ARCHIVE "-lquadmath")
 
@@ -31,3 +32,4 @@ SET (ZLIB_ARCHIVE ${CONDA_PREFIX}/lib/libz.a)
 SET (SYMDIFF_INCLUDE ${EXTERNAL_LIB}/symdiff/include)
 SET (SYMDIFF_ARCHIVE ${EXTERNAL_LIB}/symdiff/lib/libsymdiff_static.a)
 
+
diff --git a/cmake/ubuntu_18.04.cmake b/cmake/ubuntu_18.04.cmake
@@ -1,5 +1,3 @@
-ADD_COMPILE_OPTIONS(-Wall -fvisibility=hidden)
-
 SET (FLEX /usr/bin/flex)
 SET (BISON /usr/bin/bison)
 SET (EXTERNAL_LIB ${PROJECT_SOURCE_DIR}/external)
@@ -15,14 +13,15 @@ SET (SQLITE3_ARCHIVE -lsqlite3)
 SET (SUPERLULOCATE  ${EXTERNAL_LIB}/superlu)
 SET (SUPERLU_INCLUDE ${SUPERLULOCATE}/SRC)
 SET (SUPERLU_ARCHIVE ${SUPERLULOCATE}/build/SRC/libsuperlu.a)
-SET (BOOST_INCLUDE "/usr/include")
+SET (BOOST_INCLUDE ${EXTERNAL_LIB}/boostorg/config/include ${EXTERNAL_LIB}/boostorg/math/include ${EXTERNAL_LIB}/boostorg/multiprecision/include)
+ADD_DEFINITIONS(-DBOOST_MP_STANDALONE -DBOOST_MP_MATH_AVAILABLE)
 SET (QUADMATH_ARCHIVE "-lquadmath")
 SET (DLOPEN_LIB -ldl)
 SET (SQLITE3_INCLUDE /usr/include)
 
 SET (SYMDIFF_ARCHIVE ${EXTERNAL_LIB}/symdiff/lib/libsymdiff_dynamic.a)
 SET (SYMDIFF_INCLUDE ${EXTERNAL_LIB}/symdiff/include)
 
-# important flag for dynamic linking of static archives on linux
+ADD_COMPILE_OPTIONS(-Wall -fvisibility=hidden)
 SET (CMAKE_POSITION_INDEPENDENT_CODE ON)
 
diff --git a/external/boostorg/config b/external/boostorg/config
@@ -0,0 +1 @@
+Subproject commit 1cff5e37bb69f42ffab73438de61e34c71258f19
diff --git a/external/boostorg/math b/external/boostorg/math
@@ -0,0 +1 @@
+Subproject commit db2a7cbb44a84c4c9cba62232c07f18b22bd965d
diff --git a/external/boostorg/multiprecision b/external/boostorg/multiprecision
@@ -0,0 +1 @@
+Subproject commit 3b333b1634a3bf92ded87732ad3a6f7f68b22229
diff --git a/scripts/build_appveyor.bat b/scripts/build_appveyor.bat
@@ -9,7 +9,7 @@ SET TAG=%3
 c:\msys64\usr\bin\pacman -Su --noconfirm rsync zip bison flex git
 
 :: now opt for explicit dll load of mkl
-call %CONDA_BIN% create -y -n python3_devsim_build python=3 cmake sqlite zlib boost
+call %CONDA_BIN% create -y -n python3_devsim_build python=3 cmake sqlite zlib
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 call %CONDA_BIN% activate python3_devsim_build
diff --git a/scripts/build_centos_7.sh b/scripts/build_centos_7.sh
@@ -15,12 +15,6 @@ export CC="/opt/rh/devtoolset-9/root/usr/bin/gcc"
 export CXX="/opt/rh/devtoolset-9/root/usr/bin/g++"
 export F77="/opt/rh/devtoolset-9/root/usr/bin/gfortran"
 
-#minimal conda environments to prevent linking against the wrong libraries
-# now opt for explicit dll load of mkl
-#conda create  -y --name python3_devsim_build python=3 mkl mkl-devel mkl-include boost cmake
-#conda create  -y --name python3_devsim_build python=3 boost cmake nomkl
-#source activate python3_devsim_build
-
 export PYTHON3_BIN=python3
 export PYTHON3_INCLUDE=$(${PYTHON3_BIN} -c "from sysconfig import get_paths as gp; print(gp()['include'])")
 export PYTHON3_ARCHIVE=""
@@ -34,9 +28,6 @@ export PYTHON3_ARCHIVE=""
 # quad precision getrf
 (cd external/getrf && bash setup_centos6.sh && cd build && make -j2)
 
-#
-(cd external && curl -L -O https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.gz && tar xzf boost_1_80_0.tar.gz)
-
 # start devsim build
 bash scripts/setup_centos_6.sh
 
diff --git a/scripts/build_fedora.sh b/scripts/build_fedora.sh
@@ -11,7 +11,7 @@ if [[ ${EUID} -ne 0 ]]; then
   SUDO=sudo
 fi
 ${SUDO} dnf install -y git bison flex tcl tcl-devel cmake3 gcc gcc-c++ libquadmath-devel \
-     gcc-gfortran bzip2 boost boost-devel cgnslib cgnslib-devel \
+     gcc-gfortran bzip2 cgnslib cgnslib-devel \
      sqlite-devel python3-devel blas-devel lapack-devel SuperLU SuperLU-devel \
      make rsync
 
diff --git a/scripts/build_macos.sh b/scripts/build_macos.sh
@@ -43,15 +43,14 @@ fi
 #minimal conda environments to prevent linking against the wrong libraries
 if [ "${1}" = "gcc" ]
 then
-#conda create  -y --name python3_devsim_build python=3 mkl mkl-devel mkl-include boost cmake
 # now opt for explicit dll load of mkl
-conda create  -y --name python3_devsim_build python=3 boost cmake nomkl
+conda create  -y --name python3_devsim_build python=3 cmake nomkl
 fi
 
 #This version does not use pardiso
 if [ "${1}" = "clang" ]
 then
-conda create  -y --name python3_devsim_build python=3 boost cmake nomkl
+conda create  -y --name python3_devsim_build python=3 cmake nomkl
 fi
 source activate python3_devsim_build
 
diff --git a/scripts/install_ubuntu_depend.sh b/scripts/install_ubuntu_depend.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 set -e
 
-apt install -y flex bison curl gcc gfortran g++ make cmake libsqlite3-dev zlib1g-dev python3-dev python3 python3-numpy liblapack3 libblas3 libboost-dev git rsync
-#TODO: CLEAN apt
+apt install -y flex bison curl gcc gfortran g++ make cmake libsqlite3-dev zlib1g-dev python3-dev python3 python3-numpy liblapack3 libblas3 git rsync
+
