Changeset 43

Timestamp:

08/29/07 18:16:52 (1 year ago)

Author:

pernet

Message:

Updating the benchmark section to make it work with fflas-ffpack

Files:

• benchmark/Makefile.Rule (modified) (1 diff)
• benchmark/graph/graph_report.sh (modified) (1 diff)
• benchmark/html/html_report.sh (modified) (3 diffs)
• benchmark/html/process.sh (modified) (1 diff)
• benchmark/run.sh (modified) (4 diffs)
• benchmark/src/BLAS_LAPACK/check-dgemm.C (modified) (4 diffs)
• benchmark/src/BLAS_LAPACK/check-dgetrf.C (modified) (4 diffs)
• benchmark/src/BLAS_LAPACK/check-dgetri.C (modified) (1 diff)
• benchmark/src/BLAS_LAPACK/check-dtrsm.C (modified) (3 diffs)
• benchmark/src/BLAS_LAPACK/check-dtrtri.C (modified) (1 diff)
• benchmark/src/FFLAS_FFPACK/check-fgemm.C (modified) (2 diffs)
• benchmark/src/FFLAS_FFPACK/check-ftrsm.C (modified) (2 diffs)
• benchmark/src/FFLAS_FFPACK/check-ftrtri.C (added)
• benchmark/src/FFLAS_FFPACK/check-lqup.C (modified) (1 diff)
• benchmark/src/FFLAS_FFPACK/check-trinverse.C (deleted)
• benchmark/test-src/mesure-FFLAS_FFPACK.sh (modified) (1 diff)
• benchmark/test-src/parameter.in (modified) (1 diff)
• include/config-blas.h (modified) (3 diffs)
• include/fflas-ffpack/fflas.h (modified) (1 diff)
• tests/test-ftrsm.C (modified) (4 diffs)

benchmark/Makefile.Rule

@@ -3 +3 @@
 ############################
 ATLAS_CXX=-I/home/cpernet/Logiciels/ATLAS_Opteron64/include/
-ATLAS_LIB=-L/home/cpernet/Logiciels/ATLAS_Opteron64/lib   -lcblas -latlas
+ATLAS_LIB=-L/home/cpernet/Logiciels/ATLAS_Opteron64/lib   -llapack -lcblas -latlas 
 GOTO_LIB=-L/home/cpernet/Logiciels/GotoBLAS  -lgoto 
 FFLAS_FFPACK_PATH=/home/cpernet/Logiciels/fflas-ffpack

benchmark/graph/graph_report.sh

@@ -76 +76 @@
 
 ## TRIANGULAR MATRIX INVERSION
-f_funct=trinverse
+f_funct=ftrtri
 n_funct=dtrtri
 perl make_graph_file.pl ${TEST_PATH}/ATLAS/timing-check-${f_base}-${PRIME}.txt \

benchmark/html/html_report.sh

@@ -11 +11 @@
 read ARCHI_DESCR
 
-TEST_DIR=`ls $HOME_PATH/Target/$ARCHI -I CVS -I GOTO -I ATLAS -I compilation.log | tail -n 1`
+TEST_DIR=`ls $HOME_PATH/Target/$ARCHI  -I GOTO -I ATLAS -I compilation.log -I report.xml| tail -n 1`
 echo "Processing testing directory [$TEST_DIR]"
 
 TEST_PATH="$HOME_PATH/Target/$ARCHI/$TEST_DIR"
+
 PRIME=65521
 
@@ -34 +35 @@
 
 ${CURRENT_PATH}/process.sh "Multiple Triangular System Solving"    timing-check-dtrsm-${PRIME}.txt \
-                                                                   timing-check-ftrsm-${PRIME}.txt  >> ${XML_FILE}
+                                                                   timing-check-ftrsm-${PRIME}.txt >> ${XML_FILE}
 
 ${CURRENT_PATH}/process.sh "Matrix Inversion"             timing-check-dgetri-${PRIME}.txt \
@@ -40 +41 @@
 
 ${CURRENT_PATH}/process.sh "Triangular Matrix Inversion"  timing-check-dtrtri-${PRIME}.txt \
-                                                          timing-check-trinverse-${PRIME}.txt  >> ${XML_FILE}
+                                                          timing-check-ftrtri-${PRIME}.txt >> ${XML_FILE}
 echo "</benchmark>" >> ${XML_FILE}
 

benchmark/html/process.sh

