From 9bee2bb633ca8fc2ef0c1d0d21db851d08865714 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 11 Mar 2024 08:38:17 -0500 Subject: [PATCH 01/10] Make the library modular usable. --- build.jam | 37 +++++++++++++++++++++++++++++++++ examples/2d_lattice/Jamfile.v2 | 1 - examples/Jamfile.v2 | 9 ++++---- examples/mpi/Jamfile.v2 | 4 ++-- examples/multiprecision/Jamfile | 1 + examples/nt2/Jamfile.v2 | 2 -- examples/openmp/Jamfile.v2 | 3 +-- examples/quadmath/Jamfile.v2 | 2 +- examples/vexcl/Jamfile.v2 | 6 +----- performance/Jamfile.v2 | 4 ++-- test/Jamfile.v2 | 23 +++++++------------- test/numeric/Jamfile.v2 | 3 --- test/regression/Jamfile.v2 | 8 +++---- test_external/eigen/Jamfile.v2 | 2 -- test_external/gmp/Jamfile.v2 | 1 - test_external/gsl/Jamfile.v2 | 1 - test_external/mkl/Jamfile.v2 | 1 - test_external/mpi/Jamfile.v2 | 4 +--- test_external/mtl4/Jamfile.v2 | 3 --- test_external/nt2/Jamfile.v2 | 4 +--- test_external/vexcl/Jamfile.v2 | 3 +-- 21 files changed, 64 insertions(+), 58 deletions(-) create mode 100644 build.jam diff --git a/build.jam b/build.jam new file mode 100644 index 000000000..414f602c6 --- /dev/null +++ b/build.jam @@ -0,0 +1,37 @@ +# Copyright René Ferdinand Rivera Morell 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) + +import project ; + +project /boost/odeint + : common-requirements + /boost/assert//boost_assert + /boost/compute//boost_compute + /boost/config//boost_config + /boost/core//boost_core + /boost/fusion//boost_fusion + /boost/iterator//boost_iterator + /boost/math//boost_math + /boost/mpi//boost_mpi + /boost/mpl//boost_mpl + /boost/multi_array//boost_multi_array + /boost/ublas//boost_ublas + /boost/preprocessor//boost_preprocessor + /boost/range//boost_range + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + /boost/units//boost_units + /boost/utility//boost_utility + include + ; + +explicit + [ alias boost_odeint ] + [ alias all : boost_odeint examples performance test ] + ; + +call-if : boost-library odeint + ; diff --git a/examples/2d_lattice/Jamfile.v2 b/examples/2d_lattice/Jamfile.v2 index c995ec168..67459744a 100644 --- a/examples/2d_lattice/Jamfile.v2 +++ b/examples/2d_lattice/Jamfile.v2 @@ -6,7 +6,6 @@ project : requirements - ../../../../.. BOOST_ALL_NO_LIB=1 ; diff --git a/examples/Jamfile.v2 b/examples/Jamfile.v2 index 11813c847..dfb43654a 100644 --- a/examples/Jamfile.v2 +++ b/examples/Jamfile.v2 @@ -9,6 +9,7 @@ project : requirements BOOST_ALL_NO_LIB=1 + /python//python : ; @@ -36,12 +37,12 @@ exe stochastic_euler : stochastic_euler.cpp ; exe generation_functions : generation_functions.cpp ; exe heun : heun.cpp ; exe bind_member_functions : bind_member_functions.cpp ; -exe bind_member_functions_cpp11 : bind_member_functions_cpp11.cpp : -std=c++0x ; -exe molecular_dynamics : molecular_dynamics.cpp : -std=c++0x ; -exe molecular_dynamics_cells : molecular_dynamics_cells.cpp : -std=c++0x ; +exe bind_member_functions_cpp11 : bind_member_functions_cpp11.cpp : 14 ; +exe molecular_dynamics : molecular_dynamics.cpp : 14 ; +exe molecular_dynamics_cells : molecular_dynamics_cells.cpp : 14 ; exe abm_precision : abm_precision.cpp ; exe integrate_times : integrate_times.cpp ; -exe find_crossing : find_crossing.cpp : -std=c++0x ; +exe find_crossing : find_crossing.cpp : 14 ; build-project multiprecision ; # build-project mtl ; diff --git a/examples/mpi/Jamfile.v2 b/examples/mpi/Jamfile.v2 index d3f18eb2c..dcecc0177 100644 --- a/examples/mpi/Jamfile.v2 +++ b/examples/mpi/Jamfile.v2 @@ -8,8 +8,8 @@ project : requirements BOOST_ALL_NO_LIB=1 - /boost//mpi - /boost//timer + /boost/mpi//boost_mpi + /boost/timer//boost_timer ; exe phase_chain : phase_chain.cpp ; diff --git a/examples/multiprecision/Jamfile b/examples/multiprecision/Jamfile index 9708d4340..0392ad1ea 100644 --- a/examples/multiprecision/Jamfile +++ b/examples/multiprecision/Jamfile @@ -8,6 +8,7 @@ project : requirements BOOST_ALL_NO_LIB=1 + /boost/multiprecision//boost_multiprecision : ; diff --git a/examples/nt2/Jamfile.v2 b/examples/nt2/Jamfile.v2 index 05847cd17..626a80621 100644 --- a/examples/nt2/Jamfile.v2 +++ b/examples/nt2/Jamfile.v2 @@ -7,8 +7,6 @@ # http://www.boost.org/LICENSE_1_0.txt #============================================================================== -use-project boost : $(BOOST_ROOT) ; - import os ; # This must be built using an NT2 installation. diff --git a/examples/openmp/Jamfile.v2 b/examples/openmp/Jamfile.v2 index cef4f670c..3723896fc 100644 --- a/examples/openmp/Jamfile.v2 +++ b/examples/openmp/Jamfile.v2 @@ -5,14 +5,13 @@ # accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) -use-project /boost : $(BOOST_ROOT) ; import openmp : * ; project : requirements .. BOOST_ALL_NO_LIB=1 - /boost//timer + /boost/timer//boost_timer [ openmp ] ; diff --git a/examples/quadmath/Jamfile.v2 b/examples/quadmath/Jamfile.v2 index 88a046325..7fd1d4d81 100644 --- a/examples/quadmath/Jamfile.v2 +++ b/examples/quadmath/Jamfile.v2 @@ -13,4 +13,4 @@ project lib quadmath : : quadmath shared ; -exe black_hole : black_hole.cpp quadmath : -std=c++0x ; \ No newline at end of file +exe black_hole : black_hole.cpp quadmath : 14 ; \ No newline at end of file diff --git a/examples/vexcl/Jamfile.v2 b/examples/vexcl/Jamfile.v2 index 73dc8dae0..5749fd5ae 100644 --- a/examples/vexcl/Jamfile.v2 +++ b/examples/vexcl/Jamfile.v2 @@ -9,9 +9,6 @@ import boost ; import os ; -boost.use-project ; - - # change these lines to fit you configuration local HOME = [ os.environ HOME ] ; local VEXCL_INCLUDE = [ os.environ VEXCL_ROOT ] ; @@ -22,11 +19,10 @@ OPENCL_INCLUDE = /usr/local/cuda/include ; lib opencl : : OpenCL ; project : requirements - /boost//headers $(VEXCL_INCLUDE) $(OPENCL_INCLUDE) gcc:-std=c++0x - /boost//system/ + /boost/system//boost_system ; exe lorenz_ensemble : lorenz_ensemble.cpp opencl ; \ No newline at end of file diff --git a/performance/Jamfile.v2 b/performance/Jamfile.v2 index e60e4ea12..aa2361c01 100644 --- a/performance/Jamfile.v2 +++ b/performance/Jamfile.v2 @@ -10,8 +10,7 @@ import path ; project : requirements BOOST_ALL_NO_LIB=1 - ../../../.. - -std=c++11 + 11 gcc:-ffast-math intel:"-fast -inline-forceinline" : default-build release @@ -29,4 +28,5 @@ lib libpthread : : pthread ; exe odeint_rk4_array : odeint_rk4_array.cpp + /boost/timer//boost_timer ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 9a6df98da..cd107689d 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -7,23 +7,16 @@ # bring in rules for testing +require-b2 5.0.1 ; +import-search /boost/config/checks ; import testing ; -import ../../config/checks/config : requires ; - -# make sure you are using a new version of boost.build, otherwise the local -# odeint will not be included properly -# you can fix older boost.build versions by applying the patch provided in -# odeint's root, e.g.: -# cd ~/odeint-v2 -# sudo patch /usr/share/boost-build/build/toolset.jam toolset.jam.patch - -use-project boost : $(BOOST_ROOT) ; +import config : requires ; project : requirements BOOST_ALL_NO_LIB=1 # use test library - /boost//unit_test_framework + /boost/test//boost_unit_test_framework static clang:-Wno-unused-variable # -D_SCL_SECURE_NO_WARNINGS @@ -33,9 +26,9 @@ test-suite "odeint" : [ run euler_stepper.cpp ] # The following 3 tests use Boost.Multiprecision which requires C++14 - [ run runge_kutta_concepts.cpp : : : gcc-mingw:-Wa,-mbig-obj off msvc:/bigobj [ requires cxx14_decltype_auto cxx14_generic_lambdas cxx14_return_type_deduction cxx14_variable_templates cxx14_constexpr ] ] - [ run runge_kutta_error_concepts.cpp : : : gcc-mingw:-Wa,-mbig-obj off msvc:/bigobj [ requires cxx14_decltype_auto cxx14_generic_lambdas cxx14_return_type_deduction cxx14_variable_templates cxx14_constexpr ] ] - [ run runge_kutta_controlled_concepts.cpp : : : gcc-mingw:-Wa,-mbig-obj off msvc:/bigobj [ requires cxx14_decltype_auto cxx14_generic_lambdas cxx14_return_type_deduction cxx14_variable_templates cxx14_constexpr ] ] + [ run runge_kutta_concepts.cpp /boost/multiprecision//boost_multiprecision : : : gcc-mingw:-Wa,-mbig-obj off msvc:/bigobj [ requires cxx14_decltype_auto cxx14_generic_lambdas cxx14_return_type_deduction cxx14_variable_templates cxx14_constexpr ] ] + [ run runge_kutta_error_concepts.cpp /boost/multiprecision//boost_multiprecision : : : gcc-mingw:-Wa,-mbig-obj off msvc:/bigobj [ requires cxx14_decltype_auto cxx14_generic_lambdas cxx14_return_type_deduction cxx14_variable_templates cxx14_constexpr ] ] + [ run runge_kutta_controlled_concepts.cpp /boost/multiprecision//boost_multiprecision : : : gcc-mingw:-Wa,-mbig-obj off msvc:/bigobj [ requires cxx14_decltype_auto cxx14_generic_lambdas cxx14_return_type_deduction cxx14_variable_templates cxx14_constexpr ] ] [ run resizing.cpp ] [ run default_operations.cpp ] [ run range_algebra.cpp ] @@ -46,7 +39,7 @@ test-suite "odeint" [ run stepper_copying.cpp ] [ run stepper_with_ranges.cpp ] [ run rosenbrock4.cpp ] - [ run rosenbrock4_mp.cpp ] + [ run rosenbrock4_mp.cpp /boost/multiprecision//boost_multiprecision ] [ run is_pair.cpp ] [ run adams_bashforth.cpp ] [ run adams_moulton.cpp ] diff --git a/test/numeric/Jamfile.v2 b/test/numeric/Jamfile.v2 index a4643f6a5..b6ee4319d 100644 --- a/test/numeric/Jamfile.v2 +++ b/test/numeric/Jamfile.v2 @@ -8,13 +8,10 @@ import testing ; -use-project boost : $(BOOST_ROOT) ; - project : requirements /boost/test//boost_unit_test_framework BOOST_ALL_NO_LIB=1 - ../../include static clang:-Wno-unused-variable diff --git a/test/regression/Jamfile.v2 b/test/regression/Jamfile.v2 index c476822f3..f37418747 100644 --- a/test/regression/Jamfile.v2 +++ b/test/regression/Jamfile.v2 @@ -5,17 +5,15 @@ # bring in rules for testing - +require-b2 5.0.1 ; +import-search /boost/config/checks ; import testing ; -import ../../config/checks/config : requires ; - -use-project boost : $(BOOST_ROOT) ; +import config : requires ; project : requirements /boost/test//boost_unit_test_framework BOOST_ALL_NO_LIB=1 - ../../include static clang:-Wno-unused-variable diff --git a/test_external/eigen/Jamfile.v2 b/test_external/eigen/Jamfile.v2 index ad0cc2d2c..7074f8df9 100644 --- a/test_external/eigen/Jamfile.v2 +++ b/test_external/eigen/Jamfile.v2 @@ -9,8 +9,6 @@ import testing ; import os ; -use-project boost : $(BOOST_ROOT) ; - local EIGEN_ROOT = [ os.environ EIGEN_ROOT ] ; project diff --git a/test_external/gmp/Jamfile.v2 b/test_external/gmp/Jamfile.v2 index f0e6af02c..ee25ee909 100644 --- a/test_external/gmp/Jamfile.v2 +++ b/test_external/gmp/Jamfile.v2 @@ -6,7 +6,6 @@ # bring in rules for testing import testing ; -use-project boost : $(BOOST_ROOT) ; project gmp : requirements diff --git a/test_external/gsl/Jamfile.v2 b/test_external/gsl/Jamfile.v2 index 086edf6ea..7c0f18dd8 100644 --- a/test_external/gsl/Jamfile.v2 +++ b/test_external/gsl/Jamfile.v2 @@ -6,7 +6,6 @@ # bring in rules for testing import testing ; -use-project boost : $(BOOST_ROOT) ; project : requirements diff --git a/test_external/mkl/Jamfile.v2 b/test_external/mkl/Jamfile.v2 index f585fa83d..a6243c0b9 100644 --- a/test_external/mkl/Jamfile.v2 +++ b/test_external/mkl/Jamfile.v2 @@ -6,7 +6,6 @@ # bring in rules for testing import testing ; -use-project boost : $(BOOST_ROOT) ; project : requirements diff --git a/test_external/mpi/Jamfile.v2 b/test_external/mpi/Jamfile.v2 index 0a02bccff..b83980e96 100644 --- a/test_external/mpi/Jamfile.v2 +++ b/test_external/mpi/Jamfile.v2 @@ -7,12 +7,10 @@ import testing ; import mpi : mpi-test ; -use-project boost : $(BOOST_ROOT) ; - project : requirements /boost/test//boost_unit_test_framework - /boost//mpi + /boost/mpi//boost_mpi static BOOST_ALL_NO_LIB=1 ; diff --git a/test_external/mtl4/Jamfile.v2 b/test_external/mtl4/Jamfile.v2 index de9d87f2c..e1819383f 100644 --- a/test_external/mtl4/Jamfile.v2 +++ b/test_external/mtl4/Jamfile.v2 @@ -7,9 +7,6 @@ import testing ; import boost ; -# boost.use-project ; -use-project boost : $(BOOST_ROOT) ; - # set your MTL4 directory here MTL4_INCLUDE = /home/mario/MTL4/usr/include ; diff --git a/test_external/nt2/Jamfile.v2 b/test_external/nt2/Jamfile.v2 index 26763da6e..1ab203782 100644 --- a/test_external/nt2/Jamfile.v2 +++ b/test_external/nt2/Jamfile.v2 @@ -20,11 +20,9 @@ import os ; local NT2_ROOT_PATH = [ os.environ NT2_ROOT_PATH ] ; local NT2_SIMD_FLAGS = [ os.environ NT2_SIMD_FLAGS ] ; -use-project boost : $(BOOST_ROOT) ; - project : requirements - $(BOOST_ROOT)/boost/test/included/unit_test_framework.hpp + /boost/test//boost_test BOOST_ALL_NO_LIB=1 $(NT2_ROOT_PATH)/include/ static diff --git a/test_external/vexcl/Jamfile.v2 b/test_external/vexcl/Jamfile.v2 index 9b76b4305..f427dcb2d 100644 --- a/test_external/vexcl/Jamfile.v2 +++ b/test_external/vexcl/Jamfile.v2 @@ -8,7 +8,6 @@ import testing ; -use-project boost : $(BOOST_ROOT) ; VEXCL_INCLUDE = /home/karsten/boost/testing/vexcl ; OPENCL_INCLUDE = /usr/local/cuda/include ; #OPENCL_INCLUDE = /usr/include ; @@ -20,7 +19,7 @@ project $(VEXCL_INCLUDE) $(OPENCL_INCLUDE) -std=c++0x - /boost//system/ + /boost/system//boost_system ; lib OpenCL : : OpenCL shared ; From 98de459e08b824c2088e149ef67c8d5ad88bd6e2 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 29 Mar 2024 21:15:59 -0500 Subject: [PATCH 02/10] Switch to library requirements instead of source. As source puts extra source in install targets. --- build.jam | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/build.jam b/build.jam index 414f602c6..d0dd98226 100644 --- a/build.jam +++ b/build.jam @@ -7,24 +7,24 @@ import project ; project /boost/odeint : common-requirements - /boost/assert//boost_assert - /boost/compute//boost_compute - /boost/config//boost_config - /boost/core//boost_core - /boost/fusion//boost_fusion - /boost/iterator//boost_iterator - /boost/math//boost_math - /boost/mpi//boost_mpi - /boost/mpl//boost_mpl - /boost/multi_array//boost_multi_array - /boost/ublas//boost_ublas - /boost/preprocessor//boost_preprocessor - /boost/range//boost_range - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits - /boost/units//boost_units - /boost/utility//boost_utility + /boost/assert//boost_assert + /boost/compute//boost_compute + /boost/config//boost_config + /boost/core//boost_core + /boost/fusion//boost_fusion + /boost/iterator//boost_iterator + /boost/math//boost_math + /boost/mpi//boost_mpi + /boost/mpl//boost_mpl + /boost/multi_array//boost_multi_array + /boost/ublas//boost_ublas + /boost/preprocessor//boost_preprocessor + /boost/range//boost_range + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + /boost/units//boost_units + /boost/utility//boost_utility include ; From 080a7e0ebe66a2fc3edff96de651bf0d9df3a02f Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 29 Apr 2024 20:15:48 -0500 Subject: [PATCH 03/10] Update library dependencies. --- test/numeric/Jamfile.v2 | 1 + 1 file changed, 1 insertion(+) diff --git a/test/numeric/Jamfile.v2 b/test/numeric/Jamfile.v2 index b6ee4319d..2df2ffd24 100644 --- a/test/numeric/Jamfile.v2 +++ b/test/numeric/Jamfile.v2 @@ -11,6 +11,7 @@ import testing ; project : requirements /boost/test//boost_unit_test_framework + /boost/format//boost_format BOOST_ALL_NO_LIB=1 static clang:-Wno-unused-variable From 352ebacd060febc38402ba0f023354ba67bfc27a Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 5 May 2024 09:00:01 -0500 Subject: [PATCH 04/10] 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 d0dd98226..1e28c9fac 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/odeint From a385733ec4e57c7bdef47fc2e590660d9d4178c6 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 14 Jun 2024 11:33:56 -0500 Subject: [PATCH 05/10] 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 1e28c9fac..999cb2852 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/odeint : common-requirements From 3043628a20610819344ae59a71b5362964d8c472 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 20 Jul 2024 21:30:37 -0500 Subject: [PATCH 06/10] Change all references to . --- examples/multiprecision/Jamfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/multiprecision/Jamfile b/examples/multiprecision/Jamfile index 0392ad1ea..4fee20a2f 100644 --- a/examples/multiprecision/Jamfile +++ b/examples/multiprecision/Jamfile @@ -6,12 +6,12 @@ project - : requirements + : requirements BOOST_ALL_NO_LIB=1 - /boost/multiprecision//boost_multiprecision - : + /boost/multiprecision//boost_multiprecision + : ; - + exe lorenz_mp : lorenz_mp.cpp ; exe cmp_precision : cmp_precision.cpp ; From 18ca929b1b755d1cfa1287432ce563a23f5c5820 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 23 Jul 2024 22:34:23 -0500 Subject: [PATCH 07/10] Move inter-lib dependencies to a project variable and into the build targets. --- build.jam | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/build.jam b/build.jam index 999cb2852..5ce0e2be8 100644 --- a/build.jam +++ b/build.jam @@ -5,33 +5,36 @@ require-b2 5.2 ; +constant boost_dependencies : + /boost/assert//boost_assert + /boost/compute//boost_compute + /boost/config//boost_config + /boost/core//boost_core + /boost/fusion//boost_fusion + /boost/iterator//boost_iterator + /boost/math//boost_math + /boost/mpi//boost_mpi + /boost/mpl//boost_mpl + /boost/multi_array//boost_multi_array + /boost/ublas//boost_ublas + /boost/preprocessor//boost_preprocessor + /boost/range//boost_range + /boost/static_assert//boost_static_assert + /boost/throw_exception//boost_throw_exception + /boost/type_traits//boost_type_traits + /boost/units//boost_units + /boost/utility//boost_utility ; + project /boost/odeint : common-requirements - /boost/assert//boost_assert - /boost/compute//boost_compute - /boost/config//boost_config - /boost/core//boost_core - /boost/fusion//boost_fusion - /boost/iterator//boost_iterator - /boost/math//boost_math - /boost/mpi//boost_mpi - /boost/mpl//boost_mpl - /boost/multi_array//boost_multi_array - /boost/ublas//boost_ublas - /boost/preprocessor//boost_preprocessor - /boost/range//boost_range - /boost/static_assert//boost_static_assert - /boost/throw_exception//boost_throw_exception - /boost/type_traits//boost_type_traits - /boost/units//boost_units - /boost/utility//boost_utility include ; explicit - [ alias boost_odeint ] + [ alias boost_odeint : : : : $(boost_dependencies) ] [ alias all : boost_odeint examples performance test ] ; call-if : boost-library odeint ; + From 969321958e765e6840c0df0854f85ad8d7df379f Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 25 Jul 2024 23:30:00 -0500 Subject: [PATCH 08/10] Switch to /boost/test//included target for header only mode of Boost.Test. --- test_external/nt2/Jamfile.v2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_external/nt2/Jamfile.v2 b/test_external/nt2/Jamfile.v2 index 1ab203782..2520bed28 100644 --- a/test_external/nt2/Jamfile.v2 +++ b/test_external/nt2/Jamfile.v2 @@ -22,7 +22,7 @@ local NT2_SIMD_FLAGS = [ os.environ NT2_SIMD_FLAGS ] ; project : requirements - /boost/test//boost_test + /boost/test//included BOOST_ALL_NO_LIB=1 $(NT2_ROOT_PATH)/include/ static From 987b32f2403c8afcfe9e7b1cd56b245c7927b4d6 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 4 Aug 2024 11:56:13 -0500 Subject: [PATCH 09/10] Update build deps. --- examples/Jamfile.v2 | 8 +++++--- performance/Jamfile.v2 | 7 ++++--- test/Jamfile.v2 | 8 ++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/examples/Jamfile.v2 b/examples/Jamfile.v2 index dfb43654a..8c5785f19 100644 --- a/examples/Jamfile.v2 +++ b/examples/Jamfile.v2 @@ -5,14 +5,16 @@ # accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) +using python ; project - : requirements + : requirements + /boost/odeint//boost_odeint BOOST_ALL_NO_LIB=1 /python//python - : + : ; - + exe harmonic_oscillator : harmonic_oscillator.cpp ; exe solar_system : solar_system.cpp ; diff --git a/performance/Jamfile.v2 b/performance/Jamfile.v2 index aa2361c01..0e22a4e08 100644 --- a/performance/Jamfile.v2 +++ b/performance/Jamfile.v2 @@ -5,18 +5,19 @@ import os ; import modules ; -import path ; +import path ; project : requirements + /boost/odeint//boost_odeint BOOST_ALL_NO_LIB=1 11 gcc:-ffast-math intel:"-fast -inline-forceinline" : default-build release ; - - + + lib libgsl : : gsl ; lib libgslcblas : : gslcblas ; diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index cd107689d..905f5dd9e 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -7,13 +7,13 @@ # bring in rules for testing -require-b2 5.0.1 ; -import-search /boost/config/checks ; import testing ; +import-search /boost/config/checks ; import config : requires ; project : requirements + /boost/odeint//boost_odeint BOOST_ALL_NO_LIB=1 # use test library /boost/test//boost_unit_test_framework @@ -81,10 +81,10 @@ test-suite "odeint" [ compile unwrap_boost_reference.cpp ] [ compile unwrap_reference.cpp ] [ compile std_array.cpp ] - : + : valgrind ; - + # also run numeric tests build-project numeric ; From 44589d825ad9a5dc41246bd8ea588234c4367ef7 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 11 Aug 2024 09:23:25 -0500 Subject: [PATCH 10/10] Change math dep real target math/tr1. --- build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.jam b/build.jam index 5ce0e2be8..b43f430bb 100644 --- a/build.jam +++ b/build.jam @@ -12,7 +12,7 @@ constant boost_dependencies : /boost/core//boost_core /boost/fusion//boost_fusion /boost/iterator//boost_iterator - /boost/math//boost_math + /boost/math//boost_math_tr1 /boost/mpi//boost_mpi /boost/mpl//boost_mpl /boost/multi_array//boost_multi_array