From 52c85a963e63466c7b2a52188c5b5a4a1152f54c Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Mon, 11 Mar 2024 08:38:17 -0500
Subject: [PATCH 01/11] Make the library modular usable.

---
 benchmarks/Jamfile        |  2 +-
 benchmarks/opencl/Jamfile |  2 +-
 build.jam                 | 32 ++++++++++++++++++++++++++++
 examples/tensor/Jamfile   |  7 ++++---
 test/Jamfile              | 44 ++++++++++++++++++++-------------------
 test/opencl/Jamfile       |  2 +-
 test/tensor/Jamfile       |  4 ++--
 7 files changed, 64 insertions(+), 29 deletions(-)
 create mode 100644 build.jam

diff --git a/benchmarks/Jamfile b/benchmarks/Jamfile
index ab2f77e82..4aa8ce8bb 100644
--- a/benchmarks/Jamfile
+++ b/benchmarks/Jamfile
@@ -4,7 +4,7 @@
 # Boost Software License, Version 1.0. (See accompanying file
 # LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-project boost/ublas/benchmarks
+project
     : requirements <library>/boost/program_options//boost_program_options
     ;
 
diff --git a/benchmarks/opencl/Jamfile b/benchmarks/opencl/Jamfile
index 282d00711..045c9cefb 100644
--- a/benchmarks/opencl/Jamfile
+++ b/benchmarks/opencl/Jamfile
@@ -13,7 +13,7 @@ import ../../clblas ;
 using opencl ;
 using clblas ;
 
-project boost/ublas/benchmarks/opencl
+project
     : requirements
       <library>/boost/program_options//boost_program_options
       <toolset>gcc:<cxxflags>-Wno-ignored-attributes
diff --git a/build.jam b/build.jam
new file mode 100644
index 000000000..0d7244edd
--- /dev/null
+++ b/build.jam
@@ -0,0 +1,32 @@
+# 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/ublas
+    : common-requirements
+        <source>/boost/compute//boost_compute
+        <source>/boost/concept_check//boost_concept_check
+        <source>/boost/config//boost_config
+        <source>/boost/core//boost_core
+        <source>/boost/interval//boost_interval
+        <source>/boost/iterator//boost_iterator
+        <source>/boost/mpl//boost_mpl
+        <source>/boost/range//boost_range
+        <source>/boost/serialization//boost_serialization
+        <source>/boost/smart_ptr//boost_smart_ptr
+        <source>/boost/static_assert//boost_static_assert
+        <source>/boost/type_traits//boost_type_traits
+        <source>/boost/typeof//boost_typeof
+        <include>include
+    ;
+
+explicit
+    [ alias boost_ublas ]
+    [ alias all : boost_ublas benchmarks examples/tensor test ]
+    ;
+
+call-if : boost-library ublas
+    ;
diff --git a/examples/tensor/Jamfile b/examples/tensor/Jamfile
index 101a8a4c9..6781de22c 100644
--- a/examples/tensor/Jamfile
+++ b/examples/tensor/Jamfile
@@ -6,10 +6,10 @@
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
-import ../../../../config/checks/config : requires ;
+import config : requires ;
  
 # Project settings
-project boost-ublas-tensor-example
+project
     : requirements
        <define>BOOST_UBLAS_NO_EXCEPTIONS
        <toolset>vacpp:<define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
@@ -17,9 +17,10 @@ project boost-ublas-tensor-example
        <toolset>clang:<cxxflags>"-Wall -pedantic -Wextra -Wno-unknown-pragmas"
        <toolset>msvc:<cxxflags>"/W4" # == all
        [ requires cxx17_if_constexpr ]
+       <cxxstd>20
     ;
 
-exe access_tensor                      : access_tensor.cpp ;
+exe access_tensor                      : access_tensor.cpp /boost/multiprecision//boost_multiprecision ;
 exe simple_expressions                 : simple_expressions.cpp ;
 exe multiply_tensors_product_function  : multiply_tensors_product_function.cpp ;
 exe multiply_tensors_einstein_notation : multiply_tensors_einstein_notation.cpp ;
