Add support for modular build structure. (#632)

* Make the library modular usable.

* Switch to library requirements instead of source. As source puts extra source in install targets.

* Add missing import-search for cconfig/predef checks.

* Add requires-b2 check to top-level build file.

* Bump B2 require to 5.2

* Change all <source> references to <library>.

* Update copyright dates.

* Move inter-lib dependencies to a project variable and into the build targets.

* Adjust doc build to avoid boost-root references.

* Update build deps.

* Change Boost Test build refs to work with both old and modular test lib targets.

* Adjust CI for changes to the inspect tool. Also simplify the build and test to avoid future config problems as it can mor easily adjust to future CI changes.

* Use latest CI image to get a modern C++ compiler rthat doesn't ICE, we hope.

* Current CircleCI images need sudo to install packages.

* Undo search-lib change.

---------

Co-authored-by: Matt Borland <matt@mattborland.com>

.circleci/config.yml

@@ -6,7 +6,7 @@ jobs:
       - BOOST_LIBRARY=multiprecision
       - CXX_STANDARD=gnu++11
     docker:
-      - image: gcc:7
+      - image: cimg/base:current
     steps:
       - checkout
       - run:
@@ -24,8 +24,8 @@ jobs:
       - run:
           name: install pre dependencies
           command: |
-            apt-get update -yqq
+            sudo apt-get update -yqq
-            apt-get install git xsltproc docbook-xsl docbook-xml -y
+            sudo apt-get install git xsltproc docbook-xsl docbook-xml -y
       - run:
           name: Initializing git repo for boost
           command: |
@@ -46,11 +46,11 @@ jobs:
       - run:
           name: Building inspect
           command: |
-            cd $BOOST/boost/tools/inspect/build && ../../../b2 -j2 address-model=64 architecture=x86 toolset=gcc cxxflags="-std=gnu++14" release dist-bin
+            cd $BOOST/boost/tools/inspect && ../../b2 toolset=gcc variant=release dist-bin
       - run:
           name: Building docs
           command: |
-            cd $BOOST_REMOVE/doc && rm -rf html/boost_multiprecision && ../../../b2 -j2 address-model=64 architecture=x86 toolset=gcc cxxflags="-std=gnu++14" release
+            cd $BOOST_REMOVE/doc && rm -rf html/boost_multiprecision && ../../../b2
       - run:
           name: Running Inspect
           command: |

build.jam

@@ -0,0 +1,33 @@
+# Copyright René Ferdinand Rivera Morell 2023-2024
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+require-b2 5.2 ;
+
+constant boost_dependencies :
+    /boost/assert//boost_assert
+    /boost/config//boost_config
+    /boost/core//boost_core
+    /boost/integer//boost_integer
+    /boost/lexical_cast//boost_lexical_cast
+    /boost/math//boost_math
+    /boost/predef//boost_predef
+    /boost/random//boost_random
+    /boost/throw_exception//boost_throw_exception ;
+
+project /boost/multiprecision
+    : common-requirements
+        <include>include
+    ;
+
+explicit
+    [ alias boost_multiprecision : : : : <library>$(boost_dependencies) ]
+    [ alias all : boost_multiprecision test example performance ]
+    ;
+
+call-if : boost-library multiprecision
+    ;
+
+use-project /boost/multiprecision/config : config ;
+

config/Jamfile.v2

@@ -3,9 +3,11 @@
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt.
 
+import-search /boost/config/checks ;
+
 import modules ;
 import path ;
-import ../../config/checks/config : requires ;
+import config : requires ;
 
 local gmp_path = [ modules.peek : GMP_PATH ] ;
 local mpfr_path = [ modules.peek : MPFR_PATH ] ;
@@ -20,7 +22,6 @@ project : requirements
    <include>$(mpfi_path)
    <include>$(mpfi_path)/src
    <include>$(tommath_path)
-   <include>../../.. 
    <search>$(gmp_path)
    <search>$(mpfr_path)
    <search>$(mpfr_path)/build.vc10/lib/Win32/Debug

doc/Jamfile.v2

@@ -85,7 +85,7 @@ boostbook standalone
         # Index generation:
         <auto-index>on
         <auto-index-script>$(here)/index.idx
-        <auto-index-prefix>$(here)/../../.. 
+        <auto-index-prefix>$(here)/../include
         <auto-index-verbose>on
         <format>html:<auto-index-internal>on
         <quickbook-define>enable_index

example/Jamfile.v2

@@ -11,7 +11,8 @@
 import testing ;
 import modules ;
 import path ;
-import ../../config/checks/config : requires ;
+import-search /boost/config/checks ;
+import config : requires ;
 
 local ntl-path = [ modules.peek : NTL_PATH ] ;
 local gmp_path = [ modules.peek : GMP_PATH ] ;
@@ -21,6 +22,8 @@ local tommath_path = [ modules.peek : TOMMATH_PATH ] ;
 
 project
     : requirements
+        <library>/boost/multiprecision//boost_multiprecision
+
      <include>$(gmp_path)
      <include>$(gmp_path)/mpfr
      <include>$(gmp_path)/gmpfrxx
@@ -28,8 +31,6 @@ project
      <include>$(mpfi_path)
      <include>$(mpfi_path)/src
      <include>$(tommath_path)
-     <include>../include
-     <include>../../..
 
       <toolset>gcc:<cxxflags>-Wno-missing-braces
       <toolset>darwin:<cxxflags>-Wno-missing-braces
@@ -95,7 +96,7 @@ test-suite examples :
       [ run integer_examples.cpp no_eh_eg_support ]
       [ run logged_adaptor.cpp no_eh_eg_support mpfi mpfr gmp :  :  : [ check-target-builds ../config//has_mpfi : : <build>no ] ]
       [ run mixed_integer_arithmetic.cpp no_eh_eg_support ]
-      [ run numeric_limits_snips.cpp no_eh_eg_support /boost//test_exec_monitor : : : [ requires cxx11_numeric_limits ]  [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
+      [ run numeric_limits_snips.cpp no_eh_eg_support /boost/test//boost_test_exec_monitor : : : [ requires cxx11_numeric_limits ]  [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
       [ run random_snips.cpp gmp no_eh_eg_support : : : [ requires cxx11_explicit_conversion_operators ] [ check-target-builds ../config//has_gmp : : <build>no ] ]
       [ run safe_prime.cpp no_eh_eg_support ]
 

performance/Jamfile.v2

@@ -5,7 +5,8 @@
 
 import modules ;
 import path ;
-import ../../config/checks/config : requires ;
+import-search /boost/config/checks ;
+import config : requires ;
 
 local ntl-path = [ modules.peek : NTL_PATH ] ;
 local gmp_path = [ modules.peek : GMP_PATH ] ;
@@ -13,6 +14,7 @@ local mpfr_path = [ modules.peek : MPFR_PATH ] ;
 local tommath_path = [ modules.peek : TOMMATH_PATH ] ;
 
 project : requirements
+   <library>/boost/multiprecision//boost_multiprecision
    <target-os>freebsd:<linkflags>"-lrt"
    <target-os>linux:<linkflags>"-lrt"
    <toolset>pgi:<linkflags>"-lrt"
@@ -21,7 +23,6 @@ project : requirements
    <include>$(gmp_path)/gmpfrxx
    <include>$(mpfr_path)
    <include>$(tommath_path)
-   <include>../../.. 
    <search>$(gmp_path)
    <search>$(mpfr_path)
    <search>$(mpfr_path)/build.vc10/lib/Win32/Debug
@@ -34,6 +35,9 @@ project : requirements
    <define>BOOST_ALL_NO_LIB
    <debug-symbols>off
    <define>NDEBUG=1
+   <library>/boost/chrono//boost_chrono
+   <library>/boost/math//testing
+   : default-build release
    ;
 
 
@@ -73,7 +77,7 @@ test-suite performance :
             performance_test_files/test16.cpp  performance_test_files/test33.cpp  performance_test_files/test50.cpp
             performance_test_files/test17.cpp  performance_test_files/test34.cpp  performance_test_files/test51.cpp
             /boost/system//boost_system
-          : release
+          :
           [ check-target-builds ../config//has_gmp : <define>TEST_MPF <define>TEST_MPZ <define>TEST_MPQ <source>gmp : ]
           [ check-target-builds ../config//has_mpfr : <define>TEST_MPFR <source>mpfr : ]
           [ check-target-builds ../config//has_tommath : <define>TEST_TOMMATH <source>$(TOMMATH) : ]
@@ -92,7 +96,7 @@ test-suite performance :
             miller_rabin_performance_files/test05.cpp  miller_rabin_performance_files/test11.cpp
             miller_rabin_performance_files/test06.cpp  miller_rabin_performance_files/test12.cpp
             /boost/system//boost_system /boost/chrono//boost_chrono
-          : release
+          :
           [ check-target-builds ../config//has_gmp : <define>TEST_MPF <define>TEST_MPZ <source>gmp : ]
           [ check-target-builds ../config//has_mpfr : <define>TEST_MPFR <source>mpfr : ]
           [ check-target-builds ../config//has_tommath : <define>TEST_TOMMATH <source>$(TOMMATH) : ]
@@ -136,7 +140,7 @@ test-suite performance :
                      sf_performance_files/sf_performance_nct_04.cpp     sf_performance_files/sf_performance_poly_17.cpp
                      sf_performance_files/sf_performance_nct_05.cpp     sf_performance_files/sf_performance_poly_18.cpp
                      /boost/system//boost_system /boost/chrono//boost_chrono /boost/thread//boost_thread
-          : release
+          :
           [ check-target-builds ../config//has_gmp : <define>TEST_MPF <define>TEST_MPZ <source>gmp : ]
           [ check-target-builds ../config//has_mpfr : <define>TEST_MPFR <source>mpfr : ]
           [ check-target-builds ../config//has_float128 : <source>quadmath : ]
@@ -150,106 +154,106 @@ test-suite performance :
 [ exe delaunay_test : delaunay_test.cpp /boost/system//boost_system /boost/chrono//boost_chrono ]
 
 #[ exe voronoi_performance : voronoi_performance.cpp /boost/system//boost_system /boost/chrono//boost_chrono
-#   : release
+#   :
 #          [ check-target-builds ../config//has_gmp : <define>TEST_GMP <source>gmp : ]
 #          [ check-target-builds ../config//has_tommath : <define>TEST_TOMMATH <source>$(TOMMATH) : ]
 #   ]
 
 [ obj obj_linpack_benchmark_mpfr : linpack-benchmark.cpp
-          : release
+          :
           [ check-target-builds ../config//has_mpfr : : <build>no ]
           <define>TEST_MPFR_50
           [ check-target-builds ../config//has_f2c : : <build>no ]
           ]
 
 [ obj obj_linpack_benchmark_mpf : linpack-benchmark.cpp
-          : release
+          :
           [ check-target-builds ../config//has_gmp : : <build>no ]
           <define>TEST_MPF_50
           [ check-target-builds ../config//has_f2c : : <build>no ]
           ]
 
 [ obj obj_linpack_benchmark_cpp_float : linpack-benchmark.cpp
-          : release
+          :
           <define>TEST_CPP_DEC_FLOAT
           [ check-target-builds ../config//has_f2c : : <build>no ]
           ]
 
 [ obj obj_linpack_benchmark_double : linpack-benchmark.cpp
-          : release
+          :
           [ check-target-builds ../config//has_f2c : : <build>no ]
           ]
 
 [ obj obj_linpack_benchmark_native_float128 : linpack-benchmark.cpp
-          : release
+          :
           <define>NATIVE_FLOAT128
           [ check-target-builds ../config//has_float128 : : <build>no ]
           [ check-target-builds ../config//has_f2c : : <build>no ]
           ]
 
 [ obj obj_linpack_benchmark_float128 : linpack-benchmark.cpp
-          : release
+          :
           <define>TEST_FLOAT128
           [ check-target-builds ../config//has_float128 : : <build>no ]
           [ check-target-builds ../config//has_f2c : : <build>no ]
           ]
 
 [ obj obj_linpack_benchmark_cpp_quad_float : linpack-benchmark.cpp
-          : release
+          :
           <define>TEST_CPP_BIN_FLOAT_QUAD
           [ check-target-builds ../config//has_f2c : : <build>no ]
           ]
 
 [ obj obj_linpack_benchmark_cpp_oct_float : linpack-benchmark.cpp
-          : release
+          :
           <define>TEST_CPP_BIN_FLOAT_OCT
           [ check-target-builds ../config//has_f2c : : <build>no ]
           ]
 
 [ exe linpack_benchmark_mpfr : obj_linpack_benchmark_mpfr mpfr f2c gmp
-          : release
+          :
           [ check-target-builds ../config//has_mpfr : : <build>no ]
           <define>TEST_MPFR_50
           [ check-target-builds ../config//has_f2c : : <build>no ]
           ]
 
 [ exe linpack_benchmark_mpf : obj_linpack_benchmark_mpf gmp  f2c
-          : release
+          :
           [ check-target-builds ../config//has_gmp : : <build>no ]
           <define>TEST_MPF_50
           [ check-target-builds ../config//has_f2c : : <build>no ]
           ]
 
 [ exe linpack_benchmark_cpp_float : obj_linpack_benchmark_cpp_float  f2c
-          : release
+          :
           <define>TEST_CPP_DEC_FLOAT
           [ check-target-builds ../config//has_f2c : : <build>no ]
           ]
 
 [ exe linpack_benchmark_double : obj_linpack_benchmark_double  f2c
-          : release
+          :
           [ check-target-builds ../config//has_f2c : : <build>no ]
           ]
 
 [ exe linpack_benchmark_native_float128 : obj_linpack_benchmark_native_float128  f2c quadmath
-          : release
+          :
           [ check-target-builds ../config//has_float128 : : <build>no ]
           [ check-target-builds ../config//has_f2c : : <build>no ]
           ]
 
 [ exe linpack_benchmark_float128 : obj_linpack_benchmark_float128  f2c quadmath
-          : release
+          :
           [ check-target-builds ../config//has_float128 : : <build>no ]
           [ check-target-builds ../config//has_f2c : : <build>no ]
           ]
 
 [ exe linpack_benchmark_cpp_quad_float : obj_linpack_benchmark_cpp_quad_float  f2c
-          : release
+          :
           [ check-target-builds ../config//has_f2c : : <build>no ]
           ]
 
 [ exe linpack_benchmark_cpp_oct_float : obj_linpack_benchmark_cpp_oct_float  f2c
-          : release
+          :
           [ check-target-builds ../config//has_f2c : : <build>no ]
           ]
 
@@ -265,6 +269,6 @@ test-suite performance_install :
 [ install sf_performance_install : sf_performance   : <location>. ]
 [ install . : linpack_benchmark_double linpack_benchmark_cpp_float linpack_benchmark_mpf linpack_benchmark_mpfr linpack_benchmark_native_float128 linpack_benchmark_float128 linpack_benchmark_cpp_quad_float linpack_benchmark_cpp_oct_float ]
 [ install delaunay_install : delaunay_test : <location>. ]
-[ install voronoi_install : voronoi_performance : <location>. ]
+# [ install voronoi_install : voronoi_performance : <location>. ]
 
 ;

performance/sf_performance.hpp

@@ -48,7 +48,7 @@
 #include <boost/math/special_functions/bessel.hpp>
 #include <boost/math/tools/rational.hpp>
 #include <boost/math/distributions/non_central_t.hpp>
-#include <libs/math/test/table_type.hpp>
+#include <table_type.hpp>
 #include <boost/chrono.hpp>
 #include <array>
 #include <boost/thread.hpp>
@@ -85,8 +85,8 @@ Real test_bessel()
    {
 #define T double
 #define SC_(x) x
-#include "libs/math/test/bessel_i_int_data.ipp"
+#include "bessel_i_int_data.ipp"
-#include "libs/math/test/bessel_i_data.ipp"
+#include "bessel_i_data.ipp"
 
       Real r;
 
@@ -99,25 +99,25 @@ Real test_bessel()
          r += boost::math::cyl_bessel_i(Real(bessel_i_data[i][0]), Real(bessel_i_data[i][1]));
       }
 
-#include "libs/math/test/bessel_j_int_data.ipp"
+#include "bessel_j_int_data.ipp"
       for (unsigned i = 0; i < bessel_j_int_data.size(); ++i)
       {
          r += boost::math::cyl_bessel_j(Real(bessel_j_int_data[i][0]), Real(bessel_j_int_data[i][1]));
       }
 
-#include "libs/math/test/bessel_j_data.ipp"
+#include "bessel_j_data.ipp"
       for (unsigned i = 0; i < bessel_j_data.size(); ++i)
       {
          r += boost::math::cyl_bessel_j(Real(bessel_j_data[i][0]), Real(bessel_j_data[i][1]));
       }
 
-#include "libs/math/test/bessel_j_large_data.ipp"
+#include "bessel_j_large_data.ipp"
       for (unsigned i = 0; i < bessel_j_large_data.size(); ++i)
       {
          r += boost::math::cyl_bessel_j(Real(bessel_j_large_data[i][0]), Real(bessel_j_large_data[i][1]));
       }
 
-#include "libs/math/test/sph_bessel_data.ipp"
+#include "sph_bessel_data.ipp"
       for (unsigned i = 0; i < sph_bessel_data.size(); ++i)
       {
          r += boost::math::sph_bessel(static_cast<unsigned>(sph_bessel_data[i][0]), Real(sph_bessel_data[i][1]));
@@ -148,7 +148,7 @@ template <class Real>
 Real test_nct()
 {
 #define T double
-#include "libs/math/test/nct.ipp"
+#include "nct.ipp"
 
    Real result = 0;
    for (unsigned i = 0; i < nct.size(); ++i)

test/Jamfile.v2

@@ -3,10 +3,12 @@
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt.
 
+import-search /boost/config/checks ;
+
 import testing ;
 import modules ;
 import path ;
-import ../../config/checks/config : requires ;
+import config : requires ;
 
 local ntl-path = [ modules.peek : NTL_PATH ] ;
 local gmp_path = [ modules.peek : GMP_PATH ] ;
@@ -42,6 +44,8 @@ local tommath_path = [ modules.peek : TOMMATH_PATH ] ;
 path-constant here : . ;
 
 project : requirements
+   <library>/boost/multiprecision//boost_multiprecision
+   <include>.
    <include>$(gmp_path)
    <include>$(gmp_path)/mpfr
    <include>$(gmp_path)/gmpfrxx
@@ -49,8 +53,6 @@ project : requirements
    <include>$(mpfi_path)
    <include>$(mpfi_path)/src
    <include>$(tommath_path)
-   <include>../include
-   <include>../../..
    # We set these to make it easier to set up and test GMP and MPFR under Win32:
    <toolset>msvc:<runtime-link>static
    <toolset>msvc:<link>static
@@ -133,7 +135,7 @@ test-suite arithmetic_tests :
    [ run test_arithmetic_mpf.cpp gmp no_eh_support : : : [ check-target-builds ../config//has_gmp : : <build>no ] [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
    [ run test_arithmetic_mpz.cpp gmp no_eh_support : : : [ check-target-builds ../config//has_gmp : : <build>no ] [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
    [ run test_arithmetic_mpz_rat.cpp gmp no_eh_support : : : [ check-target-builds ../config//has_gmp : : <build>no ] [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
-   [ run test_arithmetic_mpz_br.cpp gmp no_eh_support : : : [ check-target-builds ../config//has_gmp : : <build>no ] [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
+   [ run test_arithmetic_mpz_br.cpp gmp no_eh_support /boost/rational//boost_rational : : : [ check-target-builds ../config//has_gmp : : <build>no ] [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
    [ run test_arithmetic_mpq.cpp gmp no_eh_support : : : [ check-target-builds ../config//has_gmp : : <build>no ] [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
 
    [ run test_arithmetic_mpfr.cpp mpfr gmp no_eh_support : : : [ check-target-builds ../config//has_mpfr : : <build>no ] [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
@@ -142,7 +144,7 @@ test-suite arithmetic_tests :
 
    [ run test_arithmetic_tommath.cpp $(TOMMATH) no_eh_support : : : [ check-target-builds ../config//has_tommath : : <build>no ] [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
    [ run test_arithmetic_tommath_rat.cpp $(TOMMATH) no_eh_support : : : [ check-target-builds ../config//has_tommath : : <build>no ] [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
-   [ run test_arithmetic_tommath_br.cpp $(TOMMATH) no_eh_support : : : [ check-target-builds ../config//has_tommath : : <build>no ] [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
+   [ run test_arithmetic_tommath_br.cpp /boost/rational//boost_rational $(TOMMATH) no_eh_support : : : [ check-target-builds ../config//has_tommath : : <build>no ] [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
 
    [ run test_arithmetic_cpp_int_1.cpp no_eh_support : : : <toolset>msvc:<cxxflags>-bigobj [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
    [ run test_arithmetic_cpp_int_2.cpp no_eh_support  : : : <toolset>msvc:<cxxflags>-bigobj [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
@@ -167,7 +169,7 @@ test-suite arithmetic_tests :
    [ run test_arithmetic_cpp_int_21.cpp no_eh_support : : : <toolset>msvc:<cxxflags>-bigobj [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
    [ run test_arithmetic_cpp_int_22.cpp no_eh_support : : : <toolset>msvc:<cxxflags>-bigobj [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
    [ run test_arithmetic_cpp_int_23.cpp no_eh_support : : : <toolset>msvc:<cxxflags>-bigobj [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
-   [ run test_arithmetic_cpp_int_br.cpp no_eh_support  : : : <toolset>msvc:<cxxflags>-bigobj [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
+   [ run test_arithmetic_cpp_int_br.cpp no_eh_support /boost/rational//boost_rational : : : <toolset>msvc:<cxxflags>-bigobj [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
 
    [ run test_arithmetic_ab_1.cpp no_eh_support : : : [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
    [ run test_arithmetic_ab_2.cpp no_eh_support : : : [ check-target-builds ../config//has_float128 : <source>quadmath ] ]
@@ -772,7 +774,7 @@ test-suite conversions :
                [ check-target-builds ../config//has_intel_quad : <cxxflags>-Qoption,cpp,--extended_float_type : <build>no ] [ check-target-builds ../config//has_float128 : <source>quadmath ]
               : test_float_io_intel_quad ]
 
-      [ run test_int_io.cpp no_eh_support $(TOMMATH)
+      [ run test_int_io.cpp no_eh_support $(TOMMATH) /boost/algorithm//boost_algorithm
               : # command line
               : # input files
               : # requirements
@@ -781,7 +783,7 @@ test-suite conversions :
                [ check-target-builds ../config//has_tommath : : <build>no ]
               : test_int_io_tommath ]
 
-      [ run test_int_io.cpp no_eh_support gmp
+      [ run test_int_io.cpp no_eh_support gmp /boost/algorithm//boost_algorithm
               : # command line
               : # input files
               : # requirements
@@ -790,21 +792,21 @@ test-suite conversions :
                [ check-target-builds ../config//has_gmp : : <build>no ]
               : test_int_io_mpz ]
 
-      [ run test_fixed_zero_precision_io.cpp 
+      [ run test_fixed_zero_precision_io.cpp /boost/chrono//boost_chrono
               : # command line
               : # input files
               : # requirements
               <define>TEST_BIN_FLOAT
                release
               : test_fixed_zero_precision_io_bin_float ]
-      [ run test_fixed_zero_precision_io.cpp 
+      [ run test_fixed_zero_precision_io.cpp  /boost/chrono//boost_chrono
               : # command line
               : # input files
               : # requirements
               <define>TEST_DEC_FLOAT
                release
               : test_fixed_zero_precision_io_dec_float ]
-      [ run test_fixed_zero_precision_io.cpp no_eh_support gmp
+      [ run test_fixed_zero_precision_io.cpp no_eh_support gmp /boost/chrono//boost_chrono
               : # command line
               : # input files
               : # requirements
@@ -812,7 +814,7 @@ test-suite conversions :
                release
                [ check-target-builds ../config//has_gmp : : <build>no ]
               : test_fixed_zero_precision_io_mpf_float ]
-      [ run test_fixed_zero_precision_io.cpp no_eh_support mpfr gmp
+      [ run test_fixed_zero_precision_io.cpp no_eh_support mpfr gmp /boost/chrono//boost_chrono
               : # command line
               : # input files
               : # requirements
@@ -820,7 +822,7 @@ test-suite conversions :
                release
                [ check-target-builds ../config//has_mpfr : : <build>no ]
               : test_fixed_zero_precision_io_mpfr_float ]
-      [ run test_fixed_zero_precision_io.cpp no_eh_support quadmath
+      [ run test_fixed_zero_precision_io.cpp no_eh_support quadmath /boost/chrono//boost_chrono
               : # command line
               : # input files
               : # requirements
@@ -875,7 +877,7 @@ test-suite conversions :
 
 test-suite cpp_int_tests :
 
-      [ run test_int_io.cpp no_eh_support
+      [ run test_int_io.cpp no_eh_support /boost/algorithm//boost_algorithm
            : # command line
            : # input files
            : # requirements
@@ -1001,12 +1003,12 @@ test-suite cpp_int_tests :
       [ run test_checked_cpp_int.cpp no_eh_support ]
       [ run test_unchecked_cpp_int.cpp no_eh_support : : : release ]
 
-      [ run test_cpp_int_serial.cpp ../../serialization/build//boost_serialization : : : release <define>TEST1 <toolset>gcc-mingw:<link>static : test_cpp_int_serial_1 ]
+      [ run test_cpp_int_serial.cpp /boost/serialization//boost_serialization : : : release <define>TEST1 <toolset>gcc-mingw:<link>static : test_cpp_int_serial_1 ]
-      [ run test_cpp_int_serial.cpp ../../serialization/build//boost_serialization : : : release <define>TEST2 <toolset>gcc-mingw:<link>static : test_cpp_int_serial_2 ]
+      [ run test_cpp_int_serial.cpp /boost/serialization//boost_serialization : : : release <define>TEST2 <toolset>gcc-mingw:<link>static : test_cpp_int_serial_2 ]
-      [ run test_cpp_int_serial.cpp ../../serialization/build//boost_serialization : : : release <define>TEST3 <toolset>gcc-mingw:<link>static : test_cpp_int_serial_3 ]
+      [ run test_cpp_int_serial.cpp /boost/serialization//boost_serialization : : : release <define>TEST3 <toolset>gcc-mingw:<link>static : test_cpp_int_serial_3 ]
-      [ run test_cpp_int_serial.cpp ../../serialization/build//boost_serialization : : : release <define>TEST4 <toolset>gcc-mingw:<link>static : test_cpp_int_serial_4 ]
+      [ run test_cpp_int_serial.cpp /boost/serialization//boost_serialization : : : release <define>TEST4 <toolset>gcc-mingw:<link>static : test_cpp_int_serial_4 ]
-      [ run test_cpp_int_deserial.cpp ../../serialization/build//boost_serialization ../../filesystem/build//boost_filesystem : $(here)/serial_txts : : release <toolset>gcc-mingw:<link>static  ]
+      [ run test_cpp_int_deserial.cpp /boost/serialization//boost_serialization /boost/filesystem//boost_filesystem : $(here)/serial_txts : : release <toolset>gcc-mingw:<link>static  ]
-      [ run test_cpp_rat_serial.cpp ../../serialization/build//boost_serialization : : : release <toolset>gcc-mingw:<link>static  ]
+      [ run test_cpp_rat_serial.cpp /boost/serialization//boost_serialization : : : release <toolset>gcc-mingw:<link>static  ]
       [ run test_gcd.cpp : : : [ requires cxx11_hdr_random ] ]
 ;
 
@@ -1027,8 +1029,8 @@ test-suite misc :
       [ run constexpr_test_cpp_int_3.cpp : : : [ requires cxx14_constexpr cxx17_if_constexpr ] [ check-target-builds ../config//has_is_constant_evaluated : : <build>no ] ]
       [ run constexpr_test_cpp_int_4.cpp : : : [ requires cxx14_constexpr cxx17_if_constexpr ] [ check-target-builds ../config//has_is_constant_evaluated : : <build>no ] ]
       [ run constexpr_test_cpp_int_5.cpp : : : [ requires cxx14_constexpr cxx17_if_constexpr ] [ check-target-builds ../config//has_is_constant_evaluated : : <build>no ] ]
-      [ run constexpr_test_cpp_int_6.cpp : : : [ requires cxx14_constexpr cxx17_if_constexpr ] [ check-target-builds ../config//has_is_constant_evaluated : <toolset>msvc:<cxxflags>-constexpr:steps10000000 <toolset>clang:<cxxflags>-fconstexpr-steps=268435456 : <build>no ] [ check-target-builds ../config//has_constexpr_limits : <cxxflags>-fconstexpr-ops-limit=268435456 ] ]
+      [ run constexpr_test_cpp_int_6.cpp : : : [ requires cxx14_constexpr cxx17_if_constexpr ] [ check-target-builds ../config//has_is_constant_evaluated : "<toolset>msvc:<cxxflags>-constexpr:steps10000000" <toolset>clang:<cxxflags>-fconstexpr-steps=268435456 : <build>no ] [ check-target-builds ../config//has_constexpr_limits : <cxxflags>-fconstexpr-ops-limit=268435456 ] ]
-      [ run constexpr_test_cpp_int_7.cpp : : : [ requires cxx14_constexpr cxx17_if_constexpr ] [ check-target-builds ../config//has_is_constant_evaluated : <toolset>msvc:<cxxflags>-constexpr:steps10000000 <toolset>clang:<cxxflags>-fconstexpr-steps=268435456 : <build>no ] ]
+      [ run constexpr_test_cpp_int_7.cpp : : : [ requires cxx14_constexpr cxx17_if_constexpr ] [ check-target-builds ../config//has_is_constant_evaluated : "<toolset>msvc:<cxxflags>-constexpr:steps10000000" <toolset>clang:<cxxflags>-fconstexpr-steps=268435456 : <build>no ] ]
 
       [ compile test_nothrow_cpp_int.cpp ]
       [ compile test_nothrow_cpp_rational.cpp ]
@@ -1046,7 +1048,7 @@ test-suite misc :
                release  # otherwise [ runtime is too slow!!
                ]
 
-      [ run test_rational_io.cpp $(TOMMATH) no_eh_support
+      [ run test_rational_io.cpp $(TOMMATH) no_eh_support /boost/algorithm//boost_algorithm /boost/rational//boost_rational
               : # command line
               : # input files
               : # requirements
@@ -1055,7 +1057,7 @@ test-suite misc :
                release # Otherwise [ runtime is slow
               : test_rational_io_tommath ]
 
-      [ run test_rational_io.cpp gmp no_eh_support
+      [ run test_rational_io.cpp gmp no_eh_support /boost/algorithm//boost_algorithm /boost/rational//boost_rational
               : # command line
               : # input files
               : # requirements
@@ -1064,7 +1066,7 @@ test-suite misc :
                release # Otherwise [ runtime is slow
               : test_rational_io_mpz ]
 
-      [ run test_rational_io.cpp no_eh_support
+      [ run test_rational_io.cpp no_eh_support /boost/algorithm//boost_algorithm /boost/rational//boost_rational
               : # command line
               : # input files
               : # requirements
@@ -1151,7 +1153,7 @@ test-suite misc :
               : test_rat_float_interconv_8 ]
 
       [ run test_cpp_int_conv.cpp no_eh_support ]
-      [ run test_cpp_int_import_export.cpp no_eh_support ]
+      [ run test_cpp_int_import_export.cpp no_eh_support /boost/algorithm//boost_algorithm ]
       [ run test_native_integer.cpp no_eh_support ]
 
       [ run test_mixed_move_cpp_int.cpp no_eh_support ]
@@ -1175,31 +1177,31 @@ test-suite misc :
       [ compile include_test/cpp_dec_float_include_test.cpp ]
       [ compile include_test/cpp_bin_float_include_test.cpp ]
 
-      [ run ublas_interop/test1.cpp ublas_interop/test11.cpp ublas_interop/test12.cpp ublas_interop/test13.cpp no_eh_support ]
+      [ run ublas_interop/test1.cpp ublas_interop/test11.cpp ublas_interop/test12.cpp ublas_interop/test13.cpp no_eh_support /boost/ublas//boost_ublas ]
-      [ run ublas_interop/test2.cpp ublas_interop/test21.cpp ublas_interop/test22.cpp ublas_interop/test23.cpp no_eh_support ]
+      [ run ublas_interop/test2.cpp ublas_interop/test21.cpp ublas_interop/test22.cpp ublas_interop/test23.cpp no_eh_support /boost/ublas//boost_ublas ]
-      #[ run ublas_interop/test3.cpp ublas_interop/test31.cpp ublas_interop/test32.cpp ublas_interop/test33.cpp ]
+      #[ run ublas_interop/test3.cpp ublas_interop/test31.cpp ublas_interop/test32.cpp ublas_interop/test33.cpp /boost/ublas//boost_ublas ]
-      [ run ublas_interop/test4.cpp ublas_interop/test42.cpp ublas_interop/test43.cpp no_eh_support ]
+      [ run ublas_interop/test4.cpp ublas_interop/test42.cpp ublas_interop/test43.cpp no_eh_support /boost/ublas//boost_ublas ]
-      [ run ublas_interop/test5.cpp ublas_interop/test52.cpp ublas_interop/test53.cpp no_eh_support ]
+      [ run ublas_interop/test5.cpp ublas_interop/test52.cpp ublas_interop/test53.cpp no_eh_support /boost/ublas//boost_ublas ]
-      [ run ublas_interop/test6.cpp ublas_interop/test62.cpp ublas_interop/test63.cpp no_eh_support ]
+      [ run ublas_interop/test6.cpp ublas_interop/test62.cpp ublas_interop/test63.cpp no_eh_support /boost/ublas//boost_ublas ]
-      #[ run ublas_interop/test7.cpp ublas_interop/test71.cpp ublas_interop/test72.cpp ublas_interop/test73.cpp ]
+      #[ run ublas_interop/test7.cpp ublas_interop/test71.cpp ublas_interop/test72.cpp ublas_interop/test73.cpp /boost/ublas//boost_ublas ]
 
-      [ run ublas_interop/test1.cpp ublas_interop/test11.cpp ublas_interop/test12.cpp ublas_interop/test13.cpp no_eh_support : : : <define>TEST_ET=1 : ublas1_et ]
+      [ run ublas_interop/test1.cpp ublas_interop/test11.cpp ublas_interop/test12.cpp ublas_interop/test13.cpp no_eh_support /boost/ublas//boost_ublas : : : <define>TEST_ET=1 : ublas1_et ]
-      [ run ublas_interop/test2.cpp ublas_interop/test21.cpp ublas_interop/test22.cpp ublas_interop/test23.cpp no_eh_support : : : <define>TEST_ET=1 : ublas2_et ]
+      [ run ublas_interop/test2.cpp ublas_interop/test21.cpp ublas_interop/test22.cpp ublas_interop/test23.cpp no_eh_support /boost/ublas//boost_ublas : : : <define>TEST_ET=1 : ublas2_et ]
-      #[ run ublas_interop/test3.cpp ublas_interop/test31.cpp ublas_interop/test32.cpp ublas_interop/test33.cpp : : : <define>TEST_ET=1 : ublas3_et ]
+      #[ run ublas_interop/test3.cpp ublas_interop/test31.cpp ublas_interop/test32.cpp ublas_interop/test33.cpp /boost/ublas//boost_ublas : : : <define>TEST_ET=1 : ublas3_et ]
-      [ run ublas_interop/test4.cpp ublas_interop/test42.cpp ublas_interop/test43.cpp no_eh_support : : : <define>TEST_ET=1 : ublas3_et ]
+      [ run ublas_interop/test4.cpp ublas_interop/test42.cpp ublas_interop/test43.cpp no_eh_support /boost/ublas//boost_ublas : : : <define>TEST_ET=1 : ublas3_et ]
-      [ run ublas_interop/test5.cpp ublas_interop/test52.cpp ublas_interop/test53.cpp no_eh_support : : : <define>TEST_ET=1 : ublas4_et ]
+      [ run ublas_interop/test5.cpp ublas_interop/test52.cpp ublas_interop/test53.cpp no_eh_support /boost/ublas//boost_ublas : : : <define>TEST_ET=1 : ublas4_et ]
-      [ run ublas_interop/test6.cpp ublas_interop/test62.cpp ublas_interop/test63.cpp no_eh_support : : : <define>TEST_ET=1 : ublas5_et ]
+      [ run ublas_interop/test6.cpp ublas_interop/test62.cpp ublas_interop/test63.cpp no_eh_support /boost/ublas//boost_ublas : : : <define>TEST_ET=1 : ublas5_et ]
-      #[ run ublas_interop/test7.cpp ublas_interop/test71.cpp ublas_interop/test72.cpp ublas_interop/test73.cpp : : : <define>TEST_ET=1 : ublas6_et ]
+      #[ run ublas_interop/test7.cpp ublas_interop/test71.cpp ublas_interop/test72.cpp ublas_interop/test73.cpp /boost/ublas//boost_ublas : : : <define>TEST_ET=1 : ublas6_et ]
 
       #
       # Serialization tests, run in release mode so we cycle through more values:
       #
-      [ run test_adapt_serial.cpp ../../serialization/build//boost_serialization : : : release <toolset>gcc-mingw:<link>static  ]
+      [ run test_adapt_serial.cpp /boost/serialization//boost_serialization : : : release <toolset>gcc-mingw:<link>static  ]
-      [ run test_cpp_dec_float_serial.cpp ../../serialization/build//boost_serialization : : : release <define>TEST1 <toolset>gcc-mingw:<link>static  : test_cpp_dec_float_serial_1 ]
+      [ run test_cpp_dec_float_serial.cpp /boost/serialization//boost_serialization : : : release <define>TEST1 <toolset>gcc-mingw:<link>static  : test_cpp_dec_float_serial_1 ]
-      [ run test_cpp_dec_float_serial.cpp ../../serialization/build//boost_serialization : : : release <define>TEST2 <toolset>gcc-mingw:<link>static  : test_cpp_dec_float_serial_2 ]
+      [ run test_cpp_dec_float_serial.cpp /boost/serialization//boost_serialization : : : release <define>TEST2 <toolset>gcc-mingw:<link>static  : test_cpp_dec_float_serial_2 ]
-      [ run test_float128_serial.cpp ../../serialization/build//boost_serialization quadmath : : : release <toolset>gcc-mingw:<link>static  [ check-target-builds ../config//has_float128 : : <build>no ]  ]
+      [ run test_float128_serial.cpp /boost/serialization//boost_serialization quadmath : : : release <toolset>gcc-mingw:<link>static  [ check-target-builds ../config//has_float128 : : <build>no ]  ]
-      [ run test_cpp_bin_float_serial.cpp ../../serialization/build//boost_serialization : : : release <toolset>gcc-mingw:<link>static  <define>TEST1 : test_bin_dec_float_serial_1 ]
+      [ run test_cpp_bin_float_serial.cpp /boost/serialization//boost_serialization : : : release <toolset>gcc-mingw:<link>static  <define>TEST1 : test_bin_dec_float_serial_1 ]
-      [ run test_cpp_bin_float_serial.cpp ../../serialization/build//boost_serialization : : : release <define>TEST2 <toolset>gcc-mingw:<link>static  : test_bin_dec_float_serial_2 ]
+      [ run test_cpp_bin_float_serial.cpp /boost/serialization//boost_serialization : : : release <define>TEST2 <toolset>gcc-mingw:<link>static  : test_bin_dec_float_serial_2 ]
 
       #
       # Mixed mode comparison tests, see: https://svn.boost.org/trac/boost/ticket/11328
@@ -1356,7 +1358,7 @@ rule get_specfun_tests_mpfr
             <define>BOOST_ALL_NO_LIB
             <define>BOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE
             <toolset>msvc:<cxxflags>-bigobj
-            <include>../../math/include_private
+            <library>/boost/math//testing
             release
            : $(source:B)_mpfr ] ;
    }
@@ -1373,7 +1375,7 @@ rule get_specfun_tests_mpfr
             <toolset>msvc:<cxxflags>-bigobj
             [ check-target-builds ../config//has_mpfr : <define>TEST_MPFR <source>gmp <source>mpfr : <build>no ]
             [ check-target-builds ../config//has_float128 : <source>quadmath ]
-            <include>../../math/include_private
+            <library>/boost/math//testing
             release
             : test_gamma_mpfr_$(digits) ] ;
 
@@ -1398,7 +1400,7 @@ rule get_specfun_tests_gmp
             <define>TEST_MPF_50
             <define>BOOST_ALL_NO_LIB
             <toolset>msvc:<cxxflags>-bigobj
-            <include>../../math/include_private
+            <library>/boost/math//testing
             release
            : $(source:B)_mpf ] ;
    }
@@ -1415,7 +1417,7 @@ rule get_specfun_tests_gmp
             <toolset>msvc:<cxxflags>-bigobj
             [ check-target-builds ../config//has_gmp : <define>TEST_MPF <source>gmp : <build>no ]
             [ check-target-builds ../config//has_float128 : <source>quadmath ]
-            <include>../../math/include_private
+            <library>/boost/math//testing
             release
             : test_gamma_gmp_$(digits) ] ;
 
@@ -1437,7 +1439,7 @@ rule get_specfun_tests_cpp_dec_float
             <define>TEST_CPP_DEC_FLOAT
             <define>BOOST_ALL_NO_LIB
             <toolset>msvc:<cxxflags>-bigobj
-            <include>../../math/include_private
+            <library>/boost/math//testing
             release
            : $(source:B)_cpp_dec_float ] ;
    }
@@ -1453,7 +1455,7 @@ rule get_specfun_tests_cpp_dec_float
             <define>TEST_PRECISION=$(digits)
             <toolset>msvc:<cxxflags>-bigobj
             <define>TEST_CPP_DEC_FLOAT
-            <include>../../math/include_private
+            <library>/boost/math//testing
             release
             : test_gamma_cpp_dec_float_$(digits) ] ;
    }
@@ -1473,7 +1475,7 @@ rule get_specfun_tests_cpp_bin_float
             <define>TEST_CPP_BIN_FLOAT
             <define>BOOST_ALL_NO_LIB
             <toolset>msvc:<cxxflags>-bigobj
-            <include>../../math/include_private
+            <library>/boost/math//testing
             release
             [ check-target-builds ../config//has_float128 : <source>quadmath ]
            : $(source:B)_cpp_bin_float ] ;
@@ -1491,7 +1493,7 @@ rule get_specfun_tests_cpp_bin_float
             <toolset>msvc:<cxxflags>-bigobj
             <define>TEST_CPP_BIN_FLOAT
             [ check-target-builds ../config//has_float128 : <source>quadmath ]
-            <include>../../math/include_private
+            <library>/boost/math//testing
             release
             : test_gamma_cpp_bin_float_$(digits) ] ;
 
@@ -1516,7 +1518,7 @@ rule get_specfun_tests_float128
             <define>BOOST_ALL_NO_LIB
             <define>BOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE
             <toolset>msvc:<cxxflags>-bigobj
-            <include>../../math/include_private
+            <library>/boost/math//testing
             release
            : $(source:B)_float128 ] ;
    }
@@ -1541,7 +1543,7 @@ rule get_specfun_tests_intel_quad
             <define>BOOST_ALL_NO_LIB
             <define>BOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE
             <toolset>msvc:<cxxflags>-bigobj
-            <include>../../math/include_private
+            <library>/boost/math//testing
             release
            : $(source:B)_intel_quad ] ;
    }
@@ -1589,7 +1591,7 @@ rule get_concept_checks
    for local source in [ glob concepts/*.cpp ]
    {
 
-      result += [ compile $(source)  mpfr
+      result += [ compile $(source)  mpfr /boost/math//boost_math /boost/math//testing
               : # requirements
               <define>TEST_MPFR_50
                [ check-target-builds ../config//has_mpfr : : <build>no ]
@@ -1597,7 +1599,7 @@ rule get_concept_checks
                <optimization>space
               : $(source:B)_mpfr_50 ] ;
 
-      result += [ compile $(source)  mpfr
+      result += [ compile $(source)  mpfr /boost/math//boost_math /boost/math//testing
               : # requirements
               <define>TEST_MPFR_6
                [ check-target-builds ../config//has_mpfr : : <build>no ]
@@ -1605,7 +1607,7 @@ rule get_concept_checks
                <optimization>space
               : $(source:B)_mpfr_6 ] ;
 
-      result += [ compile $(source)  mpfr
+      result += [ compile $(source)  mpfr /boost/math//boost_math /boost/math//testing
               : # requirements
               <define>TEST_MPFR_15
                [ check-target-builds ../config//has_mpfr : : <build>no ]
@@ -1613,7 +1615,7 @@ rule get_concept_checks
                <optimization>space
               : $(source:B)_mpfr_15 ] ;
 
-      result += [ compile $(source)  mpfr
+      result += [ compile $(source)  mpfr /boost/math//boost_math /boost/math//testing
               : # requirements
               <define>TEST_MPFR_17
                [ check-target-builds ../config//has_mpfr : : <build>no ]
@@ -1621,7 +1623,7 @@ rule get_concept_checks
                <optimization>space
               : $(source:B)_mpfr_17 ] ;
 
-      result += [ compile $(source)  mpfr
+      result += [ compile $(source)  mpfr /boost/math//boost_math /boost/math//testing
               : # requirements
               <define>TEST_MPFR_30
                [ check-target-builds ../config//has_mpfr : : <build>no ]
@@ -1629,7 +1631,7 @@ rule get_concept_checks
                <optimization>space
               : $(source:B)_mpfr_30 ] ;
 
-      result += [ compile $(source)  gmp
+      result += [ compile $(source)  gmp /boost/math//boost_math /boost/math//testing
               : # requirements
               <define>TEST_MPF_50
                [ check-target-builds ../config//has_gmp : : <build>no ]
@@ -1637,35 +1639,35 @@ rule get_concept_checks
                <optimization>space
               : $(source:B)_mpf50 ] ;
 
-      result += [ compile $(source)
+      result += [ compile $(source) /boost/math//boost_math /boost/math//testing
               : # requirements
               <define>TEST_CPP_DEC_FLOAT
                <debug-symbols>off
                <optimization>space
               : $(source:B)_cpp_dec_float ] ;
 
-      result += [ compile $(source)
+      result += [ compile $(source) /boost/math//boost_math /boost/math//testing
               : # requirements
               <define>TEST_CPP_BIN_FLOAT
                <debug-symbols>off
                <optimization>space
               : $(source:B)_cpp_bin_float ] ;
 
-      result += [ compile $(source)
+      result += [ compile $(source) /boost/math//boost_math /boost/math//testing
               : # requirements
               <define>TEST_CPP_DEC_FLOAT_NO_ET
                <debug-symbols>off
                <optimization>space
               : $(source:B)_cpp_dec_float_no_et ] ;
 
-      result += [ compile $(source)
+      result += [ compile $(source) /boost/math//boost_math /boost/math//testing
               : # requirements
               <define>TEST_BACKEND
                <debug-symbols>off
                <optimization>space
               : $(source:B)_backend_concept ] ;
 
-      result += [ compile $(source)
+      result += [ compile $(source) /boost/math//boost_math /boost/math//testing
               : # requirements
               <define>TEST_LOGGED_ADAPTER
                <debug-symbols>off

test/concepts/number_concept_check.cpp

@@ -18,7 +18,7 @@
 
 #include <boost/concept/assert.hpp>
 #include <boost/container_hash/hash.hpp>
-#include <libs/math/test/compile_test/poison.hpp>
+#include <compile_test/poison.hpp>
 
 #if !defined(TEST_MPF_50) && !defined(TEST_BACKEND) && !defined(TEST_MPZ) && !defined(TEST_CPP_DEC_FLOAT) && !defined(TEST_MPFR_50) && !defined(TEST_MPFR_6) && !defined(TEST_MPFR_15) && !defined(TEST_MPFR_17) && !defined(TEST_MPFR_30) && !defined(TEST_CPP_DEC_FLOAT_NO_ET) && !defined(TEST_LOGGED_ADAPTER) && !defined(TEST_CPP_BIN_FLOAT)
 #define TEST_MPF_50

test/concepts/sf_concept_check_basic.cpp

@@ -19,7 +19,7 @@
 #endif
 
 #include <boost/container_hash/hash.hpp>
-#include <libs/math/test/compile_test/poison.hpp>
+#include <compile_test/poison.hpp>
 
 #if !defined(TEST_MPF_50) && !defined(TEST_BACKEND) && !defined(TEST_MPZ) && !defined(TEST_CPP_DEC_FLOAT) && !defined(TEST_MPFR_50) && !defined(TEST_MPFR_6) && !defined(TEST_MPFR_15) && !defined(TEST_MPFR_17) && !defined(TEST_MPFR_30) && !defined(TEST_CPP_DEC_FLOAT_NO_ET) && !defined(TEST_LOGGED_ADAPTER) && !defined(TEST_CPP_BIN_FLOAT)
 #define TEST_MPF_50

test/concepts/sf_concept_check_bessel.cpp

@@ -19,7 +19,7 @@
 #endif
 
 #include <boost/container_hash/hash.hpp>
-#include <libs/math/test/compile_test/poison.hpp>
+#include <compile_test/poison.hpp>
 
 #if !defined(TEST_MPF_50) && !defined(TEST_BACKEND) && !defined(TEST_MPZ) && !defined(TEST_CPP_DEC_FLOAT) && !defined(TEST_MPFR_50) && !defined(TEST_MPFR_6) && !defined(TEST_MPFR_15) && !defined(TEST_MPFR_17) && !defined(TEST_MPFR_30) && !defined(TEST_CPP_DEC_FLOAT_NO_ET) && !defined(TEST_LOGGED_ADAPTER) && !defined(TEST_CPP_BIN_FLOAT)
 #define TEST_MPF_50

test/concepts/sf_concept_check_beta.cpp

@@ -19,7 +19,7 @@
 #endif
 
 #include <boost/container_hash/hash.hpp>
-#include <libs/math/test/compile_test/poison.hpp>
+#include <compile_test/poison.hpp>
 
 #if !defined(TEST_MPF_50) && !defined(TEST_BACKEND) && !defined(TEST_MPZ) && !defined(TEST_CPP_DEC_FLOAT) && !defined(TEST_MPFR_50) && !defined(TEST_MPFR_6) && !defined(TEST_MPFR_15) && !defined(TEST_MPFR_17) && !defined(TEST_MPFR_30) && !defined(TEST_CPP_DEC_FLOAT_NO_ET) && !defined(TEST_LOGGED_ADAPTER) && !defined(TEST_CPP_BIN_FLOAT)
 #define TEST_MPF_50

test/concepts/sf_concept_check_beta_2.cpp

@@ -20,7 +20,7 @@
 #endif
 
 #include <boost/container_hash/hash.hpp>
-#include <libs/math/test/compile_test/poison.hpp>
+#include <compile_test/poison.hpp>
 
 #if !defined(TEST_MPF_50) && !defined(TEST_BACKEND) && !defined(TEST_MPZ) && !defined(TEST_CPP_DEC_FLOAT) && !defined(TEST_MPFR_50) && !defined(TEST_MPFR_6) && !defined(TEST_MPFR_15) && !defined(TEST_MPFR_17) && !defined(TEST_MPFR_30) && !defined(TEST_CPP_DEC_FLOAT_NO_ET) && !defined(TEST_LOGGED_ADAPTER) && !defined(TEST_CPP_BIN_FLOAT)
 #define TEST_MPF_50

test/concepts/sf_concept_check_beta_3.cpp

@@ -19,7 +19,7 @@
 #endif
 
 #include <boost/container_hash/hash.hpp>
-#include <libs/math/test/compile_test/poison.hpp>
+#include <compile_test/poison.hpp>
 
 #if !defined(TEST_MPF_50) && !defined(TEST_BACKEND) && !defined(TEST_MPZ) && !defined(TEST_CPP_DEC_FLOAT) && !defined(TEST_MPFR_50) && !defined(TEST_MPFR_6) && !defined(TEST_MPFR_15) && !defined(TEST_MPFR_17) && !defined(TEST_MPFR_30) && !defined(TEST_CPP_DEC_FLOAT_NO_ET) && !defined(TEST_LOGGED_ADAPTER) && !defined(TEST_CPP_BIN_FLOAT)
 #define TEST_MPF_50

test/concepts/sf_concept_check_elliptic.cpp

@@ -19,7 +19,7 @@
 #endif
 
 #include <boost/container_hash/hash.hpp>
-#include <libs/math/test/compile_test/poison.hpp>
+#include <compile_test/poison.hpp>
 
 #if !defined(TEST_MPF_50) && !defined(TEST_BACKEND) && !defined(TEST_MPZ) && !defined(TEST_CPP_DEC_FLOAT) && !defined(TEST_MPFR_50) && !defined(TEST_MPFR_6) && !defined(TEST_MPFR_15) && !defined(TEST_MPFR_17) && !defined(TEST_MPFR_30) && !defined(TEST_CPP_DEC_FLOAT_NO_ET) && !defined(TEST_LOGGED_ADAPTER) && !defined(TEST_CPP_BIN_FLOAT)
 #define TEST_MPF_50

test/concepts/sf_concept_check_gamma.cpp

@@ -19,7 +19,7 @@
 #endif
 
 #include <boost/container_hash/hash.hpp>
-#include <libs/math/test/compile_test/poison.hpp>
+#include <compile_test/poison.hpp>
 
 #if !defined(TEST_MPF_50) && !defined(TEST_BACKEND) && !defined(TEST_MPZ) && !defined(TEST_CPP_DEC_FLOAT) && !defined(TEST_MPFR_50) && !defined(TEST_MPFR_6) && !defined(TEST_MPFR_15) && !defined(TEST_MPFR_17) && !defined(TEST_MPFR_30) && !defined(TEST_CPP_DEC_FLOAT_NO_ET) && !defined(TEST_LOGGED_ADAPTER) && !defined(TEST_CPP_BIN_FLOAT)
 #define TEST_MPF_50

test/concepts/sf_concept_check_poly.cpp

@@ -19,7 +19,7 @@
 #endif
 
 #include <boost/container_hash/hash.hpp>
-#include <libs/math/test/compile_test/poison.hpp>
+#include <compile_test/poison.hpp>
 
 #if !defined(TEST_MPF_50) && !defined(TEST_BACKEND) && !defined(TEST_MPZ) && !defined(TEST_CPP_DEC_FLOAT) && !defined(TEST_MPFR_50) && !defined(TEST_MPFR_6) && !defined(TEST_MPFR_15) && !defined(TEST_MPFR_17) && !defined(TEST_MPFR_30) && !defined(TEST_CPP_DEC_FLOAT_NO_ET) && !defined(TEST_LOGGED_ADAPTER) && !defined(TEST_CPP_BIN_FLOAT)
 #define TEST_MPF_50

test/math/high_prec/test_gamma.hpp

@@ -14,9 +14,9 @@
 #include <boost/math/tools/test.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <array>
-#include "libs/math/test/functor.hpp"
+#include "functor.hpp"
 
-#include "libs/math/test/handle_test_result.hpp"
+#include "handle_test_result.hpp"
 #include "../table_type.hpp"
 
 #ifndef SC_

test/math/instances/Jamfile.v2

@@ -20,7 +20,6 @@ project : requirements
    <include>$(mpfi_path)
    <include>$(mpfi_path)/src
    <include>$(tommath_path)
-   <include>../../..
    # We set these to make it easier to set up and test GMP and MPFR under Win32:
    #<toolset>msvc:<runtime-link>static
    #<toolset>msvc:<link>static

test/math/log1p_expm1_test.cpp

@@ -18,7 +18,7 @@
 
 #include "table_type.hpp"
 
-#include "libs/math/test/log1p_expm1_test.hpp"
+#include "log1p_expm1_test.hpp"
 
 //
 // DESCRIPTION:

test/math/powm1_sqrtp1m1_test.cpp

@@ -16,7 +16,7 @@
 
 #include "table_type.hpp"
 
-#include "libs/math/test/powm1_sqrtp1m1_test.hpp"
+#include "powm1_sqrtp1m1_test.hpp"
 
 //
 // DESCRIPTION:

test/math/table_type.hpp

@@ -6,7 +6,7 @@
 #ifndef BOOST_MP_TABLE_TYPE
 #define BOOST_MP_TABLE_TYPE
 
-#include <libs/math/test/table_type.hpp>
+#include <table_type.hpp>
 #include <boost/multiprecision/number.hpp>
 
 struct string_table_entry

test/math/test_bessel_i.cpp

@@ -12,7 +12,7 @@
 #include "table_type.hpp"
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_bessel_i.hpp"
+#include "test_bessel_i.hpp"
 
 void expected_results()
 {

test/math/test_bessel_j.cpp

@@ -12,7 +12,7 @@
 #include "table_type.hpp"
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_bessel_j.hpp"
+#include "test_bessel_j.hpp"
 
 void expected_results()
 {

test/math/test_bessel_k.cpp

@@ -13,7 +13,7 @@
 
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/bessel.hpp>
-#include "libs/math/test/test_bessel_k.hpp"
+#include "test_bessel_k.hpp"
 
 void expected_results()
 {

test/math/test_bessel_y.cpp

@@ -12,7 +12,7 @@
 #include "table_type.hpp"
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_bessel_y.hpp"
+#include "test_bessel_y.hpp"
 
 void expected_results()
 {

test/math/test_beta.cpp

@@ -12,7 +12,7 @@
 #include "table_type.hpp"
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_beta.hpp"
+#include "test_beta.hpp"
 
 void expected_results()
 {

test/math/test_binomial_coeff.cpp

@@ -12,7 +12,7 @@
 #include "table_type.hpp"
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_binomial_coeff.hpp"
+#include "test_binomial_coeff.hpp"
 
 void expected_results()
 {

test/math/test_carlson_1.cpp

@@ -10,7 +10,7 @@
 
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/ellint_rf.hpp>
-#include "libs/math/test/test_carlson.hpp"
+#include "test_carlson.hpp"
 
 void expected_results()
 {

test/math/test_carlson_2.cpp

@@ -9,7 +9,7 @@
 #define TEST2
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_carlson.hpp"
+#include "test_carlson.hpp"
 
 void expected_results()
 {

test/math/test_carlson_3.cpp

@@ -9,7 +9,7 @@
 #define TEST3
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_carlson.hpp"
+#include "test_carlson.hpp"
 
 void expected_results()
 {

test/math/test_carlson_4.cpp

@@ -9,7 +9,7 @@
 #define TEST4
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_carlson.hpp"
+#include "test_carlson.hpp"
 
 void expected_results()
 {

test/math/test_cbrt.cpp

@@ -8,7 +8,7 @@
 #define TEST_UDT
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_cbrt.hpp"
+#include "test_cbrt.hpp"
 
 void expected_results()
 {

test/math/test_digamma.cpp

@@ -8,7 +8,7 @@
 #define TEST_UDT
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_digamma.hpp"
+#include "test_digamma.hpp"
 
 void expected_results()
 {

test/math/test_ellint_1.cpp

@@ -8,7 +8,7 @@
 #define TEST_UDT
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_ellint_1.hpp"
+#include "test_ellint_1.hpp"
 
 void expected_results()
 {

test/math/test_ellint_2.cpp

@@ -8,7 +8,7 @@
 #define TEST_UDT
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_ellint_2.hpp"
+#include "test_ellint_2.hpp"
 
 void expected_results()
 {

test/math/test_ellint_3.cpp

@@ -8,7 +8,7 @@
 #define TEST_UDT
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_ellint_3.hpp"
+#include "test_ellint_3.hpp"
 
 void expected_results()
 {

test/math/test_erf.cpp

@@ -8,7 +8,7 @@
 #define TEST_UDT
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_erf.hpp"
+#include "test_erf.hpp"
 
 void expected_results()
 {

test/math/test_expint.cpp

@@ -8,7 +8,7 @@
 #define TEST_UDT
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_expint.hpp"
+#include "test_expint.hpp"
 
 void expected_results()
 {

test/math/test_gamma.cpp

@@ -8,7 +8,7 @@
 #define TEST_UDT
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_gamma.hpp"
+#include "test_gamma.hpp"
 
 void expected_results()
 {

test/math/test_hermite.cpp

@@ -8,7 +8,7 @@
 #define TEST_UDT
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_hermite.hpp"
+#include "test_hermite.hpp"
 
 void expected_results()
 {

test/math/test_ibeta.cpp

@@ -10,7 +10,7 @@
 #define TEST_DATA 1
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_ibeta.hpp"
+#include "test_ibeta.hpp"
 
 void expected_results()
 {

test/math/test_ibeta_2.cpp

@@ -10,7 +10,7 @@
 #define TEST_DATA 2
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_ibeta.hpp"
+#include "test_ibeta.hpp"
 
 void expected_results()
 {

test/math/test_ibeta_3.cpp

@@ -10,7 +10,7 @@
 #define TEST_DATA 3
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_ibeta.hpp"
+#include "test_ibeta.hpp"
 
 void expected_results()
 {

test/math/test_ibeta_4.cpp

@@ -10,7 +10,7 @@
 #define TEST_DATA 4
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_ibeta.hpp"
+#include "test_ibeta.hpp"
 
 void expected_results()
 {

test/math/test_ibeta_inv_1.cpp

@@ -10,7 +10,7 @@
 #define TEST_DATA 4
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_ibeta_inv.hpp"
+#include "test_ibeta_inv.hpp"
 
 void expected_results()
 {

test/math/test_ibeta_inv_ab_4.cpp

@@ -11,7 +11,7 @@
 #define FULL_TEST
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_ibeta_inv_ab.hpp"
+#include "test_ibeta_inv_ab.hpp"
 
 void expected_results()
 {

test/math/test_igamma.cpp

@@ -7,7 +7,7 @@
 #include "table_type.hpp"
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_igamma.hpp"
+#include "test_igamma.hpp"
 
 void expected_results()
 {

test/math/test_igamma_inv.cpp

@@ -12,7 +12,7 @@
 #define TEST_UDT
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_igamma_inv.hpp"
+#include "test_igamma_inv.hpp"
 
 void expected_results()
 {

test/math/test_igamma_inva.cpp

@@ -8,7 +8,7 @@
 #define TEST_UDT
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_igamma_inva.hpp"
+#include "test_igamma_inva.hpp"
 
 void expected_results()
 {

test/math/test_laguerre.cpp

@@ -8,7 +8,7 @@
 #define TEST_UDT
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_laguerre.hpp"
+#include "test_laguerre.hpp"
 
 void expected_results()
 {

test/math/test_legendre.cpp

@@ -8,7 +8,7 @@
 #define TEST_UDT
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_legendre.hpp"
+#include "test_legendre.hpp"
 
 void expected_results()
 {

test/math/test_tgamma_ratio.cpp

@@ -8,7 +8,7 @@
 #define TEST_UDT
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_tgamma_ratio.hpp"
+#include "test_tgamma_ratio.hpp"
 
 void expected_results()
 {

test/math/test_zeta.cpp

@@ -8,7 +8,7 @@
 #define TEST_UDT
 
 #include <boost/math/special_functions/math_fwd.hpp>
-#include "libs/math/test/test_zeta.hpp"
+#include "test_zeta.hpp"
 
 void expected_results()
 {

test/test_arithmetic_complex128.cpp

@@ -8,7 +8,7 @@
 #include <boost/multiprecision/complex128.hpp>
 #endif
 
-#include "libs/multiprecision/test/test_arithmetic.hpp"
+#include "test_arithmetic.hpp"
 
 int main()
 {

test/test_arithmetic_complex_adaptor.cpp

@@ -7,7 +7,7 @@
 
 #include <boost/multiprecision/cpp_complex.hpp>
 
-#include "libs/multiprecision/test/test_arithmetic.hpp"
+#include "test_arithmetic.hpp"
 
 int main()
 {

test/test_arithmetic_complex_adaptor_2.cpp

@@ -7,7 +7,7 @@
 
 #include <boost/multiprecision/cpp_complex.hpp>
 
-#include "libs/multiprecision/test/test_arithmetic.hpp"
+#include "test_arithmetic.hpp"
 
 int main()
 {

test/test_arithmetic_cpp_bin_float_1.cpp

@@ -5,7 +5,7 @@
 
 #include <boost/multiprecision/cpp_bin_float.hpp>
 
-#include "libs/multiprecision/test/test_arithmetic.hpp"
+#include "test_arithmetic.hpp"
 
 template <unsigned Digits, boost::multiprecision::backends::digit_base_type DigitBase, class Allocator, class Exponent, Exponent MinExponent, Exponent MaxExponent, boost::multiprecision::expression_template_option ET>
 struct related_type<boost::multiprecision::number<boost::multiprecision::cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinExponent, MaxExponent>, ET> >

test/test_arithmetic_cpp_bin_float_2.cpp

@@ -7,7 +7,7 @@
 
 #include <boost/multiprecision/cpp_bin_float.hpp>
 
-#include "libs/multiprecision/test/test_arithmetic.hpp"
+#include "test_arithmetic.hpp"
 
 template <unsigned Digits, boost::multiprecision::backends::digit_base_type DigitBase, class Allocator, class Exponent, Exponent MinExponent, Exponent MaxExponent, boost::multiprecision::expression_template_option ET>
 struct related_type<boost::multiprecision::number<boost::multiprecision::cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinExponent, MaxExponent>, ET> >

test/test_arithmetic_cpp_bin_float_2m.cpp

@@ -7,7 +7,7 @@
 
 #include <boost/multiprecision/cpp_bin_float.hpp>
 
-#include "libs/multiprecision/test/test_arithmetic.hpp"
+#include "test_arithmetic.hpp"
 
 #ifndef _WIN64 // object file too large
 template <unsigned Digits, boost::multiprecision::backends::digit_base_type DigitBase, class Allocator, class Exponent, Exponent MinExponent, Exponent MaxExponent, boost::multiprecision::expression_template_option ET>

test/test_arithmetic_cpp_bin_float_3.cpp

@@ -5,7 +5,7 @@
 
 #include <boost/multiprecision/cpp_bin_float.hpp>
 
-#include "libs/multiprecision/test/test_arithmetic.hpp"
+#include "test_arithmetic.hpp"
 
 template <unsigned Digits, boost::multiprecision::backends::digit_base_type DigitBase, class Allocator, class Exponent, Exponent MinExponent, Exponent MaxExponent, boost::multiprecision::expression_template_option ET>
 struct related_type<boost::multiprecision::number<boost::multiprecision::cpp_bin_float<Digits, DigitBase, Allocator, Exponent, MinExponent, MaxExponent>, ET> >

test/test_arithmetic_cpp_bin_float_4.cpp

@@ -12,7 +12,7 @@
 
 #include <boost/multiprecision/cpp_bin_float.hpp>
 
-#include "libs/multiprecision/test/test_arithmetic.hpp"
+#include "test_arithmetic.hpp"
 
 using namespace boost::multiprecision;
 

test/test_arithmetic_cpp_bin_float_5.cpp

@@ -5,7 +5,7 @@
 
 #include <boost/multiprecision/cpp_bin_float.hpp>
 
-#include "libs/multiprecision/test/test_arithmetic.hpp"
+#include "test_arithmetic.hpp"
 
 using namespace boost::multiprecision;
 

test/test_arithmetic_cpp_bin_float_6.cpp

@@ -5,7 +5,7 @@
 
 #include <boost/multiprecision/cpp_bin_float.hpp>
 
-#include "libs/multiprecision/test/test_arithmetic.hpp"
+#include "test_arithmetic.hpp"
 
 #if 0
 template <unsigned Digits, boost::multiprecision::backends::digit_base_type DigitBase, class Allocator, class Exponent, Exponent MinExponent, Exponent MaxExponent, boost::multiprecision::expression_template_option ET>

test/test_arithmetic_mpc.cpp

@@ -6,7 +6,7 @@
 #include <boost/multiprecision/mpc.hpp>
 #define TEST_MPC
 
-#include "libs/multiprecision/test/test_arithmetic.hpp"
+#include "test_arithmetic.hpp"
 
 template <unsigned D>
 struct related_type<boost::multiprecision::number<boost::multiprecision::mpc_complex_backend<D> > >

test/test_cpp_bin_float.cpp

@@ -15,7 +15,7 @@
 #endif
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/random/uniform_int.hpp>
-#include "libs/multiprecision/test/test.hpp"
+#include "test.hpp"
 #include <iostream>
 #include <iomanip>
 

test/test_cpp_bin_float_io.cpp

@@ -68,7 +68,7 @@ void test()
          std::ios_base::fixed | std::ios_base::showpos}};
 
    std::array<std::array<const char*, 13 * 9>, 40> string_data = {{
-#include "libs/multiprecision/test/string_data.ipp"
+#include "string_data.ipp"
    }};
 
    double num   = 123456789.0;

test/test_float_io.cpp

@@ -113,7 +113,7 @@ void test()
          std::ios_base::fixed | std::ios_base::showpos}};
 
    std::array<std::array<const char*, 13 * 9>, 40> string_data = {{
-#include "libs/multiprecision/test/string_data.ipp"
+#include "string_data.ipp"
    }};
 
    double num   = 123456789.0;