Changeset 62 for tests/testeur_fgemm.C

Timestamp:

06/03/08 21:24:57 (7 months ago)

Author:

pernet

Message:

* Change the design of fflas-bounds
* Modular<double> -> ModularBalanced?<double>
* Fix the winograd recursion issue (when some steps are done over the field)
* Fix a bunch of bugs
* Remove the template specialization by the Element (incompatible with the soon coming compressed representations over small fields)
* Create a randiter file, generic wrt the modular field

Location:

tests

Files:

• . (modified) (1 prop)
• testeur_fgemm.C (modified) (6 diffs)

tests/testeur_fgemm.C

@@ -12 +12 @@
 #include <iomanip>
 using namespace std;
-//#include "fflas-ffpack/modular-int.h"
-#include "fflas-ffpack/modular-balanced.h"
+#include "fflas-ffpack/modular-int.h"
+//#include "fflas-ffpack/modular-balanced.h"
 #include "timer.h"
 #include "Matio.h"
@@ -21 +21 @@
 
 
-typedef Modular<double> Field;
+//typedef ModularBalanced<float> Field;
+typedef ModularBalanced<double> Field;
+//typedef Modular<double> Field;
+//typedef Modular<float> Field;
 //typedef Modular<int> Field;
-//typedef Modular<float> Field;
 //typedef GivaroZpz<Std32> Field;
 //typedef GivaroGfq Field;
@@ -31 +33 @@
         IntPrimeDom IPD;
         Field::Element alpha, beta;
-        int p;
+        long p;
         size_t M, K, N, Wino;
         bool keepon = true;
@@ -126 +128 @@
 //                                      keepon = false;
 //              }
-                Field::Element aij, bij, boa;
-                F.div(boa, beta, alpha);
+                Field::Element aij, bij, boa, temp;
+                //F.div(boa, beta, alpha);
                 for (int i = 0; i < M; ++i )
                         for ( int j = 0; j < N; ++j ){
-                                F.mulin(*(Cbis+i*N+j),boa);
+                                //                              F.mulin(*(Cbis+i*N+j),boa);
+                                F.mulin(*(Cbis+i*N+j),beta);
                                 for ( int l = 0; l < K ; ++l ){
                                         if ( ta == FFLAS::FflasNoTrans )
@@ -140 +143 @@
                                         else
                                                 bij = *(B+j*ldb+l);
-                                        
-                                        F.axpyin( *(Cbis+i*N+j), aij, bij );
+                                        F.mul(temp,aij,bij);
+                                        F.axpyin( *(Cbis+i*N+j), alpha, temp);
+                                        //F.axpyin( *(Cbis+i*N+j), aij, bij );
                                 }
-                                F.mulin( *(Cbis+i*N+j),alpha );
+                                //F.mulin( *(Cbis+i*N+j),alpha );
                                 if ( !F.areEqual( *(Cbis+i*N+j), *(C+i*N+j) ) ) {
                                         cerr<<"error for i,j="<<i<<" "<<j<<" "<<*(C+i*N+j)<<" "<<*(Cbis+i*N+j)<<endl;
@@ -160 +164 @@
                 }
                 else{
-                        cerr<<"C="<<endl;
-                        write_field( F, cerr, C, M, N, N );
-                        cerr<<"Cbis="<<endl;
-                        write_field( F, cerr, Cbis, M, N, N );
+                        // cerr<<"C="<<endl;
+//                      write_field( F, cerr, C, M, N, N );
+//                      cerr<<"Cbis="<<endl;
+//                      write_field( F, cerr, Cbis, M, N, N );
                 }
         }