diff --git a/test/Jamfile b/test/Jamfile
index f6716e2c6..3a560bc45 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -47,7 +47,7 @@ UBLAS_TESTSET_SPARSE_COO ?=
 
 
 # Project settings
-project boost-ublas-test
+project
     : requirements
        <define>BOOST_UBLAS_NO_EXCEPTIONS
        <toolset>vacpp:<define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
@@ -121,6 +121,7 @@ test-suite numeric/uBLAS
       [ run test4.cpp
             test42.cpp
             test43.cpp
+            /boost/math//boost_math
         : : :
             <define>$(UBLAS_TESTSET)
       ]
@@ -165,61 +166,62 @@ test-suite numeric/uBLAS
       ]
       [ run triangular_layout.cpp
       ]
-      [ run comp_mat_erase.cpp
+      [ run comp_mat_erase.cpp /boost/test//boost_test
         : : :
             <toolset>msvc:<asynch-exceptions>on
       ]
-      [ run sparse_view_test.cpp
+      [ run sparse_view_test.cpp /boost/test//boost_test
         : : :
             <toolset>msvc:<asynch-exceptions>on
       ]
-      [ run begin_end.cpp
+      [ run begin_end.cpp /boost/math//boost_math
       ]
-      [ run num_columns.cpp
+      [ run num_columns.cpp /boost/math//boost_math
       ]
-      [ run num_rows.cpp
+      [ run num_rows.cpp /boost/math//boost_math
       ]
-      [ run size.cpp
+      [ run size.cpp /boost/math//boost_math
       ]
-      [ run test_coordinate_matrix_sort.cpp
+      [ run test_coordinate_matrix_sort.cpp /boost/math//boost_math
       ]
-      [ run test_coordinate_matrix_sort.cpp
+      [ run test_coordinate_matrix_sort.cpp /boost/math//boost_math
        :
        :
        : <define>BOOST_UBLAS_COO_ALWAYS_DO_FULL_SORT
        : test_coordinate_matrix_always_do_full_sort
        :
       ]
-      [ run test_complex_norms.cpp
+      [ run test_complex_norms.cpp /boost/math//boost_math
       ]
-      [ run test_scaled_norm.cpp
+      [ run test_scaled_norm.cpp /boost/math//boost_math
        : : :
            <define>BOOST_UBLAS_SCALED_NORM
       ]
-      [ run test_assignment.cpp
+      [ run test_assignment.cpp /boost/timer//boost_timer /boost/math//boost_math
        : : :
            <define>BOOST_UBLAS_COO_ALWAYS_DO_FULL_SORT
+           <define>BOOST_TIMER_ENABLE_DEPRECATED
       ]
       [ run test_triangular.cpp
        :
        :
        : <library>/boost/timer//boost_timer
       ]
-      [ run test_ticket7296.cpp
+      [ run test_ticket7296.cpp /boost/math//boost_math
         :
         :
         : <toolset>msvc:<cxxflags>/wd4127 # The program checks that test facilities work fine. The warning appears many times.
         :
         :
       ]
-      [ run test_inplace_solve.cpp
+      [ run test_inplace_solve.cpp /boost/math//boost_math
         : 
         : 
         : <define>$(UBLAS_TESTSET)
         : test_inplace_solve_basic
         :
       ]
-      [ run test_inplace_solve.cpp
+      [ run test_inplace_solve.cpp /boost/math//boost_math
         : 
         : 
         : <define>$(UBLAS_TESTSET_SPARSE)
@@ -227,30 +229,30 @@ test-suite numeric/uBLAS
         : test_inplace_solve_sparse
         :
       ]
-      [ run test_inplace_solve.cpp
+      [ run test_inplace_solve.cpp /boost/math//boost_math
         : 
         : 
         : <define>USE_MAPPED_VECTOR_OF_MAPPED_VECTOR
         : test_inplace_solve_mvov
         :
       ]
-      [ run test_coordinate_vector_inplace_merge.cpp
+      [ run test_coordinate_vector_inplace_merge.cpp /boost/math//boost_math
       ]
-      [ run test_coordinate_matrix_inplace_merge.cpp
+      [ run test_coordinate_matrix_inplace_merge.cpp /boost/math//boost_math
       ]
-      [ run test_banded_storage_layout.cpp
+      [ run test_banded_storage_layout.cpp /boost/math//boost_math
         :
         :
         :
         :
         :
       ]
-      [ run test_fixed_containers.cpp
+      [ run test_fixed_containers.cpp /boost/math//boost_math
         :
         :
         :
       ]
-      [ run test_matrix_vector.cpp
+      [ run test_matrix_vector.cpp /boost/math//boost_math
       ]
       [ compile minimal_allocator_test.cpp ]
     ;
diff --git a/test/opencl/Jamfile b/test/opencl/Jamfile
index cc8679223..9da1870ed 100644
--- a/test/opencl/Jamfile
+++ b/test/opencl/Jamfile
@@ -13,7 +13,7 @@ import ../../clblas ;
 using opencl ;
 using clblas ;
 
-project boost/ublas/test/opencl
+project
     : requirements
       <toolset>gcc:<cxxflags>-Wno-ignored-attributes
       <toolset>clang:<cxxflags>-Wno-ignored-attributes
diff --git a/test/tensor/Jamfile b/test/tensor/Jamfile
index 908e359ea..bcfad63fc 100644
--- a/test/tensor/Jamfile
+++ b/test/tensor/Jamfile
@@ -11,7 +11,7 @@
 #  Google and Fraunhofer IOSB, Ettlingen, Germany
 #
 
-import ../../../../config/checks/config : requires ;
+import config : requires ;
 
 project boost/ublas/test/tensor
     : requirements
@@ -22,7 +22,7 @@ project boost/ublas/test/tensor
 
 alias unit_test_framework
     : # sources
-        /boost//unit_test_framework
+        /boost/test//unit_test_framework
     ;
 
 # make aliases explicit so the libraries will only be built when requested

From 8ead8bf2d1e6107de8b7e8d420d6b8e053f54c2b Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
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 | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/build.jam b/build.jam
index 0d7244edd..0cf6dc092 100644
--- a/build.jam
+++ b/build.jam
@@ -7,19 +7,19 @@ import project ;
 
 project /boost/ublas
     : common-requirements
-        <source>/boost/compute//boost_compute
-        <source>/boost/concept_check//boost_concept_check
-        <source>/boost/config//boost_config
-        <source>/boost/core//boost_core
-        <source>/boost/interval//boost_interval
-        <source>/boost/iterator//boost_iterator
-        <source>/boost/mpl//boost_mpl
-        <source>/boost/range//boost_range
-        <source>/boost/serialization//boost_serialization
-        <source>/boost/smart_ptr//boost_smart_ptr
-        <source>/boost/static_assert//boost_static_assert
-        <source>/boost/type_traits//boost_type_traits
-        <source>/boost/typeof//boost_typeof
+        <library>/boost/compute//boost_compute
+        <library>/boost/concept_check//boost_concept_check
+        <library>/boost/config//boost_config
+        <library>/boost/core//boost_core
+        <library>/boost/interval//boost_interval
+        <library>/boost/iterator//boost_iterator
+        <library>/boost/mpl//boost_mpl
+        <library>/boost/range//boost_range
+        <library>/boost/serialization//boost_serialization
+        <library>/boost/smart_ptr//boost_smart_ptr
+        <library>/boost/static_assert//boost_static_assert
+        <library>/boost/type_traits//boost_type_traits
+        <library>/boost/typeof//boost_typeof
         <include>include
     ;
 

From 0ab4c3329d5f6a06ba8fea15feca84f7add9c079 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Sat, 4 May 2024 23:38:11 -0500
Subject: [PATCH 03/11] Add missing import-search for cconfig/predef checks.

---
 examples/tensor/Jamfile | 3 ++-
 test/tensor/Jamfile     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/examples/tensor/Jamfile b/examples/tensor/Jamfile
index 6781de22c..6755207db 100644
--- a/examples/tensor/Jamfile
+++ b/examples/tensor/Jamfile
@@ -6,8 +6,9 @@
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
+import-search /boost/config/checks ;
 import config : requires ;
- 
+
 # Project settings
 project
     : requirements
diff --git a/test/tensor/Jamfile b/test/tensor/Jamfile
index bcfad63fc..e2a4e07db 100644
--- a/test/tensor/Jamfile
+++ b/test/tensor/Jamfile
@@ -11,6 +11,7 @@
 #  Google and Fraunhofer IOSB, Ettlingen, Germany
 #
 
+import-search /boost/config/checks ;
 import config : requires ;
 
 project boost/ublas/test/tensor
@@ -93,6 +94,6 @@ test-suite boost-ublas-tensor-test
           :
           : test_tensor
           :
-          # 
+          #
     ]
     ;

From 7f026e124c0fa60a345ae2d073672a22ce3710b0 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
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 0cf6dc092..bdb213571 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/ublas

From 108cdb1c8cc9f987397d89fb86f4b3ea8bf4ff17 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
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 bdb213571..22660f7c7 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/ublas
     : common-requirements

From 21f5fae7d8f841880fd334ad53ae3d136d9b6138 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Sat, 20 Jul 2024 22:52:04 -0500
Subject: [PATCH 06/11] Update copyright dates.

---
 build.jam | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.jam b/build.jam
index 22660f7c7..060c248ad 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 9f1ec2ae0ac25e6f508cbaadafa4f8e671f62b95 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Tue, 23 Jul 2024 22:34:23 -0500
Subject: [PATCH 07/11] Move inter-lib dependencies to a project variable and
 into the build targets.

---
 build.jam | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/build.jam b/build.jam
index 060c248ad..b95e3905f 100644
--- a/build.jam
+++ b/build.jam
@@ -5,28 +5,31 @@
 
 require-b2 5.2 ;
 
+constant boost_dependencies :
+    /boost/compute//boost_compute
+    /boost/concept_check//boost_concept_check
+    /boost/config//boost_config
+    /boost/core//boost_core
+    /boost/interval//boost_interval
+    /boost/iterator//boost_iterator
+    /boost/mpl//boost_mpl
+    /boost/range//boost_range
+    /boost/serialization//boost_serialization
+    /boost/smart_ptr//boost_smart_ptr
+    /boost/static_assert//boost_static_assert
+    /boost/type_traits//boost_type_traits
+    /boost/typeof//boost_typeof ;
+
 project /boost/ublas
     : common-requirements
-        <library>/boost/compute//boost_compute
-        <library>/boost/concept_check//boost_concept_check
-        <library>/boost/config//boost_config
-        <library>/boost/core//boost_core
-        <library>/boost/interval//boost_interval
-        <library>/boost/iterator//boost_iterator
-        <library>/boost/mpl//boost_mpl
-        <library>/boost/range//boost_range
-        <library>/boost/serialization//boost_serialization
-        <library>/boost/smart_ptr//boost_smart_ptr
-        <library>/boost/static_assert//boost_static_assert
-        <library>/boost/type_traits//boost_type_traits
-        <library>/boost/typeof//boost_typeof
         <include>include
     ;
 
 explicit
-    [ alias boost_ublas ]
+    [ alias boost_ublas : : : : <library>$(boost_dependencies) ]
     [ alias all : boost_ublas benchmarks examples/tensor test ]
     ;
 
 call-if : boost-library ublas
     ;
+

From 18a0b6029575f61bfcfdc4b80adcdf6ff10256d0 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Thu, 25 Jul 2024 23:29:59 -0500
Subject: [PATCH 08/11] Switch to /boost/test//included target for header only
 mode of Boost.Test.

---
 test/Jamfile | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/test/Jamfile b/test/Jamfile
index 3a560bc45..295af4f77 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -26,23 +26,23 @@ UBLAS_TESTSET ?=
 #  Sparse matrices: USE_MAPPED_MATRIX USE_COMPRESSED_MATRIX USE_COORDINATE_MATRIX USE_MAPPED_VECTOR_OF_MAPPED_VECTOR USE_GENERALIZED_VECTOR_OF_VECTOR
 
 UBLAS_TESTSET_SPARSE = [ modules.peek : UBLAS_TESTSET_SPARSE ] ;
-UBLAS_TESTSET_SPARSE ?= 
+UBLAS_TESTSET_SPARSE ?=
             USE_DOUBLE USE_STD_COMPLEX
             # USE_RANGE USE_SLICE	 # Too complex for regression testing
             USE_UNBOUNDED_ARRAY
 			USE_MAP_ARRAY USE_STD_MAP
-            USE_MAPPED_VECTOR USE_COMPRESSED_VECTOR 
-            USE_MAPPED_MATRIX USE_COMPRESSED_MATRIX 
+            USE_MAPPED_VECTOR USE_COMPRESSED_VECTOR
+            USE_MAPPED_MATRIX USE_COMPRESSED_MATRIX
 			;
 # Generalize VofV still failing
 #            USE_GENERALIZED_VECTOR_OF_VECTOR
 
 UBLAS_TESTSET_SPARSE_COO = [ modules.peek : UBLAS_TESTSET_SPARSE_COO ] ;
-UBLAS_TESTSET_SPARSE_COO ?= 
+UBLAS_TESTSET_SPARSE_COO ?=
             USE_DOUBLE USE_STD_COMPLEX
             USE_UNBOUNDED_ARRAY
             USE_COORDINATE_VECTOR
-            USE_COORDINATE_MATRIX 
+            USE_COORDINATE_MATRIX
 			;
 
 
@@ -111,11 +111,11 @@ test-suite numeric/uBLAS
             test33.cpp
         : : :
             <define>USE_FLOAT
-            <define>USE_DOUBLE 
-            <define>USE_STD_COMPLEX 
+            <define>USE_DOUBLE
+            <define>USE_STD_COMPLEX
             <define>USE_STD_MAP
-            <define>USE_MAPPED_VECTOR_OF_MAPPED_VECTOR 
-        : test3_mvov 
+            <define>USE_MAPPED_VECTOR_OF_MAPPED_VECTOR
+        : test3_mvov
         :
       ]
       [ run test4.cpp
@@ -166,11 +166,11 @@ test-suite numeric/uBLAS
       ]
       [ run triangular_layout.cpp
       ]
-      [ run comp_mat_erase.cpp /boost/test//boost_test
+      [ run comp_mat_erase.cpp /boost/test//included
         : : :
             <toolset>msvc:<asynch-exceptions>on
       ]
-      [ run sparse_view_test.cpp /boost/test//boost_test
+      [ run sparse_view_test.cpp /boost/test//included
         : : :
             <toolset>msvc:<asynch-exceptions>on
       ]
@@ -215,23 +215,23 @@ test-suite numeric/uBLAS
         :
       ]
       [ run test_inplace_solve.cpp /boost/math//boost_math
-        : 
-        : 
+        :
+        :
         : <define>$(UBLAS_TESTSET)
         : test_inplace_solve_basic
         :
       ]
       [ run test_inplace_solve.cpp /boost/math//boost_math
-        : 
-        : 
+        :
+        :
         : <define>$(UBLAS_TESTSET_SPARSE)
           <define>$(UBLAS_TESTSET_SPARSE_COO)
         : test_inplace_solve_sparse
         :
       ]
       [ run test_inplace_solve.cpp /boost/math//boost_math
-        : 
-        : 
+        :
+        :
         : <define>USE_MAPPED_VECTOR_OF_MAPPED_VECTOR
         : test_inplace_solve_mvov
         :

From de19c2ebf312b20750366ffd9046ccc54b7f6541 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Thu, 8 Aug 2024 21:45:19 -0500
Subject: [PATCH 09/11] Change Boost Test build refs to work with both old and
 modular test lib targets.

---
 test/tensor/Jamfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/tensor/Jamfile b/test/tensor/Jamfile
index e2a4e07db..a76251163 100644
--- a/test/tensor/Jamfile
+++ b/test/tensor/Jamfile
@@ -23,7 +23,7 @@ project boost/ublas/test/tensor
 
 alias unit_test_framework
     : # sources
-        /boost/test//unit_test_framework
+        /boost/test//boost_unit_test_framework
     ;
 
 # make aliases explicit so the libraries will only be built when requested

From b5094259443f1876a5d4cdc03cd68085692c3578 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Fri, 9 Aug 2024 23:57:14 -0500
Subject: [PATCH 10/11] Update build deps.

---
 benchmarks/Jamfile      | 4 +++-
 examples/tensor/Jamfile | 1 +
 test/Jamfile            | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/benchmarks/Jamfile b/benchmarks/Jamfile
index 4aa8ce8bb..0ff838f85 100644
--- a/benchmarks/Jamfile
+++ b/benchmarks/Jamfile
@@ -5,7 +5,9 @@
 # LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 project
-    : requirements <library>/boost/program_options//boost_program_options
+    : requirements
+        <library>/boost/ublas//boost_ublas
+        <library>/boost/program_options//boost_program_options
     ;
 
 exe add : add.cpp ;
diff --git a/examples/tensor/Jamfile b/examples/tensor/Jamfile
index 6755207db..0211d5416 100644
--- a/examples/tensor/Jamfile
+++ b/examples/tensor/Jamfile
@@ -12,6 +12,7 @@ import config : requires ;
 # Project settings
 project
     : requirements
+       <library>/boost/ublas//boost_ublas
        <define>BOOST_UBLAS_NO_EXCEPTIONS
        <toolset>vacpp:<define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
        <toolset>gcc:<cxxflags>"-Wall -pedantic -Wextra -Wno-unknown-pragmas"
diff --git a/test/Jamfile b/test/Jamfile
index 295af4f77..470827677 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -49,6 +49,7 @@ UBLAS_TESTSET_SPARSE_COO ?=
 # Project settings
 project
     : requirements
+       <library>/boost/ublas//boost_ublas
        <define>BOOST_UBLAS_NO_EXCEPTIONS
        <toolset>vacpp:<define>"BOOST_UBLAS_NO_ELEMENT_PROXIES"
        <toolset>gcc:<cxxflags>"-Wall -Wno-unknown-pragmas"

From 1dbef09acb9b32a0a47167a691af6e25abb4f2ca Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Sun, 11 Aug 2024 09:23:25 -0500
Subject: [PATCH 11/11] Change math dep real target math/tr1.

---
 test/Jamfile | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/test/Jamfile b/test/Jamfile
index 470827677..78a6bc132 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -122,7 +122,7 @@ test-suite numeric/uBLAS
       [ run test4.cpp
             test42.cpp
             test43.cpp
-            /boost/math//boost_math
+            /boost/math//boost_math_tr1
         : : :
             <define>$(UBLAS_TESTSET)
       ]
@@ -175,30 +175,30 @@ test-suite numeric/uBLAS
         : : :
             <toolset>msvc:<asynch-exceptions>on
       ]
-      [ run begin_end.cpp /boost/math//boost_math
+      [ run begin_end.cpp /boost/math//boost_math_tr1
       ]
-      [ run num_columns.cpp /boost/math//boost_math
+      [ run num_columns.cpp /boost/math//boost_math_tr1
       ]
-      [ run num_rows.cpp /boost/math//boost_math
+      [ run num_rows.cpp /boost/math//boost_math_tr1
       ]
-      [ run size.cpp /boost/math//boost_math
+      [ run size.cpp /boost/math//boost_math_tr1
       ]
-      [ run test_coordinate_matrix_sort.cpp /boost/math//boost_math
+      [ run test_coordinate_matrix_sort.cpp /boost/math//boost_math_tr1
       ]
-      [ run test_coordinate_matrix_sort.cpp /boost/math//boost_math
+      [ run test_coordinate_matrix_sort.cpp /boost/math//boost_math_tr1
        :
        :
        : <define>BOOST_UBLAS_COO_ALWAYS_DO_FULL_SORT
        : test_coordinate_matrix_always_do_full_sort
        :
       ]
-      [ run test_complex_norms.cpp /boost/math//boost_math
+      [ run test_complex_norms.cpp /boost/math//boost_math_tr1
       ]
-      [ run test_scaled_norm.cpp /boost/math//boost_math
+      [ run test_scaled_norm.cpp /boost/math//boost_math_tr1
        : : :
            <define>BOOST_UBLAS_SCALED_NORM
       ]
-      [ run test_assignment.cpp /boost/timer//boost_timer /boost/math//boost_math
+      [ run test_assignment.cpp /boost/timer//boost_timer /boost/math//boost_math_tr1
        : : :
            <define>BOOST_UBLAS_COO_ALWAYS_DO_FULL_SORT
            <define>BOOST_TIMER_ENABLE_DEPRECATED
@@ -208,21 +208,21 @@ test-suite numeric/uBLAS
        :
        : <library>/boost/timer//boost_timer
       ]
-      [ run test_ticket7296.cpp /boost/math//boost_math
+      [ run test_ticket7296.cpp /boost/math//boost_math_tr1
         :
         :
         : <toolset>msvc:<cxxflags>/wd4127 # The program checks that test facilities work fine. The warning appears many times.
         :
         :
       ]
-      [ run test_inplace_solve.cpp /boost/math//boost_math
+      [ run test_inplace_solve.cpp /boost/math//boost_math_tr1
         :
         :
         : <define>$(UBLAS_TESTSET)
         : test_inplace_solve_basic
         :
       ]
-      [ run test_inplace_solve.cpp /boost/math//boost_math
+      [ run test_inplace_solve.cpp /boost/math//boost_math_tr1
         :
         :
         : <define>$(UBLAS_TESTSET_SPARSE)
@@ -230,30 +230,30 @@ test-suite numeric/uBLAS
         : test_inplace_solve_sparse
         :
       ]
-      [ run test_inplace_solve.cpp /boost/math//boost_math
+      [ run test_inplace_solve.cpp /boost/math//boost_math_tr1
         :
         :
         : <define>USE_MAPPED_VECTOR_OF_MAPPED_VECTOR
         : test_inplace_solve_mvov
         :
       ]
-      [ run test_coordinate_vector_inplace_merge.cpp /boost/math//boost_math
+      [ run test_coordinate_vector_inplace_merge.cpp /boost/math//boost_math_tr1
       ]
-      [ run test_coordinate_matrix_inplace_merge.cpp /boost/math//boost_math
+      [ run test_coordinate_matrix_inplace_merge.cpp /boost/math//boost_math_tr1
       ]
-      [ run test_banded_storage_layout.cpp /boost/math//boost_math
+      [ run test_banded_storage_layout.cpp /boost/math//boost_math_tr1
         :
         :
         :
         :
         :
       ]
-      [ run test_fixed_containers.cpp /boost/math//boost_math
+      [ run test_fixed_containers.cpp /boost/math//boost_math_tr1
         :
         :
         :
       ]
-      [ run test_matrix_vector.cpp /boost/math//boost_math
+      [ run test_matrix_vector.cpp /boost/math//boost_math_tr1
       ]
       [ compile minimal_allocator_test.cpp ]
     ;