@@ -8 +8 @@
 
 
+echo `pwd`
 echo  "<test name=\"$1\">"
 echo -n "<prime> "

benchmark/run.sh

@@ -76 +76 @@
     echo "Compiling BLAS_LAPACK with GOTO..."
     echo "Compiling BLAS_LAPACK with GOTO..."  >> ${TARGET_PATH}/compilation.log
-#    make -k GOTO_LINK=true && echo "compilation done" && echo
+    make -k GOTO_LINK=true && echo "compilation done" && echo
     
     
@@ -90 +90 @@
     echo "Compiling FFLAS_FFPACK with ATLAS..."
     echo "Compiling FFLAS_FFPACK with ATLAS..."  >> ${TARGET_PATH}/compilation.log
-    make -k ATLAS_LINK=true && echo "compilation done" && echo
+   make -k ATLAS_LINK=true && echo "compilation done" && echo
     cd  ${CURRENT_PATH}/src/BLAS_LAPACK
     echo "Compiling BLAS_LAPACK with ATLAS..."
     echo "Compiling BLAS_LAPACK with ATLAS..."  >> ${TARGET_PATH}/compilation.log
-#    make -k ATLAS_LINK=true && echo "compilation done" && echo
+    make -k ATLAS_LINK=true && echo "compilation done" && echo
 else
     echo "Skipping compilation..."
@@ -116 +116 @@
 ${TEST_SRC_PATH}/mesure-FFLAS_FFPACK.sh
 echo "running BLAS_LAPACK tests with GOTO..."
-#${TEST_SRC_PATH}/mesure-BLAS_LAPACK.sh
+${TEST_SRC_PATH}/mesure-BLAS_LAPACK.sh
 
 
@@ -127 +127 @@
 echo "running FFLAS_FFPACK tests with ATLAS..."
 ${TEST_SRC_PATH}/mesure-FFLAS_FFPACK.sh
-#echo "running BLAS_LAPACK tests with ATLAS..."
+echo "running BLAS_LAPACK tests with ATLAS..."
 ${TEST_SRC_PATH}/mesure-BLAS_LAPACK.sh

benchmark/src/BLAS_LAPACK/check-dgemm.C

@@ -4 +4 @@
 
 #include "fflas-ffpack/fflas.h"
-#include "fflas-ffpack/modular-centered.h"
+#include "fflas-ffpack/modular-balanced.h"
+#include "Matio.h"
 #include "timer.h"
 
@@ -14 +15 @@
 
   int    p    = atoi(argv[1]);
-  size_t n    = atoi(argv[2]);
+  int n    = atoi(argv[2]);
   size_t iter = atoi(argv[3]);
   
@@ -22 +23 @@
       
   Field F(p);
-  Element one;
+  Element one, zero;
   F.init(one, 1.0);
+  F.init(zero, 0.0);
   
-  Element * C = new Element[n*n];
-
   Timer chrono;
   double time=0.0, time2=0.0;
   int singular;
   
-  Element * A;
-  Element * B;
+  Element * A, * B, * C;
 
   for (size_t i=0;i<iter;++i){
@@ -56 +55 @@
     }
 
-
+    C = new Element[n*n];
+    
     chrono.clear();
     chrono.start();
-    FFLAS::fgemm (F, FFLAS::FflasNoTrans, FFLAS::FflasNoTrans, n,n,n, one,
-                  A, n, B, n, zero, C);
+    cblas_dgemm (CblasRowMajor, CblasNoTrans, CblasNoTrans, n,n,n, one,
+                 A, n, B, n, zero, C,n);
     chrono.stop();
     time+=chrono.usertime();

benchmark/src/BLAS_LAPACK/check-dgetrf.C

@@ -1 +1 @@
 #include <iostream>
+#include <vector>
 
 
-#include "linbox-config.h"
-#undef __LINBOX_HAVE_NTL
-#undef __LINBOX_HAVE_GIVARO
 #ifndef __LINBOX_HAVE_DGETRF 
 #define __LINBOX_HAVE_DGETRF 1
 #endif
-#include "linbox/matrix/blas-matrix.h"
-#include "linbox/algorithms/blas-domain.h"
-#include "linbox/field/modular.h"
-#include "linbox/util/timer.h"
+#include "fflas-ffpack/fflas.h"
+#include "fflas-ffpack/modular-balanced.h"
+#include "timer.h"
+#include "Matio.h"
 
-
-using namespace LinBox;
 using namespace std;
 
