From 3034224a1247bc340194fc47d59cdc54942983a9 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:17 -0500 Subject: [PATCH 01/11] Make the library modular usable. --- build.jam | 30 ++++ config/Jamfile.v2 | 19 +-- example/Jamfile.v2 | 16 +-- performance/Jamfile.v2 | 56 ++++---- performance/sf_performance.hpp | 16 +-- test/Jamfile.v2 | 149 ++++++++++---------- test/concepts/number_concept_check.cpp | 2 +- test/concepts/sf_concept_check_basic.cpp | 2 +- test/concepts/sf_concept_check_bessel.cpp | 2 +- test/concepts/sf_concept_check_beta.cpp | 2 +- test/concepts/sf_concept_check_beta_2.cpp | 2 +- test/concepts/sf_concept_check_beta_3.cpp | 2 +- test/concepts/sf_concept_check_elliptic.cpp | 2 +- test/concepts/sf_concept_check_gamma.cpp | 2 +- test/concepts/sf_concept_check_poly.cpp | 2 +- test/math/high_prec/test_gamma.hpp | 4 +- test/math/instances/Jamfile.v2 | 9 +- test/math/log1p_expm1_test.cpp | 2 +- test/math/powm1_sqrtp1m1_test.cpp | 2 +- test/math/table_type.hpp | 2 +- test/math/test_bessel_i.cpp | 2 +- test/math/test_bessel_j.cpp | 2 +- test/math/test_bessel_k.cpp | 2 +- test/math/test_bessel_y.cpp | 2 +- test/math/test_beta.cpp | 2 +- test/math/test_binomial_coeff.cpp | 2 +- test/math/test_carlson_1.cpp | 2 +- test/math/test_carlson_2.cpp | 2 +- test/math/test_carlson_3.cpp | 2 +- test/math/test_carlson_4.cpp | 2 +- test/math/test_cbrt.cpp | 2 +- test/math/test_digamma.cpp | 2 +- test/math/test_ellint_1.cpp | 2 +- test/math/test_ellint_2.cpp | 2 +- test/math/test_ellint_3.cpp | 2 +- test/math/test_erf.cpp | 2 +- test/math/test_expint.cpp | 2 +- test/math/test_gamma.cpp | 2 +- test/math/test_hermite.cpp | 2 +- test/math/test_ibeta.cpp | 2 +- test/math/test_ibeta_2.cpp | 2 +- test/math/test_ibeta_3.cpp | 2 +- test/math/test_ibeta_4.cpp | 2 +- test/math/test_ibeta_inv_1.cpp | 2 +- test/math/test_ibeta_inv_ab_4.cpp | 2 +- test/math/test_igamma.cpp | 2 +- test/math/test_igamma_inv.cpp | 2 +- test/math/test_igamma_inva.cpp | 2 +- test/math/test_laguerre.cpp | 2 +- test/math/test_legendre.cpp | 2 +- test/math/test_tgamma_ratio.cpp | 2 +- test/math/test_zeta.cpp | 2 +- test/test_arithmetic_complex128.cpp | 2 +- test/test_arithmetic_complex_adaptor.cpp | 2 +- test/test_arithmetic_complex_adaptor_2.cpp | 2 +- test/test_arithmetic_cpp_bin_float_1.cpp | 2 +- test/test_arithmetic_cpp_bin_float_2.cpp | 2 +- test/test_arithmetic_cpp_bin_float_2m.cpp | 2 +- test/test_arithmetic_cpp_bin_float_3.cpp | 2 +- test/test_arithmetic_cpp_bin_float_4.cpp | 2 +- test/test_arithmetic_cpp_bin_float_5.cpp | 2 +- test/test_arithmetic_cpp_bin_float_6.cpp | 2 +- test/test_arithmetic_mpc.cpp | 2 +- test/test_cpp_bin_float.cpp | 2 +- test/test_cpp_bin_float_io.cpp | 2 +- test/test_float_io.cpp | 2 +- 66 files changed, 223 insertions(+), 192 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 000000000..545a78dc5 --- /dev/null +++ b/build.jam @@ -0,0 +1,30 @@ +# Copyright René Ferdinand Rivera Morell 2023 +# 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) + +import project ; + +project /boost/multiprecision + : common-requirements + /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 + include + ; + +explicit + [ alias boost_multiprecision ] + [ alias all : boost_multiprecision test ] + ; + +call-if : boost-library multiprecision + ; + +use-project /boost/multiprecision/config : config ; diff --git a/config/Jamfile.v2 b/config/Jamfile.v2 index 62c568ccd..a55906a7a 100644 --- a/config/Jamfile.v2 +++ b/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 $(mpfi_path) $(mpfi_path)/src $(tommath_path) - ../../.. $(gmp_path) $(mpfr_path) $(mpfr_path)/build.vc10/lib/Win32/Debug @@ -37,13 +38,13 @@ project : requirements gcc:-Wextra ; -lib gmp ; -lib mpfr ; -lib mpfi ; -lib mpc ; -lib quadmath ; -lib tommath ; -lib f2c ; +searched-lib gmp : : shared ; +searched-lib mpfr : : shared ; +searched-lib mpfi : : shared ; +searched-lib mpc : : shared ; +searched-lib quadmath : : shared ; +searched-lib tommath : : shared ; +searched-lib f2c : : shared ; actions mp_simple_run_action { diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 552969b91..4d6943f07 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -11,7 +11,7 @@ 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 ] ; @@ -28,8 +28,6 @@ project $(mpfi_path) $(mpfi_path)/src $(tommath_path) - ../include - ../../.. gcc:-Wno-missing-braces darwin:-Wno-missing-braces @@ -58,10 +56,10 @@ project ] ; -lib gmp : : $(gmp_path) ; -lib mpfr : : $(gmp_path) $(mpfr_path) $(mpfr_path)/build.vc10/lib/Win32/Debug ; -lib mpfi : : $(gmp_path) $(mpfr_path) $(mpfr_path)/build.vc10/lib/Win32/Debug $(mpfi_path) $(mpfi_path)/src ; -lib quadmath ; +searched-lib gmp : : $(gmp_path) ; +searched-lib mpfr : : $(gmp_path) $(mpfr_path) $(mpfr_path)/build.vc10/lib/Win32/Debug ; +searched-lib mpfi : : $(gmp_path) $(mpfr_path) $(mpfr_path)/build.vc10/lib/Win32/Debug $(mpfi_path) $(mpfi_path)/src ; +searched-lib quadmath ; if $(tommath_path) { @@ -70,7 +68,7 @@ if $(tommath_path) } else { - lib tommath : : $(tommath_path) ; + searched-lib tommath : : $(tommath_path) ; TOMMATH = tommath ; } @@ -95,7 +93,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 : : 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 : quadmath ] ] + [ run numeric_limits_snips.cpp no_eh_eg_support /boost/test//test_exec_monitor : : : [ requires cxx11_numeric_limits ] [ check-target-builds ../config//has_float128 : quadmath ] ] [ run random_snips.cpp gmp no_eh_eg_support : : : [ requires cxx11_explicit_conversion_operators ] [ check-target-builds ../config//has_gmp : : no ] ] [ run safe_prime.cpp no_eh_eg_support ] diff --git a/performance/Jamfile.v2 b/performance/Jamfile.v2 index d7af2790c..ed60084e8 100644 --- a/performance/Jamfile.v2 +++ b/performance/Jamfile.v2 @@ -5,7 +5,7 @@ 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 ] ; @@ -21,7 +21,6 @@ project : requirements $(gmp_path)/gmpfrxx $(mpfr_path) $(tommath_path) - ../../.. $(gmp_path) $(mpfr_path) $(mpfr_path)/build.vc10/lib/Win32/Debug @@ -34,13 +33,16 @@ project : requirements BOOST_ALL_NO_LIB off NDEBUG=1 + /boost/chrono//boost_chrono + /boost/math//testing + : default-build release ; -lib gmp ; -lib mpfr ; -lib quadmath ; -lib f2c ; +searched-lib gmp ; +searched-lib mpfr ; +searched-lib quadmath ; +searched-lib f2c ; if $(tommath_path) { @@ -48,7 +50,7 @@ if $(tommath_path) } else { - lib tommath ; + searched-lib tommath ; TOMMATH = tommath ; } @@ -73,7 +75,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 : TEST_MPF TEST_MPZ TEST_MPQ gmp : ] [ check-target-builds ../config//has_mpfr : TEST_MPFR mpfr : ] [ check-target-builds ../config//has_tommath : TEST_TOMMATH $(TOMMATH) : ] @@ -92,7 +94,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 : TEST_MPF TEST_MPZ gmp : ] [ check-target-builds ../config//has_mpfr : TEST_MPFR mpfr : ] [ check-target-builds ../config//has_tommath : TEST_TOMMATH $(TOMMATH) : ] @@ -136,7 +138,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 : TEST_MPF TEST_MPZ gmp : ] [ check-target-builds ../config//has_mpfr : TEST_MPFR mpfr : ] [ check-target-builds ../config//has_float128 : quadmath : ] @@ -150,106 +152,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 : TEST_GMP gmp : ] # [ check-target-builds ../config//has_tommath : TEST_TOMMATH $(TOMMATH) : ] # ] [ obj obj_linpack_benchmark_mpfr : linpack-benchmark.cpp - : release + : [ check-target-builds ../config//has_mpfr : : no ] TEST_MPFR_50 [ check-target-builds ../config//has_f2c : : no ] ] [ obj obj_linpack_benchmark_mpf : linpack-benchmark.cpp - : release + : [ check-target-builds ../config//has_gmp : : no ] TEST_MPF_50 [ check-target-builds ../config//has_f2c : : no ] ] [ obj obj_linpack_benchmark_cpp_float : linpack-benchmark.cpp - : release + : TEST_CPP_DEC_FLOAT [ check-target-builds ../config//has_f2c : : no ] ] [ obj obj_linpack_benchmark_double : linpack-benchmark.cpp - : release + : [ check-target-builds ../config//has_f2c : : no ] ] [ obj obj_linpack_benchmark_native_float128 : linpack-benchmark.cpp - : release + : NATIVE_FLOAT128 [ check-target-builds ../config//has_float128 : : no ] [ check-target-builds ../config//has_f2c : : no ] ] [ obj obj_linpack_benchmark_float128 : linpack-benchmark.cpp - : release + : TEST_FLOAT128 [ check-target-builds ../config//has_float128 : : no ] [ check-target-builds ../config//has_f2c : : no ] ] [ obj obj_linpack_benchmark_cpp_quad_float : linpack-benchmark.cpp - : release + : TEST_CPP_BIN_FLOAT_QUAD [ check-target-builds ../config//has_f2c : : no ] ] [ obj obj_linpack_benchmark_cpp_oct_float : linpack-benchmark.cpp - : release + : TEST_CPP_BIN_FLOAT_OCT [ check-target-builds ../config//has_f2c : : no ] ] [ exe linpack_benchmark_mpfr : obj_linpack_benchmark_mpfr mpfr f2c gmp - : release + : [ check-target-builds ../config//has_mpfr : : no ] TEST_MPFR_50 [ check-target-builds ../config//has_f2c : : no ] ] [ exe linpack_benchmark_mpf : obj_linpack_benchmark_mpf gmp f2c - : release + : [ check-target-builds ../config//has_gmp : : no ] TEST_MPF_50 [ check-target-builds ../config//has_f2c : : no ] ] [ exe linpack_benchmark_cpp_float : obj_linpack_benchmark_cpp_float f2c - : release + : TEST_CPP_DEC_FLOAT [ check-target-builds ../config//has_f2c : : no ] ] [ exe linpack_benchmark_double : obj_linpack_benchmark_double f2c - : release + : [ check-target-builds ../config//has_f2c : : no ] ] [ exe linpack_benchmark_native_float128 : obj_linpack_benchmark_native_float128 f2c quadmath - : release + : [ check-target-builds ../config//has_float128 : : no ] [ check-target-builds ../config//has_f2c : : no ] ] [ exe linpack_benchmark_float128 : obj_linpack_benchmark_float128 f2c quadmath - : release + : [ check-target-builds ../config//has_float128 : : no ] [ check-target-builds ../config//has_f2c : : no ] ] [ exe linpack_benchmark_cpp_quad_float : obj_linpack_benchmark_cpp_quad_float f2c - : release + : [ check-target-builds ../config//has_f2c : : no ] ] [ exe linpack_benchmark_cpp_oct_float : obj_linpack_benchmark_cpp_oct_float f2c - : release + : [ check-target-builds ../config//has_f2c : : no ] ] diff --git a/performance/sf_performance.hpp b/performance/sf_performance.hpp index 647f285df..496de874e 100644 --- a/performance/sf_performance.hpp +++ b/performance/sf_performance.hpp @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include @@ -85,8 +85,8 @@ Real test_bessel() { #define T double #define SC_(x) x -#include "libs/math/test/bessel_i_int_data.ipp" -#include "libs/math/test/bessel_i_data.ipp" +#include "bessel_i_int_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(sph_bessel_data[i][0]), Real(sph_bessel_data[i][1])); @@ -148,7 +148,7 @@ template 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) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 3e490a13c..7d0e53eee 100644 --- a/test/Jamfile.v2 +++ b/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,7 @@ local tommath_path = [ modules.peek : TOMMATH_PATH ] ; path-constant here : . ; project : requirements + . $(gmp_path) $(gmp_path)/mpfr $(gmp_path)/gmpfrxx @@ -49,8 +52,6 @@ project : requirements $(mpfi_path) $(mpfi_path)/src $(tommath_path) - ../include - ../../.. # We set these to make it easier to set up and test GMP and MPFR under Win32: msvc:static msvc:static @@ -92,11 +93,11 @@ project : requirements local enable-specfun = [ MATCH (--enable-specfun) : [ modules.peek : ARGV ] ] ; local disable-concepts = [ MATCH (--disable-concepts) : [ modules.peek : ARGV ] ] ; -lib gmp : : $(gmp_path) ; -lib mpfr : : $(gmp_path) $(mpfr_path) $(mpfr_path)/build.vc10/lib/Win32/Debug ; -lib mpfi : : $(gmp_path) $(mpfr_path) $(mpfr_path)/build.vc10/lib/Win32/Debug $(mpfi_path) $(mpfi_path)/src ; -lib quadmath ; -lib mpc ; +searched-lib gmp : : $(gmp_path) ; +searched-lib mpfr : : $(gmp_path) $(mpfr_path) $(mpfr_path)/build.vc10/lib/Win32/Debug ; +searched-lib mpfi : : $(gmp_path) $(mpfr_path) $(mpfr_path)/build.vc10/lib/Win32/Debug $(mpfi_path) $(mpfi_path)/src ; +searched-lib quadmath ; +searched-lib mpc ; if $(tommath_path) { @@ -105,7 +106,7 @@ if $(tommath_path) } else { - lib tommath : : $(tommath_path) ; + searched-lib tommath : : $(tommath_path) ; TOMMATH = tommath ; } @@ -133,7 +134,7 @@ test-suite arithmetic_tests : [ run test_arithmetic_mpf.cpp gmp no_eh_support : : : [ check-target-builds ../config//has_gmp : : no ] [ check-target-builds ../config//has_float128 : quadmath ] ] [ run test_arithmetic_mpz.cpp gmp no_eh_support : : : [ check-target-builds ../config//has_gmp : : no ] [ check-target-builds ../config//has_float128 : quadmath ] ] [ run test_arithmetic_mpz_rat.cpp gmp no_eh_support : : : [ check-target-builds ../config//has_gmp : : no ] [ check-target-builds ../config//has_float128 : quadmath ] ] - [ run test_arithmetic_mpz_br.cpp gmp no_eh_support : : : [ check-target-builds ../config//has_gmp : : no ] [ check-target-builds ../config//has_float128 : quadmath ] ] + [ run test_arithmetic_mpz_br.cpp gmp no_eh_support /boost/rational//boost_rational : : : [ check-target-builds ../config//has_gmp : : no ] [ check-target-builds ../config//has_float128 : quadmath ] ] [ run test_arithmetic_mpq.cpp gmp no_eh_support : : : [ check-target-builds ../config//has_gmp : : no ] [ check-target-builds ../config//has_float128 : quadmath ] ] [ run test_arithmetic_mpfr.cpp mpfr gmp no_eh_support : : : [ check-target-builds ../config//has_mpfr : : no ] [ check-target-builds ../config//has_float128 : quadmath ] ] @@ -142,7 +143,7 @@ test-suite arithmetic_tests : [ run test_arithmetic_tommath.cpp $(TOMMATH) no_eh_support : : : [ check-target-builds ../config//has_tommath : : no ] [ check-target-builds ../config//has_float128 : quadmath ] ] [ run test_arithmetic_tommath_rat.cpp $(TOMMATH) no_eh_support : : : [ check-target-builds ../config//has_tommath : : no ] [ check-target-builds ../config//has_float128 : quadmath ] ] - [ run test_arithmetic_tommath_br.cpp $(TOMMATH) no_eh_support : : : [ check-target-builds ../config//has_tommath : : no ] [ check-target-builds ../config//has_float128 : quadmath ] ] + [ run test_arithmetic_tommath_br.cpp /boost/rational//boost_rational $(TOMMATH) no_eh_support : : : [ check-target-builds ../config//has_tommath : : no ] [ check-target-builds ../config//has_float128 : quadmath ] ] [ run test_arithmetic_cpp_int_1.cpp no_eh_support : : : msvc:-bigobj [ check-target-builds ../config//has_float128 : quadmath ] ] [ run test_arithmetic_cpp_int_2.cpp no_eh_support : : : msvc:-bigobj [ check-target-builds ../config//has_float128 : quadmath ] ] @@ -167,7 +168,7 @@ test-suite arithmetic_tests : [ run test_arithmetic_cpp_int_21.cpp no_eh_support : : : msvc:-bigobj [ check-target-builds ../config//has_float128 : quadmath ] ] [ run test_arithmetic_cpp_int_22.cpp no_eh_support : : : msvc:-bigobj [ check-target-builds ../config//has_float128 : quadmath ] ] [ run test_arithmetic_cpp_int_23.cpp no_eh_support : : : msvc:-bigobj [ check-target-builds ../config//has_float128 : quadmath ] ] - [ run test_arithmetic_cpp_int_br.cpp no_eh_support : : : msvc:-bigobj [ check-target-builds ../config//has_float128 : quadmath ] ] + [ run test_arithmetic_cpp_int_br.cpp no_eh_support /boost/rational//boost_rational : : : msvc:-bigobj [ check-target-builds ../config//has_float128 : quadmath ] ] [ run test_arithmetic_ab_1.cpp no_eh_support : : : [ check-target-builds ../config//has_float128 : quadmath ] ] [ run test_arithmetic_ab_2.cpp no_eh_support : : : [ check-target-builds ../config//has_float128 : quadmath ] ] @@ -772,7 +773,7 @@ test-suite conversions : [ check-target-builds ../config//has_intel_quad : -Qoption,cpp,--extended_float_type : no ] [ check-target-builds ../config//has_float128 : 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 +782,7 @@ test-suite conversions : [ check-target-builds ../config//has_tommath : : 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 +791,21 @@ test-suite conversions : [ check-target-builds ../config//has_gmp : : 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 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 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 +813,7 @@ test-suite conversions : release [ check-target-builds ../config//has_gmp : : 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 +821,7 @@ test-suite conversions : release [ check-target-builds ../config//has_mpfr : : 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 +876,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 +1002,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 TEST1 gcc-mingw:static : test_cpp_int_serial_1 ] - [ run test_cpp_int_serial.cpp ../../serialization/build//boost_serialization : : : release TEST2 gcc-mingw:static : test_cpp_int_serial_2 ] - [ run test_cpp_int_serial.cpp ../../serialization/build//boost_serialization : : : release TEST3 gcc-mingw:static : test_cpp_int_serial_3 ] - [ run test_cpp_int_serial.cpp ../../serialization/build//boost_serialization : : : release TEST4 gcc-mingw:static : test_cpp_int_serial_4 ] - [ run test_cpp_int_deserial.cpp ../../serialization/build//boost_serialization ../../filesystem/build//boost_filesystem : $(here)/serial_txts : : release gcc-mingw:static ] - [ run test_cpp_rat_serial.cpp ../../serialization/build//boost_serialization : : : release gcc-mingw:static ] + [ run test_cpp_int_serial.cpp /boost/serialization//boost_serialization : : : release TEST1 gcc-mingw:static : test_cpp_int_serial_1 ] + [ run test_cpp_int_serial.cpp /boost/serialization//boost_serialization : : : release TEST2 gcc-mingw:static : test_cpp_int_serial_2 ] + [ run test_cpp_int_serial.cpp /boost/serialization//boost_serialization : : : release TEST3 gcc-mingw:static : test_cpp_int_serial_3 ] + [ run test_cpp_int_serial.cpp /boost/serialization//boost_serialization : : : release TEST4 gcc-mingw:static : test_cpp_int_serial_4 ] + [ run test_cpp_int_deserial.cpp /boost/serialization//boost_serialization /boost/filesystem//boost_filesystem : $(here)/serial_txts : : release gcc-mingw:static ] + [ run test_cpp_rat_serial.cpp /boost/serialization//boost_serialization : : : release gcc-mingw:static ] [ run test_gcd.cpp : : : [ requires cxx11_hdr_random ] ] ; @@ -1027,8 +1028,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 : : no ] ] [ run constexpr_test_cpp_int_4.cpp : : : [ requires cxx14_constexpr cxx17_if_constexpr ] [ check-target-builds ../config//has_is_constant_evaluated : : no ] ] [ run constexpr_test_cpp_int_5.cpp : : : [ requires cxx14_constexpr cxx17_if_constexpr ] [ check-target-builds ../config//has_is_constant_evaluated : : no ] ] - [ run constexpr_test_cpp_int_6.cpp : : : [ requires cxx14_constexpr cxx17_if_constexpr ] [ check-target-builds ../config//has_is_constant_evaluated : msvc:-constexpr:steps10000000 clang:-fconstexpr-steps=268435456 : no ] [ check-target-builds ../config//has_constexpr_limits : -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 : msvc:-constexpr:steps10000000 clang:-fconstexpr-steps=268435456 : no ] ] + [ run constexpr_test_cpp_int_6.cpp : : : [ requires cxx14_constexpr cxx17_if_constexpr ] [ check-target-builds ../config//has_is_constant_evaluated : "msvc:-constexpr:steps10000000" clang:-fconstexpr-steps=268435456 : no ] [ check-target-builds ../config//has_constexpr_limits : -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 : "msvc:-constexpr:steps10000000" clang:-fconstexpr-steps=268435456 : no ] ] [ compile test_nothrow_cpp_int.cpp ] [ compile test_nothrow_cpp_rational.cpp ] @@ -1046,7 +1047,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 +1056,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 +1065,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 +1152,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 +1176,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/test2.cpp ublas_interop/test21.cpp ublas_interop/test22.cpp ublas_interop/test23.cpp no_eh_support ] - #[ run ublas_interop/test3.cpp ublas_interop/test31.cpp ublas_interop/test32.cpp ublas_interop/test33.cpp ] - [ run ublas_interop/test4.cpp ublas_interop/test42.cpp ublas_interop/test43.cpp no_eh_support ] - [ run ublas_interop/test5.cpp ublas_interop/test52.cpp ublas_interop/test53.cpp no_eh_support ] - [ run ublas_interop/test6.cpp ublas_interop/test62.cpp ublas_interop/test63.cpp no_eh_support ] - #[ run ublas_interop/test7.cpp ublas_interop/test71.cpp ublas_interop/test72.cpp ublas_interop/test73.cpp ] - - [ run ublas_interop/test1.cpp ublas_interop/test11.cpp ublas_interop/test12.cpp ublas_interop/test13.cpp no_eh_support : : : 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 : : : TEST_ET=1 : ublas2_et ] - #[ run ublas_interop/test3.cpp ublas_interop/test31.cpp ublas_interop/test32.cpp ublas_interop/test33.cpp : : : TEST_ET=1 : ublas3_et ] - [ run ublas_interop/test4.cpp ublas_interop/test42.cpp ublas_interop/test43.cpp no_eh_support : : : TEST_ET=1 : ublas3_et ] - [ run ublas_interop/test5.cpp ublas_interop/test52.cpp ublas_interop/test53.cpp no_eh_support : : : TEST_ET=1 : ublas4_et ] - [ run ublas_interop/test6.cpp ublas_interop/test62.cpp ublas_interop/test63.cpp no_eh_support : : : TEST_ET=1 : ublas5_et ] - #[ run ublas_interop/test7.cpp ublas_interop/test71.cpp ublas_interop/test72.cpp ublas_interop/test73.cpp : : : TEST_ET=1 : ublas6_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 ] + [ 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 /boost/ublas//boost_ublas ] + [ 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 /boost/ublas//boost_ublas ] + [ 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 /boost/ublas//boost_ublas ] + + [ run ublas_interop/test1.cpp ublas_interop/test11.cpp ublas_interop/test12.cpp ublas_interop/test13.cpp no_eh_support /boost/ublas//boost_ublas : : : 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 /boost/ublas//boost_ublas : : : TEST_ET=1 : ublas2_et ] + #[ run ublas_interop/test3.cpp ublas_interop/test31.cpp ublas_interop/test32.cpp ublas_interop/test33.cpp /boost/ublas//boost_ublas : : : 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 : : : TEST_ET=1 : ublas3_et ] + [ run ublas_interop/test5.cpp ublas_interop/test52.cpp ublas_interop/test53.cpp no_eh_support /boost/ublas//boost_ublas : : : TEST_ET=1 : ublas4_et ] + [ run ublas_interop/test6.cpp ublas_interop/test62.cpp ublas_interop/test63.cpp no_eh_support /boost/ublas//boost_ublas : : : TEST_ET=1 : ublas5_et ] + #[ run ublas_interop/test7.cpp ublas_interop/test71.cpp ublas_interop/test72.cpp ublas_interop/test73.cpp /boost/ublas//boost_ublas : : : 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 gcc-mingw:static ] - [ run test_cpp_dec_float_serial.cpp ../../serialization/build//boost_serialization : : : release TEST1 gcc-mingw:static : test_cpp_dec_float_serial_1 ] - [ run test_cpp_dec_float_serial.cpp ../../serialization/build//boost_serialization : : : release TEST2 gcc-mingw:static : test_cpp_dec_float_serial_2 ] - [ run test_float128_serial.cpp ../../serialization/build//boost_serialization quadmath : : : release gcc-mingw:static [ check-target-builds ../config//has_float128 : : no ] ] - [ run test_cpp_bin_float_serial.cpp ../../serialization/build//boost_serialization : : : release gcc-mingw:static TEST1 : test_bin_dec_float_serial_1 ] - [ run test_cpp_bin_float_serial.cpp ../../serialization/build//boost_serialization : : : release TEST2 gcc-mingw:static : test_bin_dec_float_serial_2 ] + [ run test_adapt_serial.cpp /boost/serialization//boost_serialization : : : release gcc-mingw:static ] + [ run test_cpp_dec_float_serial.cpp /boost/serialization//boost_serialization : : : release TEST1 gcc-mingw:static : test_cpp_dec_float_serial_1 ] + [ run test_cpp_dec_float_serial.cpp /boost/serialization//boost_serialization : : : release TEST2 gcc-mingw:static : test_cpp_dec_float_serial_2 ] + [ run test_float128_serial.cpp /boost/serialization//boost_serialization quadmath : : : release gcc-mingw:static [ check-target-builds ../config//has_float128 : : no ] ] + [ run test_cpp_bin_float_serial.cpp /boost/serialization//boost_serialization : : : release gcc-mingw:static TEST1 : test_bin_dec_float_serial_1 ] + [ run test_cpp_bin_float_serial.cpp /boost/serialization//boost_serialization : : : release TEST2 gcc-mingw:static : test_bin_dec_float_serial_2 ] # # Mixed mode comparison tests, see: https://svn.boost.org/trac/boost/ticket/11328 @@ -1352,7 +1353,7 @@ rule get_specfun_tests_mpfr BOOST_ALL_NO_LIB BOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE msvc:-bigobj - ../../math/include_private + /boost/math//testing release : $(source:B)_mpfr ] ; } @@ -1369,7 +1370,7 @@ rule get_specfun_tests_mpfr msvc:-bigobj [ check-target-builds ../config//has_mpfr : TEST_MPFR gmp mpfr : no ] [ check-target-builds ../config//has_float128 : quadmath ] - ../../math/include_private + /boost/math//testing release : test_gamma_mpfr_$(digits) ] ; @@ -1394,7 +1395,7 @@ rule get_specfun_tests_gmp TEST_MPF_50 BOOST_ALL_NO_LIB msvc:-bigobj - ../../math/include_private + /boost/math//testing release : $(source:B)_mpf ] ; } @@ -1411,7 +1412,7 @@ rule get_specfun_tests_gmp msvc:-bigobj [ check-target-builds ../config//has_gmp : TEST_MPF gmp : no ] [ check-target-builds ../config//has_float128 : quadmath ] - ../../math/include_private + /boost/math//testing release : test_gamma_gmp_$(digits) ] ; @@ -1433,7 +1434,7 @@ rule get_specfun_tests_cpp_dec_float TEST_CPP_DEC_FLOAT BOOST_ALL_NO_LIB msvc:-bigobj - ../../math/include_private + /boost/math//testing release : $(source:B)_cpp_dec_float ] ; } @@ -1449,7 +1450,7 @@ rule get_specfun_tests_cpp_dec_float TEST_PRECISION=$(digits) msvc:-bigobj TEST_CPP_DEC_FLOAT - ../../math/include_private + /boost/math//testing release : test_gamma_cpp_dec_float_$(digits) ] ; } @@ -1469,7 +1470,7 @@ rule get_specfun_tests_cpp_bin_float TEST_CPP_BIN_FLOAT BOOST_ALL_NO_LIB msvc:-bigobj - ../../math/include_private + /boost/math//testing release [ check-target-builds ../config//has_float128 : quadmath ] : $(source:B)_cpp_bin_float ] ; @@ -1487,7 +1488,7 @@ rule get_specfun_tests_cpp_bin_float msvc:-bigobj TEST_CPP_BIN_FLOAT [ check-target-builds ../config//has_float128 : quadmath ] - ../../math/include_private + /boost/math//testing release : test_gamma_cpp_bin_float_$(digits) ] ; @@ -1512,7 +1513,7 @@ rule get_specfun_tests_float128 BOOST_ALL_NO_LIB BOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE msvc:-bigobj - ../../math/include_private + /boost/math//testing release : $(source:B)_float128 ] ; } @@ -1537,7 +1538,7 @@ rule get_specfun_tests_intel_quad BOOST_ALL_NO_LIB BOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE msvc:-bigobj - ../../math/include_private + /boost/math//testing release : $(source:B)_intel_quad ] ; } @@ -1585,7 +1586,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 TEST_MPFR_50 [ check-target-builds ../config//has_mpfr : : no ] @@ -1593,7 +1594,7 @@ rule get_concept_checks space : $(source:B)_mpfr_50 ] ; - result += [ compile $(source) mpfr + result += [ compile $(source) mpfr /boost/math//boost_math /boost/math//testing : # requirements TEST_MPFR_6 [ check-target-builds ../config//has_mpfr : : no ] @@ -1601,7 +1602,7 @@ rule get_concept_checks space : $(source:B)_mpfr_6 ] ; - result += [ compile $(source) mpfr + result += [ compile $(source) mpfr /boost/math//boost_math /boost/math//testing : # requirements TEST_MPFR_15 [ check-target-builds ../config//has_mpfr : : no ] @@ -1609,7 +1610,7 @@ rule get_concept_checks space : $(source:B)_mpfr_15 ] ; - result += [ compile $(source) mpfr + result += [ compile $(source) mpfr /boost/math//boost_math /boost/math//testing : # requirements TEST_MPFR_17 [ check-target-builds ../config//has_mpfr : : no ] @@ -1617,7 +1618,7 @@ rule get_concept_checks space : $(source:B)_mpfr_17 ] ; - result += [ compile $(source) mpfr + result += [ compile $(source) mpfr /boost/math//boost_math /boost/math//testing : # requirements TEST_MPFR_30 [ check-target-builds ../config//has_mpfr : : no ] @@ -1625,7 +1626,7 @@ rule get_concept_checks space : $(source:B)_mpfr_30 ] ; - result += [ compile $(source) gmp + result += [ compile $(source) gmp /boost/math//boost_math /boost/math//testing : # requirements TEST_MPF_50 [ check-target-builds ../config//has_gmp : : no ] @@ -1633,35 +1634,35 @@ rule get_concept_checks space : $(source:B)_mpf50 ] ; - result += [ compile $(source) + result += [ compile $(source) /boost/math//boost_math /boost/math//testing : # requirements TEST_CPP_DEC_FLOAT off space : $(source:B)_cpp_dec_float ] ; - result += [ compile $(source) + result += [ compile $(source) /boost/math//boost_math /boost/math//testing : # requirements TEST_CPP_BIN_FLOAT off space : $(source:B)_cpp_bin_float ] ; - result += [ compile $(source) + result += [ compile $(source) /boost/math//boost_math /boost/math//testing : # requirements TEST_CPP_DEC_FLOAT_NO_ET off space : $(source:B)_cpp_dec_float_no_et ] ; - result += [ compile $(source) + result += [ compile $(source) /boost/math//boost_math /boost/math//testing : # requirements TEST_BACKEND off space : $(source:B)_backend_concept ] ; - result += [ compile $(source) + result += [ compile $(source) /boost/math//boost_math /boost/math//testing : # requirements TEST_LOGGED_ADAPTER off diff --git a/test/concepts/number_concept_check.cpp b/test/concepts/number_concept_check.cpp index 80067eb49..5d1a90b70 100644 --- a/test/concepts/number_concept_check.cpp +++ b/test/concepts/number_concept_check.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #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 diff --git a/test/concepts/sf_concept_check_basic.cpp b/test/concepts/sf_concept_check_basic.cpp index 4f062d8a8..747e3120c 100644 --- a/test/concepts/sf_concept_check_basic.cpp +++ b/test/concepts/sf_concept_check_basic.cpp @@ -19,7 +19,7 @@ #endif #include -#include +#include #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 diff --git a/test/concepts/sf_concept_check_bessel.cpp b/test/concepts/sf_concept_check_bessel.cpp index ed499395a..4ff084984 100644 --- a/test/concepts/sf_concept_check_bessel.cpp +++ b/test/concepts/sf_concept_check_bessel.cpp @@ -19,7 +19,7 @@ #endif #include -#include +#include #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 diff --git a/test/concepts/sf_concept_check_beta.cpp b/test/concepts/sf_concept_check_beta.cpp index 657cd1cbb..242edbbd6 100644 --- a/test/concepts/sf_concept_check_beta.cpp +++ b/test/concepts/sf_concept_check_beta.cpp @@ -19,7 +19,7 @@ #endif #include -#include +#include #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 diff --git a/test/concepts/sf_concept_check_beta_2.cpp b/test/concepts/sf_concept_check_beta_2.cpp index a0597f089..9b94c98df 100644 --- a/test/concepts/sf_concept_check_beta_2.cpp +++ b/test/concepts/sf_concept_check_beta_2.cpp @@ -20,7 +20,7 @@ #endif #include -#include +#include #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 diff --git a/test/concepts/sf_concept_check_beta_3.cpp b/test/concepts/sf_concept_check_beta_3.cpp index f90ed8397..997f30f3e 100644 --- a/test/concepts/sf_concept_check_beta_3.cpp +++ b/test/concepts/sf_concept_check_beta_3.cpp @@ -19,7 +19,7 @@ #endif #include -#include +#include #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 diff --git a/test/concepts/sf_concept_check_elliptic.cpp b/test/concepts/sf_concept_check_elliptic.cpp index c2bbe56f1..cc6578201 100644 --- a/test/concepts/sf_concept_check_elliptic.cpp +++ b/test/concepts/sf_concept_check_elliptic.cpp @@ -19,7 +19,7 @@ #endif #include -#include +#include #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 diff --git a/test/concepts/sf_concept_check_gamma.cpp b/test/concepts/sf_concept_check_gamma.cpp index 0a35398de..a4d86d0df 100644 --- a/test/concepts/sf_concept_check_gamma.cpp +++ b/test/concepts/sf_concept_check_gamma.cpp @@ -19,7 +19,7 @@ #endif #include -#include +#include #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 diff --git a/test/concepts/sf_concept_check_poly.cpp b/test/concepts/sf_concept_check_poly.cpp index f30333342..588a7f02b 100644 --- a/test/concepts/sf_concept_check_poly.cpp +++ b/test/concepts/sf_concept_check_poly.cpp @@ -19,7 +19,7 @@ #endif #include -#include +#include #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 diff --git a/test/math/high_prec/test_gamma.hpp b/test/math/high_prec/test_gamma.hpp index bd890fb7c..9300d5acb 100644 --- a/test/math/high_prec/test_gamma.hpp +++ b/test/math/high_prec/test_gamma.hpp @@ -14,9 +14,9 @@ #include #include #include -#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_ diff --git a/test/math/instances/Jamfile.v2 b/test/math/instances/Jamfile.v2 index 4c66a9079..d91d78878 100644 --- a/test/math/instances/Jamfile.v2 +++ b/test/math/instances/Jamfile.v2 @@ -20,7 +20,6 @@ project : requirements $(mpfi_path) $(mpfi_path)/src $(tommath_path) - ../../.. # We set these to make it easier to set up and test GMP and MPFR under Win32: #msvc:static #msvc:static @@ -36,10 +35,10 @@ project : requirements BOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE ; -lib gmp : : $(gmp_path) ; -lib mpfr : : $(gmp_path) $(mpfr_path) $(mpfr_path)/build.vc10/lib/Win32/Debug ; -lib mpfi : : $(gmp_path) $(mpfr_path) $(mpfr_path)/build.vc10/lib/Win32/Debug $(mpfi_path) $(mpfi_path)/src ; -lib quadmath ; +searched-lib gmp : : $(gmp_path) ; +searched-lib mpfr : : $(gmp_path) $(mpfr_path) $(mpfr_path)/build.vc10/lib/Win32/Debug ; +searched-lib mpfi : : $(gmp_path) $(mpfr_path) $(mpfr_path)/build.vc10/lib/Win32/Debug $(mpfi_path) $(mpfi_path)/src ; +searched-lib quadmath ; rule generate_objs ( suffix : variant_count : build_opts * ) { diff --git a/test/math/log1p_expm1_test.cpp b/test/math/log1p_expm1_test.cpp index b2f1b19e6..18aa68190 100644 --- a/test/math/log1p_expm1_test.cpp +++ b/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: diff --git a/test/math/powm1_sqrtp1m1_test.cpp b/test/math/powm1_sqrtp1m1_test.cpp index f6832aebf..9e75e1ceb 100644 --- a/test/math/powm1_sqrtp1m1_test.cpp +++ b/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: diff --git a/test/math/table_type.hpp b/test/math/table_type.hpp index 26229745f..eb846ef8b 100644 --- a/test/math/table_type.hpp +++ b/test/math/table_type.hpp @@ -6,7 +6,7 @@ #ifndef BOOST_MP_TABLE_TYPE #define BOOST_MP_TABLE_TYPE -#include +#include #include struct string_table_entry diff --git a/test/math/test_bessel_i.cpp b/test/math/test_bessel_i.cpp index 0d9176b8e..58845a340 100644 --- a/test/math/test_bessel_i.cpp +++ b/test/math/test_bessel_i.cpp @@ -12,7 +12,7 @@ #include "table_type.hpp" #include -#include "libs/math/test/test_bessel_i.hpp" +#include "test_bessel_i.hpp" void expected_results() { diff --git a/test/math/test_bessel_j.cpp b/test/math/test_bessel_j.cpp index d322c3714..50a65fd90 100644 --- a/test/math/test_bessel_j.cpp +++ b/test/math/test_bessel_j.cpp @@ -12,7 +12,7 @@ #include "table_type.hpp" #include -#include "libs/math/test/test_bessel_j.hpp" +#include "test_bessel_j.hpp" void expected_results() { diff --git a/test/math/test_bessel_k.cpp b/test/math/test_bessel_k.cpp index 94827736c..a168f7c0e 100644 --- a/test/math/test_bessel_k.cpp +++ b/test/math/test_bessel_k.cpp @@ -13,7 +13,7 @@ #include #include -#include "libs/math/test/test_bessel_k.hpp" +#include "test_bessel_k.hpp" void expected_results() { diff --git a/test/math/test_bessel_y.cpp b/test/math/test_bessel_y.cpp index 495d10065..41c39de5b 100644 --- a/test/math/test_bessel_y.cpp +++ b/test/math/test_bessel_y.cpp @@ -12,7 +12,7 @@ #include "table_type.hpp" #include -#include "libs/math/test/test_bessel_y.hpp" +#include "test_bessel_y.hpp" void expected_results() { diff --git a/test/math/test_beta.cpp b/test/math/test_beta.cpp index 57497a296..ba7f09dea 100644 --- a/test/math/test_beta.cpp +++ b/test/math/test_beta.cpp @@ -12,7 +12,7 @@ #include "table_type.hpp" #include -#include "libs/math/test/test_beta.hpp" +#include "test_beta.hpp" void expected_results() { diff --git a/test/math/test_binomial_coeff.cpp b/test/math/test_binomial_coeff.cpp index 6d322d7ef..6d5a6f33d 100644 --- a/test/math/test_binomial_coeff.cpp +++ b/test/math/test_binomial_coeff.cpp @@ -12,7 +12,7 @@ #include "table_type.hpp" #include -#include "libs/math/test/test_binomial_coeff.hpp" +#include "test_binomial_coeff.hpp" void expected_results() { diff --git a/test/math/test_carlson_1.cpp b/test/math/test_carlson_1.cpp index ef5c3780a..178d3d7ad 100644 --- a/test/math/test_carlson_1.cpp +++ b/test/math/test_carlson_1.cpp @@ -10,7 +10,7 @@ #include #include -#include "libs/math/test/test_carlson.hpp" +#include "test_carlson.hpp" void expected_results() { diff --git a/test/math/test_carlson_2.cpp b/test/math/test_carlson_2.cpp index 302f92cf3..6b9a1b212 100644 --- a/test/math/test_carlson_2.cpp +++ b/test/math/test_carlson_2.cpp @@ -9,7 +9,7 @@ #define TEST2 #include -#include "libs/math/test/test_carlson.hpp" +#include "test_carlson.hpp" void expected_results() { diff --git a/test/math/test_carlson_3.cpp b/test/math/test_carlson_3.cpp index 89d14f82f..cbfcdb04a 100644 --- a/test/math/test_carlson_3.cpp +++ b/test/math/test_carlson_3.cpp @@ -9,7 +9,7 @@ #define TEST3 #include -#include "libs/math/test/test_carlson.hpp" +#include "test_carlson.hpp" void expected_results() { diff --git a/test/math/test_carlson_4.cpp b/test/math/test_carlson_4.cpp index 40457e751..0e168d41b 100644 --- a/test/math/test_carlson_4.cpp +++ b/test/math/test_carlson_4.cpp @@ -9,7 +9,7 @@ #define TEST4 #include -#include "libs/math/test/test_carlson.hpp" +#include "test_carlson.hpp" void expected_results() { diff --git a/test/math/test_cbrt.cpp b/test/math/test_cbrt.cpp index 62850871d..5bc2e47e5 100644 --- a/test/math/test_cbrt.cpp +++ b/test/math/test_cbrt.cpp @@ -8,7 +8,7 @@ #define TEST_UDT #include -#include "libs/math/test/test_cbrt.hpp" +#include "test_cbrt.hpp" void expected_results() { diff --git a/test/math/test_digamma.cpp b/test/math/test_digamma.cpp index 3ac7b283e..95c82c148 100644 --- a/test/math/test_digamma.cpp +++ b/test/math/test_digamma.cpp @@ -8,7 +8,7 @@ #define TEST_UDT #include -#include "libs/math/test/test_digamma.hpp" +#include "test_digamma.hpp" void expected_results() { diff --git a/test/math/test_ellint_1.cpp b/test/math/test_ellint_1.cpp index 5f997d4b6..7dd54af20 100644 --- a/test/math/test_ellint_1.cpp +++ b/test/math/test_ellint_1.cpp @@ -8,7 +8,7 @@ #define TEST_UDT #include -#include "libs/math/test/test_ellint_1.hpp" +#include "test_ellint_1.hpp" void expected_results() { diff --git a/test/math/test_ellint_2.cpp b/test/math/test_ellint_2.cpp index 38c5a2c91..96504e689 100644 --- a/test/math/test_ellint_2.cpp +++ b/test/math/test_ellint_2.cpp @@ -8,7 +8,7 @@ #define TEST_UDT #include -#include "libs/math/test/test_ellint_2.hpp" +#include "test_ellint_2.hpp" void expected_results() { diff --git a/test/math/test_ellint_3.cpp b/test/math/test_ellint_3.cpp index 7c964c4c1..020bc9aa0 100644 --- a/test/math/test_ellint_3.cpp +++ b/test/math/test_ellint_3.cpp @@ -8,7 +8,7 @@ #define TEST_UDT #include -#include "libs/math/test/test_ellint_3.hpp" +#include "test_ellint_3.hpp" void expected_results() { diff --git a/test/math/test_erf.cpp b/test/math/test_erf.cpp index 419a37833..571841345 100644 --- a/test/math/test_erf.cpp +++ b/test/math/test_erf.cpp @@ -8,7 +8,7 @@ #define TEST_UDT #include -#include "libs/math/test/test_erf.hpp" +#include "test_erf.hpp" void expected_results() { diff --git a/test/math/test_expint.cpp b/test/math/test_expint.cpp index 062dc6752..27f620c93 100644 --- a/test/math/test_expint.cpp +++ b/test/math/test_expint.cpp @@ -8,7 +8,7 @@ #define TEST_UDT #include -#include "libs/math/test/test_expint.hpp" +#include "test_expint.hpp" void expected_results() { diff --git a/test/math/test_gamma.cpp b/test/math/test_gamma.cpp index 473efd030..e55ca9d23 100644 --- a/test/math/test_gamma.cpp +++ b/test/math/test_gamma.cpp @@ -8,7 +8,7 @@ #define TEST_UDT #include -#include "libs/math/test/test_gamma.hpp" +#include "test_gamma.hpp" void expected_results() { diff --git a/test/math/test_hermite.cpp b/test/math/test_hermite.cpp index 361da399c..951c05af2 100644 --- a/test/math/test_hermite.cpp +++ b/test/math/test_hermite.cpp @@ -8,7 +8,7 @@ #define TEST_UDT #include -#include "libs/math/test/test_hermite.hpp" +#include "test_hermite.hpp" void expected_results() { diff --git a/test/math/test_ibeta.cpp b/test/math/test_ibeta.cpp index 7ac0338f2..7258bbf01 100644 --- a/test/math/test_ibeta.cpp +++ b/test/math/test_ibeta.cpp @@ -10,7 +10,7 @@ #define TEST_DATA 1 #include -#include "libs/math/test/test_ibeta.hpp" +#include "test_ibeta.hpp" void expected_results() { diff --git a/test/math/test_ibeta_2.cpp b/test/math/test_ibeta_2.cpp index 4e6bdafb1..09f184f43 100644 --- a/test/math/test_ibeta_2.cpp +++ b/test/math/test_ibeta_2.cpp @@ -10,7 +10,7 @@ #define TEST_DATA 2 #include -#include "libs/math/test/test_ibeta.hpp" +#include "test_ibeta.hpp" void expected_results() { diff --git a/test/math/test_ibeta_3.cpp b/test/math/test_ibeta_3.cpp index 57d15c2ea..f79404b22 100644 --- a/test/math/test_ibeta_3.cpp +++ b/test/math/test_ibeta_3.cpp @@ -10,7 +10,7 @@ #define TEST_DATA 3 #include -#include "libs/math/test/test_ibeta.hpp" +#include "test_ibeta.hpp" void expected_results() { diff --git a/test/math/test_ibeta_4.cpp b/test/math/test_ibeta_4.cpp index a2818bf7f..bc5e85bf0 100644 --- a/test/math/test_ibeta_4.cpp +++ b/test/math/test_ibeta_4.cpp @@ -10,7 +10,7 @@ #define TEST_DATA 4 #include -#include "libs/math/test/test_ibeta.hpp" +#include "test_ibeta.hpp" void expected_results() { diff --git a/test/math/test_ibeta_inv_1.cpp b/test/math/test_ibeta_inv_1.cpp index 603f303b5..adfbcf3a3 100644 --- a/test/math/test_ibeta_inv_1.cpp +++ b/test/math/test_ibeta_inv_1.cpp @@ -10,7 +10,7 @@ #define TEST_DATA 4 #include -#include "libs/math/test/test_ibeta_inv.hpp" +#include "test_ibeta_inv.hpp" void expected_results() { diff --git a/test/math/test_ibeta_inv_ab_4.cpp b/test/math/test_ibeta_inv_ab_4.cpp index f49c85c5a..6f849b7ec 100644 --- a/test/math/test_ibeta_inv_ab_4.cpp +++ b/test/math/test_ibeta_inv_ab_4.cpp @@ -11,7 +11,7 @@ #define FULL_TEST #include -#include "libs/math/test/test_ibeta_inv_ab.hpp" +#include "test_ibeta_inv_ab.hpp" void expected_results() { diff --git a/test/math/test_igamma.cpp b/test/math/test_igamma.cpp index 562d33724..486bab8c9 100644 --- a/test/math/test_igamma.cpp +++ b/test/math/test_igamma.cpp @@ -7,7 +7,7 @@ #include "table_type.hpp" #include -#include "libs/math/test/test_igamma.hpp" +#include "test_igamma.hpp" void expected_results() { diff --git a/test/math/test_igamma_inv.cpp b/test/math/test_igamma_inv.cpp index 2ac7ee0e6..d1b1b4dc4 100644 --- a/test/math/test_igamma_inv.cpp +++ b/test/math/test_igamma_inv.cpp @@ -12,7 +12,7 @@ #define TEST_UDT #include -#include "libs/math/test/test_igamma_inv.hpp" +#include "test_igamma_inv.hpp" void expected_results() { diff --git a/test/math/test_igamma_inva.cpp b/test/math/test_igamma_inva.cpp index 7b6db27d1..9556c367a 100644 --- a/test/math/test_igamma_inva.cpp +++ b/test/math/test_igamma_inva.cpp @@ -8,7 +8,7 @@ #define TEST_UDT #include -#include "libs/math/test/test_igamma_inva.hpp" +#include "test_igamma_inva.hpp" void expected_results() { diff --git a/test/math/test_laguerre.cpp b/test/math/test_laguerre.cpp index 7bf6ea7a5..a53210398 100644 --- a/test/math/test_laguerre.cpp +++ b/test/math/test_laguerre.cpp @@ -8,7 +8,7 @@ #define TEST_UDT #include -#include "libs/math/test/test_laguerre.hpp" +#include "test_laguerre.hpp" void expected_results() { diff --git a/test/math/test_legendre.cpp b/test/math/test_legendre.cpp index 351f947c1..c3aef80ed 100644 --- a/test/math/test_legendre.cpp +++ b/test/math/test_legendre.cpp @@ -8,7 +8,7 @@ #define TEST_UDT #include -#include "libs/math/test/test_legendre.hpp" +#include "test_legendre.hpp" void expected_results() { diff --git a/test/math/test_tgamma_ratio.cpp b/test/math/test_tgamma_ratio.cpp index 3295f6635..0364f24e0 100644 --- a/test/math/test_tgamma_ratio.cpp +++ b/test/math/test_tgamma_ratio.cpp @@ -8,7 +8,7 @@ #define TEST_UDT #include -#include "libs/math/test/test_tgamma_ratio.hpp" +#include "test_tgamma_ratio.hpp" void expected_results() { diff --git a/test/math/test_zeta.cpp b/test/math/test_zeta.cpp index cc42bbb37..2279ac96b 100644 --- a/test/math/test_zeta.cpp +++ b/test/math/test_zeta.cpp @@ -8,7 +8,7 @@ #define TEST_UDT #include -#include "libs/math/test/test_zeta.hpp" +#include "test_zeta.hpp" void expected_results() { diff --git a/test/test_arithmetic_complex128.cpp b/test/test_arithmetic_complex128.cpp index 9bef30cd0..868d72551 100644 --- a/test/test_arithmetic_complex128.cpp +++ b/test/test_arithmetic_complex128.cpp @@ -8,7 +8,7 @@ #include #endif -#include "libs/multiprecision/test/test_arithmetic.hpp" +#include "test_arithmetic.hpp" int main() { diff --git a/test/test_arithmetic_complex_adaptor.cpp b/test/test_arithmetic_complex_adaptor.cpp index 5bd37d9af..7c5a34dec 100644 --- a/test/test_arithmetic_complex_adaptor.cpp +++ b/test/test_arithmetic_complex_adaptor.cpp @@ -7,7 +7,7 @@ #include -#include "libs/multiprecision/test/test_arithmetic.hpp" +#include "test_arithmetic.hpp" int main() { diff --git a/test/test_arithmetic_complex_adaptor_2.cpp b/test/test_arithmetic_complex_adaptor_2.cpp index 469230d56..14a6ca771 100644 --- a/test/test_arithmetic_complex_adaptor_2.cpp +++ b/test/test_arithmetic_complex_adaptor_2.cpp @@ -7,7 +7,7 @@ #include -#include "libs/multiprecision/test/test_arithmetic.hpp" +#include "test_arithmetic.hpp" int main() { diff --git a/test/test_arithmetic_cpp_bin_float_1.cpp b/test/test_arithmetic_cpp_bin_float_1.cpp index 7fa2553a9..37e06a917 100644 --- a/test/test_arithmetic_cpp_bin_float_1.cpp +++ b/test/test_arithmetic_cpp_bin_float_1.cpp @@ -5,7 +5,7 @@ #include -#include "libs/multiprecision/test/test_arithmetic.hpp" +#include "test_arithmetic.hpp" template struct related_type, ET> > diff --git a/test/test_arithmetic_cpp_bin_float_2.cpp b/test/test_arithmetic_cpp_bin_float_2.cpp index 931d45e6f..07ca83f94 100644 --- a/test/test_arithmetic_cpp_bin_float_2.cpp +++ b/test/test_arithmetic_cpp_bin_float_2.cpp @@ -7,7 +7,7 @@ #include -#include "libs/multiprecision/test/test_arithmetic.hpp" +#include "test_arithmetic.hpp" template struct related_type, ET> > diff --git a/test/test_arithmetic_cpp_bin_float_2m.cpp b/test/test_arithmetic_cpp_bin_float_2m.cpp index 366c3af53..42f2fb0ac 100644 --- a/test/test_arithmetic_cpp_bin_float_2m.cpp +++ b/test/test_arithmetic_cpp_bin_float_2m.cpp @@ -7,7 +7,7 @@ #include -#include "libs/multiprecision/test/test_arithmetic.hpp" +#include "test_arithmetic.hpp" #ifndef _WIN64 // object file too large template diff --git a/test/test_arithmetic_cpp_bin_float_3.cpp b/test/test_arithmetic_cpp_bin_float_3.cpp index 2e4b97d9b..3741c1799 100644 --- a/test/test_arithmetic_cpp_bin_float_3.cpp +++ b/test/test_arithmetic_cpp_bin_float_3.cpp @@ -5,7 +5,7 @@ #include -#include "libs/multiprecision/test/test_arithmetic.hpp" +#include "test_arithmetic.hpp" template struct related_type, ET> > diff --git a/test/test_arithmetic_cpp_bin_float_4.cpp b/test/test_arithmetic_cpp_bin_float_4.cpp index 268e631cf..e5d7ec6ae 100644 --- a/test/test_arithmetic_cpp_bin_float_4.cpp +++ b/test/test_arithmetic_cpp_bin_float_4.cpp @@ -12,7 +12,7 @@ #include -#include "libs/multiprecision/test/test_arithmetic.hpp" +#include "test_arithmetic.hpp" using namespace boost::multiprecision; diff --git a/test/test_arithmetic_cpp_bin_float_5.cpp b/test/test_arithmetic_cpp_bin_float_5.cpp index b6dbd9d28..f84ab0ba4 100644 --- a/test/test_arithmetic_cpp_bin_float_5.cpp +++ b/test/test_arithmetic_cpp_bin_float_5.cpp @@ -5,7 +5,7 @@ #include -#include "libs/multiprecision/test/test_arithmetic.hpp" +#include "test_arithmetic.hpp" using namespace boost::multiprecision; diff --git a/test/test_arithmetic_cpp_bin_float_6.cpp b/test/test_arithmetic_cpp_bin_float_6.cpp index 8fa90bcfb..0cd7740b4 100644 --- a/test/test_arithmetic_cpp_bin_float_6.cpp +++ b/test/test_arithmetic_cpp_bin_float_6.cpp @@ -5,7 +5,7 @@ #include -#include "libs/multiprecision/test/test_arithmetic.hpp" +#include "test_arithmetic.hpp" #if 0 template diff --git a/test/test_arithmetic_mpc.cpp b/test/test_arithmetic_mpc.cpp index 4bb82477c..8967b3c4c 100644 --- a/test/test_arithmetic_mpc.cpp +++ b/test/test_arithmetic_mpc.cpp @@ -6,7 +6,7 @@ #include #define TEST_MPC -#include "libs/multiprecision/test/test_arithmetic.hpp" +#include "test_arithmetic.hpp" template struct related_type > > diff --git a/test/test_cpp_bin_float.cpp b/test/test_cpp_bin_float.cpp index 132341a5e..f37500d90 100644 --- a/test/test_cpp_bin_float.cpp +++ b/test/test_cpp_bin_float.cpp @@ -15,7 +15,7 @@ #endif #include #include -#include "libs/multiprecision/test/test.hpp" +#include "test.hpp" #include #include diff --git a/test/test_cpp_bin_float_io.cpp b/test/test_cpp_bin_float_io.cpp index d92d4d8c2..ee22bd151 100644 --- a/test/test_cpp_bin_float_io.cpp +++ b/test/test_cpp_bin_float_io.cpp @@ -68,7 +68,7 @@ void test() std::ios_base::fixed | std::ios_base::showpos}}; std::array, 40> string_data = {{ -#include "libs/multiprecision/test/string_data.ipp" +#include "string_data.ipp" }}; double num = 123456789.0; diff --git a/test/test_float_io.cpp b/test/test_float_io.cpp index d1517b59c..86cf82d41 100644 --- a/test/test_float_io.cpp +++ b/test/test_float_io.cpp @@ -113,7 +113,7 @@ void test() std::ios_base::fixed | std::ios_base::showpos}}; std::array, 40> string_data = {{ -#include "libs/multiprecision/test/string_data.ipp" +#include "string_data.ipp" }}; double num = 123456789.0; From 7003efd984fc5598ea7c4c836bc583c7443b1f63 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:59 -0500 Subject: [PATCH 02/11] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/build.jam b/build.jam index 545a78dc5..3c4ce54c9 100644 --- a/build.jam +++ b/build.jam @@ -7,15 +7,15 @@ import project ; project /boost/multiprecision : common-requirements - /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 + /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 include ; From ef77072594f77163110391261c6759be6ed257dd Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 4 May 2024 23:30:38 -0500 Subject: [PATCH 03/11] Add missing import-search for cconfig/predef checks. --- example/Jamfile.v2 | 7 ++++--- performance/Jamfile.v2 | 39 ++++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 4d6943f07..30777085b 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -11,6 +11,7 @@ import testing ; import modules ; import path ; +import-search /boost/config/checks ; import config : requires ; local ntl-path = [ modules.peek : NTL_PATH ] ; @@ -28,7 +29,7 @@ project $(mpfi_path) $(mpfi_path)/src $(tommath_path) - + gcc:-Wno-missing-braces darwin:-Wno-missing-braces acc:+W2068,2461,2236,4070 @@ -49,7 +50,7 @@ project msvc:/wd4701 msvc:/wd4305 clang:static - [ requires + [ requires cxx11_rvalue_references cxx11_template_aliases cxx11_hdr_array cxx11_allocator cxx11_constexpr cxx11_explicit_conversion_operators cxx11_ref_qualifiers cxx11_hdr_functional cxx11_variadic_templates cxx11_user_defined_literals cxx11_decltype cxx11_static_assert cxx11_defaulted_functions cxx11_noexcept cxx11_ref_qualifiers cxx11_user_defined_literals cxx11_hdr_type_traits @@ -102,7 +103,7 @@ test-suite examples : [ run mpfr_snips.cpp mpfr gmp no_eh_eg_support : : : [ check-target-builds ../config//has_mpfr : : no ] ] [ run tommath_snips.cpp $(TOMMATH) no_eh_eg_support : : : [ check-target-builds ../config//has_tommath : : no ] ] [ compile constexpr_float_arithmetic_examples.cpp : [ requires cxx14_constexpr cxx17_if_constexpr ] ] - + [ run big_seventh.cpp no_eh_eg_support ] [ run exercise_threading_log_agm.cpp : : : BOOST_MULTIPRECISION_EXERCISE_THREADING_BACKEND_TYPE=101 release [ requires cxx11_hdr_atomic cxx11_hdr_thread ] : exercise_threading_log_agm_cpp_dec_float ] diff --git a/performance/Jamfile.v2 b/performance/Jamfile.v2 index ed60084e8..413902d9f 100644 --- a/performance/Jamfile.v2 +++ b/performance/Jamfile.v2 @@ -1,10 +1,11 @@ # copyright John Maddock 2012 -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at +# 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. import modules ; import path ; +import-search /boost/config/checks ; import config : requires ; local ntl-path = [ modules.peek : NTL_PATH ] ; @@ -12,19 +13,19 @@ local gmp_path = [ modules.peek : GMP_PATH ] ; local mpfr_path = [ modules.peek : MPFR_PATH ] ; local tommath_path = [ modules.peek : TOMMATH_PATH ] ; -project : requirements - freebsd:"-lrt" - linux:"-lrt" - pgi:"-lrt" - $(gmp_path) - $(gmp_path)/mpfr - $(gmp_path)/gmpfrxx +project : requirements + freebsd:"-lrt" + linux:"-lrt" + pgi:"-lrt" + $(gmp_path) + $(gmp_path)/mpfr + $(gmp_path)/gmpfrxx $(mpfr_path) $(tommath_path) - $(gmp_path) - $(mpfr_path) + $(gmp_path) + $(mpfr_path) $(mpfr_path)/build.vc10/lib/Win32/Debug - $(tommath_path) + $(tommath_path) # We set these to make it easier to set up and test GMP and MPFR under Win32: msvc:static msvc:static @@ -56,7 +57,7 @@ else test-suite performance : -[ exe performance_test : performance_test.cpp +[ exe performance_test : performance_test.cpp performance_test_files/test01.cpp performance_test_files/test18.cpp performance_test_files/test35.cpp performance_test_files/test02.cpp performance_test_files/test19.cpp performance_test_files/test36.cpp performance_test_files/test03.cpp performance_test_files/test20.cpp performance_test_files/test37.cpp @@ -73,7 +74,7 @@ test-suite performance : performance_test_files/test14.cpp performance_test_files/test31.cpp performance_test_files/test48.cpp performance_test_files/test15.cpp performance_test_files/test32.cpp performance_test_files/test49.cpp 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 + performance_test_files/test17.cpp performance_test_files/test34.cpp performance_test_files/test51.cpp /boost/system//boost_system : [ check-target-builds ../config//has_gmp : TEST_MPF TEST_MPZ TEST_MPQ gmp : ] @@ -86,14 +87,14 @@ test-suite performance : [ requires cxx11_auto_declarations cxx11_allocator ] ] -[ exe miller_rabin_performance : miller_rabin_performance.cpp +[ exe miller_rabin_performance : miller_rabin_performance.cpp miller_rabin_performance_files/test01.cpp miller_rabin_performance_files/test07.cpp miller_rabin_performance_files/test02.cpp miller_rabin_performance_files/test08.cpp miller_rabin_performance_files/test03.cpp miller_rabin_performance_files/test09.cpp miller_rabin_performance_files/test04.cpp miller_rabin_performance_files/test10.cpp 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 + /boost/system//boost_system /boost/chrono//boost_chrono : [ check-target-builds ../config//has_gmp : TEST_MPF TEST_MPZ gmp : ] [ check-target-builds ../config//has_mpfr : TEST_MPFR mpfr : ] @@ -102,7 +103,7 @@ test-suite performance : TEST_CPP_INT ] -[ exe sf_performance : sf_performance.cpp sf_performance_basic.cpp sf_performance_bessel.cpp +[ exe sf_performance : sf_performance.cpp sf_performance_basic.cpp sf_performance_bessel.cpp sf_performance_nct.cpp sf_performance_poly.cpp sf_performance_files/sf_performance_basic_1.cpp sf_performance_files/sf_performance_nct_06.cpp sf_performance_files/sf_performance_basic_2.cpp sf_performance_files/sf_performance_nct_07.cpp @@ -148,7 +149,7 @@ test-suite performance : msvc:-bigobj [ requires cxx11_auto_declarations cxx11_allocator ] ] - + [ 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 @@ -164,7 +165,7 @@ test-suite performance : [ check-target-builds ../config//has_f2c : : no ] ] -[ obj obj_linpack_benchmark_mpf : linpack-benchmark.cpp +[ obj obj_linpack_benchmark_mpf : linpack-benchmark.cpp : [ check-target-builds ../config//has_gmp : : no ] TEST_MPF_50 From 8bac4943467e011da46df92dc13fe447d2a059da Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 04/11] Add requires-b2 check to top-level build file. --- build.jam | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.jam b/build.jam index 3c4ce54c9..4d0130871 100644 --- a/build.jam +++ b/build.jam @@ -3,6 +3,8 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +require-b2 5.1 ; + import project ; project /boost/multiprecision From 68629819274133c9f4ccc35447fe1466e7945529 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -0500 Subject: [PATCH 05/11] Bump B2 require to 5.2 --- build.jam | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.jam b/build.jam index 4d0130871..13b93d8ff 100644 --- a/build.jam +++ b/build.jam @@ -3,9 +3,7 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) -require-b2 5.1 ; - -import project ; +require-b2 5.2 ; project /boost/multiprecision : common-requirements From fb9fc0cbb71cd0ad34238daff03de04068d1ed64 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 19:41:20 -0500 Subject: [PATCH 06/11] Change all references to . --- performance/Jamfile.v2 | 2 +- test/Jamfile.v2 | 138 ++++++++++++++++++++--------------------- 2 files changed, 70 insertions(+), 70 deletions(-) diff --git a/performance/Jamfile.v2 b/performance/Jamfile.v2 index 413902d9f..919e7da81 100644 --- a/performance/Jamfile.v2 +++ b/performance/Jamfile.v2 @@ -35,7 +35,7 @@ project : requirements off NDEBUG=1 /boost/chrono//boost_chrono - /boost/math//testing + /boost/math//testing : default-build release ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index a26bcbcbe..90b95ec0b 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -31,7 +31,7 @@ local tommath_path = [ modules.peek : TOMMATH_PATH ] ; # compile_fail # concepts # examples -# +# # You can run an individual suite by passing its name to b2 on the command line. # Or you can run all except the "specfun" tests (which are very slow) by not specifying anything. # @@ -63,7 +63,7 @@ project : requirements clang:static # Clang-linux does not generate .dlls. clang:-Wno-unused-variable # warning: unused variable 'tolerance' [-Wunused-variable] clang:-v - + # Assembler error "File too big" caused by lots of C++ templates, for example, math/floating_point_examples.cpp. # Some projects on some toolsets may require # gcc-mingw:\"-Wa,-mbig-obj\" @@ -71,7 +71,7 @@ project : requirements # gcc-mingw:-Wa,-mbig-obj # Some projects may overflow assembler and require equivalent of MSVC /bigobj. # Requires version 2.30 of GNU binutils. # Best applied only to projects that require this, see multiprecision/example run math/floating_point_examples.cpp. - + # Speed up compiles: msvc:off intel:off @@ -82,7 +82,7 @@ project : requirements # We can't yet enable this - it breaks the STL in some tests... #msvc,off:-RTCc #msvc,off:_ALLOW_RTCc_IN_STL - [ requires + [ requires cxx11_rvalue_references cxx11_template_aliases cxx11_hdr_array cxx11_allocator cxx11_constexpr cxx11_explicit_conversion_operators cxx11_ref_qualifiers cxx11_hdr_functional cxx11_variadic_templates cxx11_user_defined_literals cxx11_decltype cxx11_static_assert cxx11_defaulted_functions cxx11_noexcept cxx11_ref_qualifiers cxx11_user_defined_literals cxx11_hdr_type_traits @@ -251,12 +251,12 @@ test-suite arithmetic_tests : ; -alias precision_tests : test_preserve_source_precision_gmp test_preserve_source_precision_mpfr test_preserve_source_precision_mpc test_preserve_source_precision_mpfi - test_preserve_component_precision_gmp test_preserve_component_precision_mpfr test_preserve_component_precision_mpc test_preserve_component_precision_mpfi - test_preserve_related_precision_gmp test_preserve_related_precision_mpfr test_preserve_related_precision_mpc test_preserve_related_precision_mpfi - test_preserve_all_precision_gmp test_preserve_all_precision_mpfr test_preserve_all_precision_mpc test_preserve_all_precision_mpfi - test_preserve_target_precision_gmp test_preserve_target_precision_mpfr test_preserve_target_precision_mpc test_preserve_target_precision_mpfi - test_assume_uniform_precision_gmp test_assume_uniform_precision_mpfr test_assume_uniform_precision_mpc test_assume_uniform_precision_mpfi +alias precision_tests : test_preserve_source_precision_gmp test_preserve_source_precision_mpfr test_preserve_source_precision_mpc test_preserve_source_precision_mpfi + test_preserve_component_precision_gmp test_preserve_component_precision_mpfr test_preserve_component_precision_mpc test_preserve_component_precision_mpfi + test_preserve_related_precision_gmp test_preserve_related_precision_mpfr test_preserve_related_precision_mpc test_preserve_related_precision_mpfi + test_preserve_all_precision_gmp test_preserve_all_precision_mpfr test_preserve_all_precision_mpc test_preserve_all_precision_mpfi + test_preserve_target_precision_gmp test_preserve_target_precision_mpfr test_preserve_target_precision_mpc test_preserve_target_precision_mpfi + test_assume_uniform_precision_gmp test_assume_uniform_precision_mpfr test_assume_uniform_precision_mpc test_assume_uniform_precision_mpfi test_mpfr_mpc_precisions test_mpfi_precisions test_mpf_precisions test_threaded_precision_mpf ; rule get_function_tests @@ -568,7 +568,7 @@ test-suite conversions : [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] - [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] + [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_mpz_int.cpp : # command line @@ -578,7 +578,7 @@ test-suite conversions : [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] - [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] + [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_tom_int.cpp : # command line @@ -588,7 +588,7 @@ test-suite conversions : [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] - [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] + [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_cpp_rational.cpp : # command line @@ -598,7 +598,7 @@ test-suite conversions : [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] - [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] + [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_gmp_rational.cpp : # command line @@ -608,7 +608,7 @@ test-suite conversions : [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] - [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] + [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_tom_rational.cpp : # command line @@ -618,7 +618,7 @@ test-suite conversions : [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] - [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] + [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_cpp_bin_float.cpp : # command line @@ -628,7 +628,7 @@ test-suite conversions : [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] - [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] + [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_cpp_dec_float.cpp : # command line @@ -638,7 +638,7 @@ test-suite conversions : [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] - [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] + [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_mpf_float.cpp : # command line @@ -648,7 +648,7 @@ test-suite conversions : [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] - [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] + [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_mpfr_float.cpp : # command line @@ -658,7 +658,7 @@ test-suite conversions : [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] - [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] + [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_mpfi_float.cpp : # command line @@ -668,7 +668,7 @@ test-suite conversions : [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] - [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] + [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_convert_from_float128.cpp : # command line @@ -678,7 +678,7 @@ test-suite conversions : [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] - [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] + [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] [ run test_cpp_bin_float_conv.cpp ] @@ -830,7 +830,7 @@ test-suite conversions : [ check-target-builds ../config//has_float128 : : no ] : test_fixed_zero_precision_io_float128 ] - [ run test_trailing_io_delim.cpp no_eh_support + [ run test_trailing_io_delim.cpp no_eh_support : # command line : # input files : # requirements @@ -1013,14 +1013,14 @@ test-suite cpp_int_tests : test-suite misc : - [ compile test_constexpr.cpp : - [ check-target-builds ../config//has_float128 : HAVE_FLOAT128 : ] - [ check-target-builds ../config//has_intel_quad : -Qoption,cpp,--extended_float_type HAVE_FLOAT128 : ] + [ compile test_constexpr.cpp : + [ check-target-builds ../config//has_float128 : HAVE_FLOAT128 : ] + [ check-target-builds ../config//has_intel_quad : -Qoption,cpp,--extended_float_type HAVE_FLOAT128 : ] [ requires cxx11_constexpr cxx11_user_defined_literals ] ] - [ compile constexpr_test_arithmetic_backend.cpp : + [ compile constexpr_test_arithmetic_backend.cpp : [ requires cxx14_constexpr cxx17_if_constexpr ] ] - [ compile constexpr_test_float128.cpp : + [ compile constexpr_test_float128.cpp : [ requires cxx14_constexpr cxx17_if_constexpr ] [ check-target-builds ../config//has_float128 : quadmath : no ] ] [ run constexpr_test_cpp_int.cpp : : : [ requires cxx14_constexpr cxx17_if_constexpr ] [ check-target-builds ../config//has_is_constant_evaluated : : no ] ] @@ -1088,7 +1088,7 @@ test-suite misc : : # input files : # requirements TEST1 - release + release : test_rat_float_interconv_1 ] [ run test_rat_float_interconv.cpp no_eh_support /boost/system//boost_system /boost/chrono//boost_chrono @@ -1096,7 +1096,7 @@ test-suite misc : : # input files : # requirements TEST2 - release + release : test_rat_float_interconv_2 ] [ run test_rat_float_interconv.cpp no_eh_support /boost/system//boost_system /boost/chrono//boost_chrono @@ -1104,7 +1104,7 @@ test-suite misc : : # input files : # requirements TEST3 - release + release : test_rat_float_interconv_3 ] [ run test_rat_float_interconv.cpp no_eh_support /boost/system//boost_system /boost/chrono//boost_chrono @@ -1112,7 +1112,7 @@ test-suite misc : : # input files : # requirements TEST4 - release + release : test_rat_float_interconv_4 ] [ run test_rat_float_interconv.cpp no_eh_support /boost/system//boost_system /boost/chrono//boost_chrono mpfr gmp @@ -1121,7 +1121,7 @@ test-suite misc : : # requirements TEST5 [ check-target-builds ../config//has_mpfr : : no ] - release + release : test_rat_float_interconv_5 ] [ run test_rat_float_interconv.cpp no_eh_support /boost/system//boost_system /boost/chrono//boost_chrono mpfr gmp @@ -1130,7 +1130,7 @@ test-suite misc : : # requirements TEST6 [ check-target-builds ../config//has_mpfr : : no ] - release + release : test_rat_float_interconv_6 ] [ run test_rat_float_interconv.cpp no_eh_support /boost/system//boost_system /boost/chrono//boost_chrono mpfr gmp @@ -1139,7 +1139,7 @@ test-suite misc : : # requirements TEST7 [ check-target-builds ../config//has_mpfr : : no ] - release + release : test_rat_float_interconv_7 ] [ run test_rat_float_interconv.cpp no_eh_support /boost/system//boost_system /boost/chrono//boost_chrono mpfr gmp @@ -1148,7 +1148,7 @@ test-suite misc : : # requirements TEST8 [ check-target-builds ../config//has_mpfr : : no ] - release + release : test_rat_float_interconv_8 ] [ run test_cpp_int_conv.cpp no_eh_support ] @@ -1239,23 +1239,23 @@ test-suite misc : [ run git_issue_604.cpp : : : [ check-target-builds ../config//has_mpfr : gmp mpfr TEST_MPFR_50 ] [ check-target-builds ../config//has_gmp : gmp TEST_MPF_50 ] [ check-target-builds ../config//has_float128 : quadmath TEST_FLOAT128 ] - TEST_CPP_DEC_FLOAT + TEST_CPP_DEC_FLOAT TEST_CPP_BIN_FLOAT ] [ compile git_issue_608.cpp ] [ run git_issue_624.cpp ] [ run git_issue_626.cpp ] - [ compile git_issue_98.cpp : + [ compile git_issue_98.cpp : [ check-target-builds ../config//has_float128 : TEST_FLOAT128 quadmath : ] [ check-target-builds ../config//has_gmp : TEST_GMP gmp : ] [ check-target-builds ../config//has_mpfr : TEST_MPFR gmp mpfr : ] [ check-target-builds ../config//has_mpc : TEST_MPC gmp mpfr mpc : ] ] [ run issue_13301.cpp ] [ run issue_13148.cpp ] - [ run logged_adaptor_output_test.cpp : : : + [ run logged_adaptor_output_test.cpp : : : [ check-target-builds ../config//has_mpfi : gmp mpfr mpfi : no ] ] [ run logged_adaptor_cpp_output_test.cpp : : : [ requires cxx17_if_constexpr ] ] - [ run test_hash.cpp : : : + [ run test_hash.cpp : : : [ check-target-builds ../config//has_float128 : TEST_FLOAT128 quadmath : ] [ check-target-builds ../config//has_gmp : TEST_GMP gmp : ] [ check-target-builds ../config//has_mpfr : TEST_MPFR gmp mpfr : ] @@ -1286,18 +1286,18 @@ test-suite misc : [ compile git_issue_393.cpp : release [ check-target-builds ../config//has_eigen : : no ] ] ; -alias eigen_tests : +alias eigen_tests : test_eigen_interop_cpp_int test_eigen_interop_cpp_dec_float test_eigen_interop_cpp_dec_float_2 test_eigen_interop_cpp_dec_float_3 test_eigen_interop_cpp_bin_float_1 test_eigen_interop_cpp_bin_float_2 test_eigen_interop_cpp_bin_float_3 test_eigen_interop_mpfr_1 - test_eigen_interop_mpfr_2 test_eigen_interop_mpfr_3 test_eigen_interop_mpfr_4 test_eigen_interop_mpfr_5 test_eigen_interop_mpfr_6 + test_eigen_interop_mpfr_2 test_eigen_interop_mpfr_3 test_eigen_interop_mpfr_4 test_eigen_interop_mpfr_5 test_eigen_interop_mpfr_6 test_eigen_interop_gmp test_eigen_interop_gmp_2 test_eigen_interop_mpc git_issue_393 ; test-suite standalone : [ run standalone_constexpr_test_cpp_int.cpp : : : [ requires cxx14_constexpr cxx17_if_constexpr ] [ check-target-builds ../config//has_is_constant_evaluated : : no ] ] - [ compile standalone_constexpr_test_float128.cpp : + [ compile standalone_constexpr_test_float128.cpp : [ requires cxx14_constexpr cxx17_if_constexpr ] [ check-target-builds ../config//has_float128 : quadmath : no ] ] - + [ run standalone_test_arithmetic_complex128.cpp : : : [ check-target-builds ../config//has_float128 : quadmath ] ] [ run standalone_test_arithmetic_cpp_bin_float.cpp no_eh_support : : : msvc:-bigobj [ check-target-builds ../config//has_float128 : quadmath ] ] [ run standalone_test_arithmetic_cpp_dec_float.cpp no_eh_support : : : msvc:-bigobj [ check-target-builds ../config//has_float128 : quadmath ] ] @@ -1325,7 +1325,7 @@ test-suite standalone : [ check-target-builds ../config//has_mpfr : HAS_MPFR gmp mpfr : ] [ check-target-builds ../config//has_mpfi : HAS_MPFI gmp mpfr mpfi : ] [ check-target-builds ../config//has_tommath : HAS_TOMMATH tommath : ] - [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] + [ check-target-builds ../config//has_float128 : HAS_FLOAT128 quadmath : ] ] ; @@ -1342,8 +1342,8 @@ rule get_specfun_tests_mpfr local result ; for local source in [ glob math/*.cpp ] { - result += [ run $(source) mpfr gmp - /boost/test//boost_unit_test_framework/static + result += [ run $(source) mpfr gmp + /boost/test//boost_unit_test_framework/static math/instances//test_instances_mpfr/static : # command line : # input files @@ -1355,14 +1355,14 @@ rule get_specfun_tests_mpfr BOOST_ALL_NO_LIB BOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE msvc:-bigobj - /boost/math//testing + /boost/math//testing release : $(source:B)_mpfr ] ; } for local digits in $(high_precision_points) { result += [ run math/high_prec/test_gamma.cpp - /boost/test//boost_unit_test_framework/static + /boost/test//boost_unit_test_framework/static : # command line : # input files : # requirements @@ -1372,7 +1372,7 @@ rule get_specfun_tests_mpfr msvc:-bigobj [ check-target-builds ../config//has_mpfr : TEST_MPFR gmp mpfr : no ] [ check-target-builds ../config//has_float128 : quadmath ] - /boost/math//testing + /boost/math//testing release : test_gamma_mpfr_$(digits) ] ; @@ -1385,8 +1385,8 @@ rule get_specfun_tests_gmp local result ; for local source in [ glob math/*.cpp ] { - result += [ run $(source) gmp - /boost/test//boost_unit_test_framework/static + result += [ run $(source) gmp + /boost/test//boost_unit_test_framework/static math/instances//test_instances_mpf/static : # command line : # input files @@ -1397,14 +1397,14 @@ rule get_specfun_tests_gmp TEST_MPF_50 BOOST_ALL_NO_LIB msvc:-bigobj - /boost/math//testing + /boost/math//testing release : $(source:B)_mpf ] ; } for local digits in $(high_precision_points) { result += [ run math/high_prec/test_gamma.cpp - /boost/test//boost_unit_test_framework/static + /boost/test//boost_unit_test_framework/static : # command line : # input files : # requirements @@ -1414,7 +1414,7 @@ rule get_specfun_tests_gmp msvc:-bigobj [ check-target-builds ../config//has_gmp : TEST_MPF gmp : no ] [ check-target-builds ../config//has_float128 : quadmath ] - /boost/math//testing + /boost/math//testing release : test_gamma_gmp_$(digits) ] ; @@ -1427,7 +1427,7 @@ rule get_specfun_tests_cpp_dec_float local result ; for local source in [ glob math/*.cpp ] { - result += [ run $(source) /boost/test//boost_unit_test_framework/static + result += [ run $(source) /boost/test//boost_unit_test_framework/static math/instances//test_instances_cpp_dec_float/static : # command line : # input files @@ -1436,14 +1436,14 @@ rule get_specfun_tests_cpp_dec_float TEST_CPP_DEC_FLOAT BOOST_ALL_NO_LIB msvc:-bigobj - /boost/math//testing + /boost/math//testing release : $(source:B)_cpp_dec_float ] ; } for local digits in $(high_precision_points) { result += [ run math/high_prec/test_gamma.cpp - /boost/test//boost_unit_test_framework/static + /boost/test//boost_unit_test_framework/static : # command line : # input files : # requirements @@ -1452,7 +1452,7 @@ rule get_specfun_tests_cpp_dec_float TEST_PRECISION=$(digits) msvc:-bigobj TEST_CPP_DEC_FLOAT - /boost/math//testing + /boost/math//testing release : test_gamma_cpp_dec_float_$(digits) ] ; } @@ -1464,7 +1464,7 @@ rule get_specfun_tests_cpp_bin_float local result ; for local source in [ glob math/*.cpp ] { - result += [ run $(source) /boost/test//boost_unit_test_framework/static + result += [ run $(source) /boost/test//boost_unit_test_framework/static math/instances//test_instances_cpp_bin_float/static : # command line : # input files @@ -1472,7 +1472,7 @@ rule get_specfun_tests_cpp_bin_float TEST_CPP_BIN_FLOAT BOOST_ALL_NO_LIB msvc:-bigobj - /boost/math//testing + /boost/math//testing release [ check-target-builds ../config//has_float128 : quadmath ] : $(source:B)_cpp_bin_float ] ; @@ -1480,7 +1480,7 @@ rule get_specfun_tests_cpp_bin_float for local digits in $(high_precision_points) { result += [ run math/high_prec/test_gamma.cpp - /boost/test//boost_unit_test_framework/static + /boost/test//boost_unit_test_framework/static : # command line : # input files : # requirements @@ -1490,7 +1490,7 @@ rule get_specfun_tests_cpp_bin_float msvc:-bigobj TEST_CPP_BIN_FLOAT [ check-target-builds ../config//has_float128 : quadmath ] - /boost/math//testing + /boost/math//testing release : test_gamma_cpp_bin_float_$(digits) ] ; @@ -1503,8 +1503,8 @@ rule get_specfun_tests_float128 local result ; for local source in [ glob math/*.cpp ] { - result += [ run $(source) quadmath - /boost/test//boost_unit_test_framework/static + result += [ run $(source) quadmath + /boost/test//boost_unit_test_framework/static math/instances//test_instances_float128/static : # command line : # input files @@ -1515,7 +1515,7 @@ rule get_specfun_tests_float128 BOOST_ALL_NO_LIB BOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE msvc:-bigobj - /boost/math//testing + /boost/math//testing release : $(source:B)_float128 ] ; } @@ -1528,19 +1528,19 @@ rule get_specfun_tests_intel_quad for local source in [ glob math/*.cpp ] { result += [ run $(source) - /boost/test//boost_unit_test_framework/static + /boost/test//boost_unit_test_framework/static math/instances//test_instances_intel_quad/static : # command line : # input files : # requirements - [ check-target-builds ../config//has_intel_quad : -Qoption,cpp,--extended_float_type : no ] + [ check-target-builds ../config//has_intel_quad : -Qoption,cpp,--extended_float_type : no ] [ check-target-builds ../config//has_float128 : quadmath ] speed TEST_FLOAT128 BOOST_ALL_NO_LIB BOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE msvc:-bigobj - /boost/math//testing + /boost/math//testing release : $(source:B)_intel_quad ] ; } From 6ff916d9eec4524a4defd93b3736d9d52be528d7 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 22:52:05 -0500 Subject: [PATCH 07/11] Update copyright dates. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 13b93d8ff..38b7854f8 100644 --- a/build.jam +++ b/build.jam @@ -1,4 +1,4 @@ -# Copyright René Ferdinand Rivera Morell 2023 +# 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) From 882555fad4d3c2ef331e403a4e435882787d3a72 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:23 -0500 Subject: [PATCH 08/11] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/build.jam b/build.jam index 38b7854f8..b5c53a966 100644 --- a/build.jam +++ b/build.jam @@ -5,22 +5,24 @@ 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 - /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 include ; explicit - [ alias boost_multiprecision ] + [ alias boost_multiprecision : : : : $(boost_dependencies) ] [ alias all : boost_multiprecision test ] ; @@ -28,3 +30,4 @@ call-if : boost-library multiprecision ; use-project /boost/multiprecision/config : config ; + From 48e4bc0b7d2014326ef0d52480d803d329ef78e9 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 28 Jul 2024 16:45:30 -0500 Subject: [PATCH 09/11] Adjust doc build to avoid boost-root references. --- doc/Jamfile.v2 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index cad6d1654..b748b1a22 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -17,7 +17,7 @@ boostbook standalone : # Path for links to Boost: boost.root=../../../.. - + # Some general style settings: table.footnote.number.format=1 footnote.number.format=1 @@ -42,8 +42,8 @@ boostbook standalone # extending 'standard' BOOST_ROOT/doc/src/boostbook.css with # @import url('../../../../doc/src/boostbook.css'); # in location multiprecision/doc/html/multiprecision.css - - + + # PDF Options: # TOC Generation: this is needed for FOP-0.9 and later: fop1.extensions=0 @@ -65,7 +65,7 @@ boostbook standalone # default PNG graphics are awful in PDF form, # better use SVGs instead: pdf:admon.graphics.extension=".svg" - pdf:use.role.for.mediaobject=1 + pdf:use.role.for.mediaobject=1 pdf:preferred.mediaobject.role=print pdf:img.src.path=$(images_location)/ pdf:draft.mode="no" @@ -76,19 +76,19 @@ boostbook standalone # .SVG files are roughly twice the .png size and so a bit gross. # This also changes the admonitions icons. # html:admon.graphics.extension=".svg" - html:use.role.for.mediaobject=1 + html:use.role.for.mediaobject=1 html:preferred.mediaobject.role=print # html:img.src.path=$(images_location)/ isn't right for html. html:draft.mode="no" html:boost.url.prefix=http\://www.boost.org/doc/libs/release/libs/multiprecision/doc/html - + # Index generation: on $(here)/index.idx - $(here)/../../.. + $(here)/../include on html:on - enable_index + enable_index pdf:index.on.type=1 ; From 655d4388970962c0b832a7324bfc9d6cde52a3dc Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 4 Aug 2024 11:42:46 -0500 Subject: [PATCH 10/11] Update build deps. --- build.jam | 2 +- example/Jamfile.v2 | 2 ++ performance/Jamfile.v2 | 3 ++- test/Jamfile.v2 | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build.jam b/build.jam index b5c53a966..d0452fbdf 100644 --- a/build.jam +++ b/build.jam @@ -23,7 +23,7 @@ project /boost/multiprecision explicit [ alias boost_multiprecision : : : : $(boost_dependencies) ] - [ alias all : boost_multiprecision test ] + [ alias all : boost_multiprecision test example performance ] ; call-if : boost-library multiprecision diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 30777085b..711279fed 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -22,6 +22,8 @@ local tommath_path = [ modules.peek : TOMMATH_PATH ] ; project : requirements + /boost/multiprecision//boost_multiprecision + $(gmp_path) $(gmp_path)/mpfr $(gmp_path)/gmpfrxx diff --git a/performance/Jamfile.v2 b/performance/Jamfile.v2 index 919e7da81..65c5efe57 100644 --- a/performance/Jamfile.v2 +++ b/performance/Jamfile.v2 @@ -14,6 +14,7 @@ local mpfr_path = [ modules.peek : MPFR_PATH ] ; local tommath_path = [ modules.peek : TOMMATH_PATH ] ; project : requirements + /boost/multiprecision//boost_multiprecision freebsd:"-lrt" linux:"-lrt" pgi:"-lrt" @@ -268,6 +269,6 @@ test-suite performance_install : [ install sf_performance_install : sf_performance : . ] [ 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 : . ] -[ install voronoi_install : voronoi_performance : . ] +# [ install voronoi_install : voronoi_performance : . ] ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 90b95ec0b..3aae8cffd 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -44,6 +44,7 @@ local tommath_path = [ modules.peek : TOMMATH_PATH ] ; path-constant here : . ; project : requirements + /boost/multiprecision//boost_multiprecision . $(gmp_path) $(gmp_path)/mpfr From 4207037d379792964ccb469540967085069dedd2 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 8 Aug 2024 21:45:19 -0500 Subject: [PATCH 11/11] Change Boost Test build refs to work with both old and modular test lib targets. --- example/Jamfile.v2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/Jamfile.v2 b/example/Jamfile.v2 index 711279fed..fe11b3f42 100644 --- a/example/Jamfile.v2 +++ b/example/Jamfile.v2 @@ -96,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 : : no ] ] [ run mixed_integer_arithmetic.cpp no_eh_eg_support ] - [ run numeric_limits_snips.cpp no_eh_eg_support /boost/test//test_exec_monitor : : : [ requires cxx11_numeric_limits ] [ check-target-builds ../config//has_float128 : 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 : quadmath ] ] [ run random_snips.cpp gmp no_eh_eg_support : : : [ requires cxx11_explicit_conversion_operators ] [ check-target-builds ../config//has_gmp : : no ] ] [ run safe_prime.cpp no_eh_eg_support ]