[Boost-commit] svn:boost r63419 - sandbox/numeric_bindings/libs/numeric/bindings/atlas

Subject: [Boost-commit] svn:boost r63419 - sandbox/numeric_bindings/libs/numeric/bindings/atlas
From: thomas.klimpel_at_[hidden]
Date: 2010-06-28 19:32:10

Author: klimpel
Date: 2010-06-28 19:32:08 EDT (Mon, 28 Jun 2010)
New Revision: 63419
URL: http://svn.boost.org/trac/boost/changeset/63419

Log:
Merge from numeric_bindings-v1
Text files modified: 
   sandbox/numeric_bindings/libs/numeric/bindings/atlas/Jamfile.v2           |    22 +++++++++++-----------                  
   sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_herm3.cc       |    13 +++++++++----                           
   sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr2_bench.cc |    22 ++++++++++++++++------                  
   sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm2.cc       |    13 +++++++++----                           
   sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm2syr.cc    |    13 +++++++++----                           
   sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm3.cc       |    13 +++++++++----                           
   sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm32.cc      |    13 +++++++++----                           
   sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm33.cc      |    13 +++++++++----                           
   sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm3s2k.cc    |    24 +++++++++++++++++-------                
   sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm3syrk.cc   |    24 +++++++++++++++++-------                
   sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symmc3.cc      |    13 +++++++++----                           
   11 files changed, 124 insertions(+), 59 deletions(-)

Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/Jamfile.v2
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/Jamfile.v2	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/Jamfile.v2	2010-06-28 19:32:08 EDT (Mon, 28 Jun 2010)
@@ -30,31 +30,31 @@
     [ run ublas_gesv5.cc ]
     [ run ublas_getrf_getrs.cc ]
 
-    [ link ublas_getri.cc ]
+    [ run ublas_getri.cc ]
 
     [ run ublas_matr1.cc ]
     [ run ublas_matr2.cc ]
     [ run ublas_matr22.cc ]
-    [ link ublas_matr2_bench.cc ]
+    [ run ublas_matr2_bench.cc : 20 5 ]
     [ run ublas_matr2ger.cc ]
     [ run ublas_matr3.cc ]
     [ run ublas_posv.cc ]
     [ run ublas_potrf_potrs.cc ]
 
-    [ link ublas_potri.cc ]
+    [ run ublas_potri.cc ]
 
-    [ link ublas_herm3.cc ]
+    [ run ublas_herm3.cc : 20 ]
     [ run ublas_herm3h2k.cc ]
     [ run ublas_herm3herk.cc ]
 
     [ link ublas_symm2.cc ]
-    [ link ublas_symm3.cc ]
-    [ link ublas_symm2syr.cc ]
-    [ link ublas_symm32.cc ]
-    [ link ublas_symm33.cc ]
-    [ link ublas_symm3s2k.cc ]
-    [ link ublas_symm3syrk.cc ]
-    [ link ublas_symmc3.cc ]
+    [ run ublas_symm3.cc : 20 ]
+    [ run ublas_symm2syr.cc : 20 ]
+    [ run ublas_symm32.cc : 20 ]
+    [ run ublas_symm33.cc : 20 ]
+    [ run ublas_symm3s2k.cc : 20 5 ]
+    [ run ublas_symm3syrk.cc : 20 5 ]
+    [ run ublas_symmc3.cc : 20 ]
     [ run ublas_vct.cc ]
 ;
 

Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_herm3.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_herm3.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_herm3.cc	2010-06-28 19:32:08 EDT (Mon, 28 Jun 2010)
@@ -30,13 +30,18 @@
 typedef ublas::hermitian_adaptor<rm_t, ublas::upper> urhemm_t; 
 typedef ublas::hermitian_adaptor<rm_t, ublas::lower> lrhemm_t; 
 
