Changeset 22

Timestamp:

06/07/07 14:40:47 (2 years ago)

Author:

pernet

Message:

Fix a design pb in the BaseCompute? routine

Location:

include/fflas-ffpack

Files:

• fflas.h (modified) (3 diffs)
• fflas_bounds.inl (modified) (2 diffs)

include/fflas-ffpack/fflas.h

@@ -239 +239 @@
                 if (!(m && n && k)) return C;
                 
-                FFLAS_BASE base = BaseCompute (F, w);
+                FFLAS_BASE base = BaseCompute<typename Field::Element> ()(F, w);
 
                 WinoMain (F, ta, tb, m, n, k, alpha, A, lda, B, ldb, beta,
@@ -451 +451 @@
         
 
-        template <class Field>
-        static FFLAS_BASE BaseCompute (const Field& F, const size_t w);
-        
         static size_t WinoSteps (const size_t m);
         
@@ -478 +475 @@
         template <class Element>
         class setMatMulParam;
+
+        template <class Element>
+        class BaseCompute;
 
         template <class Field>

include/fflas-ffpack/fflas_bounds.inl

@@ -242 +242 @@
                 w = ks;
                 
-                base = BaseCompute (F, w);
+                base = BaseCompute<typename Field::Element> ()(F, w);
                 kmax = DotProdBound (F, w, beta, base);
         }
@@ -300 +300 @@
 
 
-template <class Field>
-inline FFLAS::FFLAS_BASE FFLAS::BaseCompute (const Field& F, const size_t w){
-
-        FFLAS_INT_TYPE pi;
-        F.characteristic(pi);
-        FFLAS_BASE base;
-        switch (w) {
-        case 0: base = (pi < FLOAT_DOUBLE_THRESHOLD_0)? FflasFloat : FflasDouble;
-                break;
-        case 1:  base = (pi < FLOAT_DOUBLE_THRESHOLD_1)? FflasFloat : FflasDouble;
-                break;
-        case 2:  base = (pi < FLOAT_DOUBLE_THRESHOLD_2)? FflasFloat : FflasDouble;
-                break;
-        default: base = FflasDouble;
-                break;
-        }
-        //cerr<<"base = "<<base<<endl;
-        return base;
-//      case 0: return (pi < FLOAT_DOUBLE_THRESHOLD_0)? FflasFloat : FflasDouble;
-//      case 1: return (pi < FLOAT_DOUBLE_THRESHOLD_1)? FflasFloat : FflasDouble;
-//      case 2: return (pi < FLOAT_DOUBLE_THRESHOLD_2)? FflasFloat : FflasDouble;
-//      default: return FflasDouble;
-        
-}
-
+template <class Element>
+class FFLAS::BaseCompute {
+public:
+        template <class Field>
+        FFLAS::FFLAS_BASE operator() (const Field& F, const size_t w){
+                
+                FFLAS_INT_TYPE pi;
+                F.characteristic(pi);
+                FFLAS_BASE base;
+                switch (w) {
+                case 0: base = (pi < FLOAT_DOUBLE_THRESHOLD_0)? FflasFloat : FflasDouble;
+                        break;
+                case 1:  base = (pi < FLOAT_DOUBLE_THRESHOLD_1)? FflasFloat : FflasDouble;
+                        break;
+                case 2:  base = (pi < FLOAT_DOUBLE_THRESHOLD_2)? FflasFloat : FflasDouble;
+                        break;
+                default: base = FflasDouble;
+                        break;
+                }
+                //cerr<<"base = "<<base<<endl;
+                return base;
+                //      case 0: return (pi < FLOAT_DOUBLE_THRESHOLD_0)? FflasFloat : FflasDouble;
+                //      case 1: return (pi < FLOAT_DOUBLE_THRESHOLD_1)? FflasFloat : FflasDouble;
+                //      case 2: return (pi < FLOAT_DOUBLE_THRESHOLD_2)? FflasFloat : FflasDouble;
+                //      default: return FflasDouble;
+        }
+};
+
+template<>
+class FFLAS::BaseCompute<double> {
+public:
+        template <class Field>
+        FFLAS::FFLAS_BASE operator() (const Field& F, const size_t w){
+                return FflasDouble;
+        }
+};
+
+template<>
+class FFLAS::BaseCompute<float> {
+public:
+        template <class Field>
+        FFLAS::FFLAS_BASE operator() (const Field& F, const size_t w){
+                return FflasFloat;
+        }
+};