@@ -22 +18 @@
 
   int    p    = atoi(argv[1]);
-  size_t n    = atoi(argv[2]);
+  int n    = atoi(argv[2]);
   size_t iter = atoi(argv[3]);
   
@@ -30 +26 @@
       
   Field F(p);
-  BlasMatrixDomain<Field> BMD(F);
-  BlasMatrix<Element> A (n,n);
+  Element * A;
 
-  LinBox::Timer chrono;
+  Timer chrono;
   double time=0.0;
   int singular;
@@ -39 +34 @@
   for (size_t i=0;i<iter;++i){
     if (argc > 4){
-      fstream osA(argv[4]);    
-      A.read(osA,F);
-      osA.close();
+      A = read_field (F, argv[4], &n,&n);
     }
     else{
+      A = new Element[n*n];
       Field::RandIter G(F);
-      BlasMatrix<Element>::RawIterator it = A.rawBegin();
-      for (; it != A.rawEnd();++it)
-        G.random(*it);      
+      for (size_t i=0; i<n*n; ++i)
+        G.random(*(A+i));
     }
  
     chrono.clear();
     chrono.start();
-    clapack_dgetrf(CblasRowMajor,n,n,A.getPointer(),n,&Piv[0]);
+    clapack_dgetrf(CblasRowMajor,n,n,A,n,&Piv[0]);
     chrono.stop();
  

benchmark/src/BLAS_LAPACK/check-dgetri.C

@@ -1 +1 @@
 #include <iostream>
+#include <vector>
+
+#ifndef __LINBOX_HAVE_DGETRF 
+#define __LINBOX_HAVE_DGETRF 1
+#endif
+
+#ifndef __LINBOX_HAVE_DGETRI 
+#define __LINBOX_HAVE_DGETRI 1
+#endif
+#ifndef __LINBOX_HAVE_DTRTRI
+#define __LINBOX_HAVE_DTRTRI 1
+#endif
+#ifndef __LINBOX_AUTOIMPLEMENT_DGETRI
+#define __LINBOX_AUTOIMPLEMENT_DGETRI 1
+#endif
 
 
+#include "fflas-ffpack/fflas.h"
+#include "fflas-ffpack/modular-balanced.h"
+#include "timer.h"
+#include "Matio.h"
 
-#include "linbox-config.h"
-#undef __LINBOX_HAVE_NTL
-#undef __LINBOX_HAVE_GIVARO
-#ifndef __LINBOX_HAVE_DGETRI 
-#define __LINBOX_HAVE_DGETRI 
-#endif
-#include "linbox/matrix/blas-matrix.h"
-#include "linbox/algorithms/blas-domain.h"
-#include "linbox/field/modular.h"
-#include "linbox/util/timer.h"
-
-using namespace LinBox;
 using namespace std;
 
 int main(int argc, char** argv) {
-
+  
   // parameter: p, n, iteration, file
-
+  
   int    p    = atoi(argv[1]);
-  size_t n    = atoi(argv[2]);
+  int n    = atoi(argv[2]);
   size_t iter = atoi(argv[3]);
   
-
+  
   typedef Modular<double> Field;
   typedef Field::Element Element;
-      
+  vector<int> Piv(n,0);
+
   Field F(p);
+  Field::Element * A;
   
-  LinBox::Timer chrono;
+  Timer chrono;
   double time=0.0;
   int singular;
-  std::vector<int> Piv(n,0);
-  BlasMatrix<Element> A (n,n);
+  
+  for (size_t i=0;i<iter;++i){
+    if (argc > 4){
+      A = read_field(F, argv[4],  &n, &n);
+    } else {
+      A = new Element[n*n];      
+      Field::RandIter G(F);
+      for (size_t i=0; i<n*n; ++i)
+        G.random(*(A+i));
 
-  for (size_t i=0;i<iter;++i){
-     if (argc > 4){
-      fstream osA(argv[4]);    
-      A.read(osA,F);
-      osA.close();
     }
-    else{
-      Field::RandIter G(F);
-      BlasMatrix<Element>::RawIterator it = A.rawBegin();
-      for (; it != A.rawEnd();++it)
-        G.random(*it);      
-    }
- 
+    int nullity=0;
     chrono.clear();
     chrono.start();
-    clapack_dgetrf(CblasRowMajor,n,n,A.getPointer(),n,&Piv[0]);
-    clapack_dgetri(CblasRowMajor,n,A.getPointer(),n,&Piv[0]);
+    clapack_dgetrf(CblasRowMajor,n,n,A,n,&Piv[0]);
+    clapack_dgetri(CblasRowMajor,n,A,n,&Piv[0]);
+
     chrono.stop();
- 
+    
     time+=chrono.usertime();
- 
+    delete[] A;
   }
-  
+
   cerr<<"n: "<<n<<" p: "<<p<<" time: "<<time/iter<<endl;
 
-  
+
   return 0;
 }
 
 
+
+

benchmark/src/BLAS_LAPACK/check-dtrsm.C

@@ -1 +1 @@
 #include <iostream>
 
-//#define __LINBOX_CONFIGURATION
-//#include <linbox/config-blas.h>
+#include "fflas-ffpack/fflas.h"
+#include "fflas-ffpack/modular-balanced.h"
+#include "timer.h"
+#include "Matio.h"
 
-#include "linbox-config.h"
-#undef __LINBOX_HAVE_NTL
-#undef __LINBOX_HAVE_GIVARO
-#include "linbox/matrix/blas-matrix.h"
-#include "linbox/algorithms/blas-domain.h"
-#include "linbox/field/modular.h"
-#include "linbox/util/timer.h"
-
-using namespace LinBox;
 using namespace std;
 
@@ -19 +12 @@
   // parameter: p, n, iteration, file1, file2
 
-  if (argc != 4)
-    std::cout<<"usage: <p> <dim> <iter>\n";
-
   int    p    = atoi(argv[1]);
-  size_t n    = atoi(argv[2]);
+  int n    = atoi(argv[2]);
   size_t iter = atoi(argv[3]);
   
@@ -31 +21 @@
       
   Field F(p);
-  BlasMatrixDomain<Field> BMD(F);
-  BlasMatrix<Element> A(n,n), B(n,n);
-
-  LinBox::Timer chrono;
+  Element one;
+  F.init(one, 1.0);
+  Element * A;
+  Element * B;
+  
+  Timer chrono;
   double time=0.0;
   int singular;
   
   for (size_t i=0;i<iter;++i){
+    Field::RandIter G(F);
     if (argc > 4){
-      fstream osA(argv[4]);    
-      A.read(osA,F);
-      osA.close();
+        A = read_field (F, argv[4], &n, &n);    
     }
     else{
-      Field::RandIter G(F);
-      BlasMatrix<Element>::RawIterator it = A.rawBegin();
-      for (; it != A.rawEnd();++it)
-        G.random(*it);      
+      A = new Element[n*n];
+      for (size_t i = 0; i< n*n; ++i)
+        G.random(*(A+i));      
     }
 
-
     if (argc == 6){
-      fstream osB(argv[5]);      
-      B.read(osB,F);
-      osB.close();
+      B = read_field (F, argv[5], &n, &n);    
     }
     else{
+      B = new Element[n*n];
       Field::RandIter G(F);
-      BlasMatrix<Element>::RawIterator it = B.rawBegin();
-      for (; it != B.rawEnd();++it)
-        G.random(*it);
+      for (size_t i=0 ; i< n*n; ++i)
+        G.random(*(A+i));
     }
-  
+        
+    for (size_t k=0;k<n;++k)
+      while (F.isZero( G.random(*(A+k*(n+1)))));
+    
     chrono.clear();
     chrono.start();
-    cblas_dtrsm(CblasRowMajor, CblasLeft, CblasLower, CblasNoTrans,
-                CblasUnit, n, n, 1.0, A.getPointer(), n, B.getPointer(), n);
+    cblas_dtrsm (CblasRowMajor, CblasLeft, CblasLower, CblasNoTrans,
+                 CblasNonUnit, n,n, one, A, n, B, n);
+    
     chrono.stop();
     time+=chrono.usertime();
+    delete[] A;
+    delete[] B;
     
   }

benchmark/src/BLAS_LAPACK/check-dtrtri.C

@@ -1 +1 @@
 #include <iostream>
 
-#include "linbox-config.h"
-#undef __LINBOX_HAVE_NTL
-#undef __LINBOX_HAVE_GIVARO
 #define __LINBOX_HAVE_DTRTRI 1
-#include "linbox/matrix/blas-matrix.h"
-#include "linbox/algorithms/blas-domain.h"
-#include "linbox/field/modular.h"
-#include "linbox/util/timer.h"
 
-//extern "C" {
-//#include "atlas_lapack.h"
-//#include "atlas_enum.h"
-//#include "clapack.h"
-//  int ATL_dtrtriRL(const enum ATLAS_DIAG Diag, const int N, double *A, const int lda);
-//}
+#include "fflas-ffpack/modular-balanced.h"
+#include "fflas-ffpack/ffpack.h"
+#include "timer.h"
+#include "Matio.h"
 
-using namespace LinBox;
 using namespace std;
 
 int main(int argc, char** argv) {
-
+  
   // parameter: p, n, iteration, file
-
+  
   int    p    = atoi(argv[1]);
-  size_t n    = atoi(argv[2]);
+  int n    = atoi(argv[2]);
   size_t iter = atoi(argv[3]);
   
-
+  
   typedef Modular<double> Field;
   typedef Field::Element Element;
-      
+  
   Field F(p);
+  Element * A;
   
-  LinBox::Timer chrono;
+  Timer chrono;
   double time=0.0;
   int singular;
-  BlasMatrix<Element> A (n,n);
+  
+  Field::RandIter G(F);
   for (size_t i=0;i<iter;++i){
+    if (argc > 4){
+      A = read_field (F, argv[4], &n, &n);    
+    } else {
+      A = new Element[n*n];
+      for (size_t i=0; i< n*n; ++i)
+        G.random(*(A+i));
+    }      
+    for (size_t k=0;k<n;++k)
+      while (F.isZero( G.random(*(A+k*(n+1)))));
     
-    if (argc > 4){
-      fstream osA(argv[4]);    
-      A.read(osA,F);
-      osA.close();
-    }
-    else{
-      Field::RandIter G(F);
-      BlasMatrix<Element>::RawIterator it = A.rawBegin();
-      for (; it != A.rawEnd();++it)
-        G.random(*it);      
-    }
- 
-    for (size_t k=0;k<n;++k)    
-      A.setEntry(k,k,1);
- 
     chrono.clear();
-    chrono.start();       
-    //ATL_dtrtriRL(CblasUnit,n,A.getWritePointer(),n);
-    clapack_dtrtri(CblasRowMajor,CblasLower, CblasUnit,n,A.getWritePointer(),n);
+    chrono.start();
+    clapack_dtrtri(CblasRowMajor,CblasUpper, CblasNonUnit,n,A,n);
     chrono.stop();
- 
+    
     time+=chrono.usertime();
- 
+    delete[] A;
+    
   }
 

benchmark/src/FFLAS_FFPACK/check-fgemm.C

@@ -26 +26 @@
   F.init(one, 1.0);
   F.init(zero,0.0);
-  Element * C = new Element[n*n];
 
   Timer chrono;
@@ -32 +31 @@
   int singular;
   
-  Element * A;
-  Element * B;
+  Element * A, * B, * C;
 
   for (size_t i=0;i<iter;++i){

benchmark/src/FFLAS_FFPACK/check-ftrsm.C

@@ -36 +36 @@
     }
     else{
+      A = new Element[n*n];
       for (size_t i = 0; i< n*n; ++i)
         G.random(*(A+i));      
@@ -44 +45 @@
     }
     else{
+      B = new Element[n*n];
       Field::RandIter G(F);
       for (size_t i=0 ; i< n*n; ++i)

benchmark/src/FFLAS_FFPACK/check-lqup.C

@@ -34 +34 @@
     }
     else{
+      A = new Element[n*n];
       Field::RandIter G(F);
       for (size_t i=0; i< n*n; ++i)

benchmark/test-src/mesure-FFLAS_FFPACK.sh

@@ -8 +8 @@
     ${TEST_SRC_PATH}/mesure.sh check-inverse   $p 
     ${TEST_SRC_PATH}/mesure.sh check-ftrsm     $p 
-    ${TEST_SRC_PATH}/mesure.sh check-trinverse $p 
+    ${TEST_SRC_PATH}/mesure.sh check-ftrtri $p 
 done

benchmark/test-src/parameter.in

@@ -1 @@
-500    10 
-1000   5 
-2000   5  
-3000   3  
+300    5
+500    2 
+1000   1 
+2000   1
+5000   1
+10000  1
+15000  1

include/config-blas.h

@@ -66 +66 @@
 extern "C" {
   
-#if HAVE_DGETRF
-        void dgetrf_(const int *, const int *, double *, const int *, int *, int *);
-#endif
-#if HAVE_DGETRI