-int main() {
+int main (int argc, char **argv) {
+  size_t n = 0;
+  if (argc > 1) {
+    n = atoi(argv [1]);
+  }
   
   cout << endl; 
 
-  size_t n; 
-  cout << "n -> "; 
-  cin >> n;
+  if (n <= 0) {
+    cout << "n -> ";
+    cin >> n;
+  }
   cout << endl; 
 
   cm_t uc (n, n);

Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr2_bench.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr2_bench.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr2_bench.cc	2010-06-28 19:32:08 EDT (Mon, 28 Jun 2010)
@@ -267,15 +267,25 @@
 
 
 //////////////////////////////////////////////////////
-int main() {
+int main (int argc, char **argv) {
+  size_t n = 0, r = 0;
+  if (argc > 1) {
+    n = atoi(argv [1]);
+  }
+  if (argc > 2) {
+    r = atoi(argv [2]);
+  }
 
   cout << endl; 
 
-  size_t n, r; 
-  cout << "n -> "; 
-  cin >> n;
-  cout << "r -> ";
-  cin >> r;  
+  if (n <= 0) {
+    cout << "n -> ";
+    cin >> n;
+  }
+  if (r <= 0) {
+    cout << "r -> ";
+    cin >> r;
+  }
   cout << endl; 
 
   bench_gemv<rm_t> (n, r, "row major"); 

Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm2.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm2.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm2.cc	2010-06-28 19:32:08 EDT (Mon, 28 Jun 2010)
@@ -64,14 +64,19 @@
 typedef ublas::hermitian_adaptor<rm_t, ublas::lower> lrha_t; 
 
 
-int main() {
+int main (int argc, char **argv) {
+  size_t n = 0;
+  if (argc > 1) {
+    n = atoi(argv [1]);
+  }
   
   cout << endl; 
 
   cout << "symmetric matrix" << endl << endl; 
-  size_t n; 
-  cout << "n -> "; 
-  cin >> n;
+  if (n <= 0) {
+    cout << "n -> ";
+    cin >> n;
+  }
   cout << endl; 
 
   vct_t vx (n), vy (n); 

Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm2syr.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm2syr.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm2syr.cc	2010-06-28 19:32:08 EDT (Mon, 28 Jun 2010)
@@ -44,12 +44,17 @@
 typedef ublas::symmetric_adaptor<rm_t, ublas::upper> ursa_t; 
 typedef ublas::symmetric_adaptor<rm_t, ublas::lower> lrsa_t; 
 
-int main() {
+int main (int argc, char **argv) {
+  size_t n = 0;
+  if (argc > 1) {
+    n = atoi(argv [1]);
+  }
   
   cout << endl; 
-  size_t n; 
-  cout << "n -> "; 
-  cin >> n;
+  if (n <= 0) {
+    cout << "n -> ";
+    cin >> n;
+  }
   cout << endl; 
 
   vct_t vx (n), vy (n); 

Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm3.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm3.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm3.cc	2010-06-28 19:32:08 EDT (Mon, 28 Jun 2010)
@@ -28,13 +28,18 @@
 typedef ublas::symmetric_adaptor<rm_t, ublas::upper> ursymm_t; 
 typedef ublas::symmetric_adaptor<rm_t, ublas::lower> lrsymm_t; 
 
-int main() {
+int main (int argc, char **argv) {
+  size_t n = 0;
+  if (argc > 1) {
+    n = atoi(argv [1]);
+  }
 
   cout << endl; 
 
-  size_t n; 
-  cout << "n -> "; 
-  cin >> n;
+  if (n <= 0) {
+    cout << "n -> ";
+    cin >> n;
+  }
   cout << endl; 
 
   cm_t uc (n, n);

Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm32.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm32.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm32.cc	2010-06-28 19:32:08 EDT (Mon, 28 Jun 2010)
@@ -30,13 +30,18 @@
 typedef ublas::symmetric_adaptor<rm_t, ublas::upper> ursymm_t; 
 typedef ublas::symmetric_adaptor<rm_t, ublas::lower> lrsymm_t; 
 
-int main() {
+int main (int argc, char **argv) {
+  size_t n = 0;
+  if (argc > 1) {
+    n = atoi(argv [1]);
+  }
 
   cout << endl; 
 
-  size_t n; 
-  cout << "n -> "; 
-  cin >> n;
+  if (n <= 0) {
+    cout << "n -> ";
+    cin >> n;
+  }
   cout << endl; 
 
   cm_t uc (n, n);

Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm33.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm33.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm33.cc	2010-06-28 19:32:08 EDT (Mon, 28 Jun 2010)
@@ -26,13 +26,18 @@
 typedef ublas::matrix<real_t, ublas::column_major> cm_t; 
 typedef ublas::matrix<real_t, ublas::row_major> rm_t; 
 
-int main() {
+int main (int argc, char **argv) {
+  size_t n = 0;
+  if (argc > 1) {
+    n = atoi(argv [1]);
+  }
 
   cout << endl; 
 
-  size_t n; 
-  cout << "n -> "; 
-  cin >> n;
+  if (n <= 0) {
+    cout << "n -> ";
+    cin >> n;
+  }
   cout << endl; 
 
   cm_t uc (n, n);

Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm3s2k.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm3s2k.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm3s2k.cc	2010-06-28 19:32:08 EDT (Mon, 28 Jun 2010)
@@ -37,13 +37,23 @@
 typedef ublas::symmetric_adaptor<crm_t, ublas::upper> cursa_t; 
 typedef ublas::symmetric_adaptor<crm_t, ublas::lower> clrsa_t; 
 
-int main() {
-
-  int n, k;
-  cout << "n -> ";
-  cin >> n;
-  cout << "k -> ";
-  cin >> k; 
+int main (int argc, char **argv) {
+  int n = 0, k = 0;
+  if (argc > 1) {
+    n = atoi(argv [1]);
+  }
+  if (argc > 2) {
+    k = atoi(argv [2]);
+  }
+
+  if (n <= 0) {
+    cout << "n -> ";
+    cin >> n;
+  }
+  if (k <= 0) {
+    cout << "k -> ";
+    cin >> k;
+  }
 
   cm_t ac (n, k); 
   rm_t ar (n, k); 

Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm3syrk.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm3syrk.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symm3syrk.cc	2010-06-28 19:32:08 EDT (Mon, 28 Jun 2010)
@@ -28,13 +28,23 @@
 typedef ublas::symmetric_adaptor<rm_t, ublas::upper> ursa_t; 
 typedef ublas::symmetric_adaptor<rm_t, ublas::lower> lrsa_t; 
 
-int main() {
-
-  int n, k;
-  cout << "n -> ";
-  cin >> n;
-  cout << "k -> ";
-  cin >> k; 
+int main (int argc, char **argv) {
+  int n = 0, k = 0;
+  if (argc > 1) {
+    n = atoi(argv [1]);
+  }
+  if (argc > 2) {
+    k = atoi(argv [2]);
+  }
+
+  if (n <= 0) {
+    cout << "n -> ";
+    cin >> n;
+  }
+  if (k <= 0) {
+    cout << "k -> ";
+    cin >> k; 
+  }
 
   cm_t ac (n, k); 
   rm_t ar (n, k); 

Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symmc3.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symmc3.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_symmc3.cc	2010-06-28 19:32:08 EDT (Mon, 28 Jun 2010)
@@ -30,13 +30,18 @@
 typedef ublas::symmetric_adaptor<rm_t, ublas::upper> ursymm_t; 
 typedef ublas::symmetric_adaptor<rm_t, ublas::lower> lrsymm_t; 
 
-int main() {
+int main (int argc, char **argv) {
+  size_t n = 0;
+  if (argc > 1) {
+    n = atoi(argv [1]);
+  }
 
   cout << endl; 
 
-  size_t n; 
-  cout << "n -> "; 
-  cin >> n;
+  if (n <= 0) {
+    cout << "n -> ";
+    cin >> n;
+  }
   cout << endl; 
 
   cm_t uc (n, n);