[gentoo-commits] proj/auto-numerical-bench:newinterfaces commit in: NumericInterface/NI_internal/, btl/NumericInterface/NI_internal/, ...

[Andrea Arteaga]

commit:     f553faebe10b3ccd17206181dfe9d31bd33a8ba7
Author:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
AuthorDate: Sat Sep 29 10:23:02 2012 +0000
Commit:     Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Sat Sep 29 10:23:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/auto-numerical-bench.git;a=commit;h=f553faeb

Updated the (C)BLAS module to use the new interfaces.

---
 .../NI_internal/CDeclarations.hpp                  |    0
 .../NumericInterface}/NI_internal/CInterface.hpp   |    0
 .../NI_internal/FortranDeclarations.hpp            |    0
 .../NI_internal/FortranInterface.hpp               |    8 +-
 .../NumericInterface}/NI_internal/utils.hpp        |    0
 .../NumericInterface}/NumericInterface.hpp         |    0
 btl/actions/action_rot.hpp                         |    2 +-
 btl/libs/BLAS/main.cpp                             |   87 +++++++++++++++++--
 numbench/modules/__init__.py                       |    1 +
 numbench/modules/internal/blasBase.py              |    2 +-
 numbench/utils/btl.py                              |    3 +-
 11 files changed, 87 insertions(+), 16 deletions(-)

diff --git a/NumericInterface/NI_internal/CDeclarations.hpp b/btl/NumericInterface/NI_internal/CDeclarations.hpp
similarity index 100%
rename from NumericInterface/NI_internal/CDeclarations.hpp
rename to btl/NumericInterface/NI_internal/CDeclarations.hpp

diff --git a/NumericInterface/NI_internal/CInterface.hpp b/btl/NumericInterface/NI_internal/CInterface.hpp
similarity index 100%
rename from NumericInterface/NI_internal/CInterface.hpp
rename to btl/NumericInterface/NI_internal/CInterface.hpp

diff --git a/NumericInterface/NI_internal/FortranDeclarations.hpp b/btl/NumericInterface/NI_internal/FortranDeclarations.hpp
similarity index 100%
rename from NumericInterface/NI_internal/FortranDeclarations.hpp
rename to btl/NumericInterface/NI_internal/FortranDeclarations.hpp

diff --git a/NumericInterface/NI_internal/FortranInterface.hpp b/btl/NumericInterface/NI_internal/FortranInterface.hpp
similarity index 97%
rename from NumericInterface/NI_internal/FortranInterface.hpp
rename to btl/NumericInterface/NI_internal/FortranInterface.hpp
index ab20783..576145d 100644
--- a/NumericInterface/NI_internal/FortranInterface.hpp
+++ b/btl/NumericInterface/NI_internal/FortranInterface.hpp
@@ -24,6 +24,10 @@
 
 #define FORTFUNC(F) CAT(CAT(NI_SCALARPREFIX, F), _)
 
+#ifndef NI_NAME
+#  define NI_NAME CAT(CAT(FortranInterface,$),NI_SCALAR)
+#endif
+
 
 template<>
 class NumericInterface<NI_SCALAR>
@@ -40,9 +44,7 @@ public:
 public:
     static std::string name()
     {
-        std::string name = "FortranInterface<";
-        name += MAKE_STRING(NI_SCALAR);
-        name += ">";
+        std::string name = MAKE_STRING(NI_NAME);
         return name;
     }
 

diff --git a/NumericInterface/NI_internal/utils.hpp b/btl/NumericInterface/NI_internal/utils.hpp
similarity index 100%
rename from NumericInterface/NI_internal/utils.hpp
rename to btl/NumericInterface/NI_internal/utils.hpp

diff --git a/NumericInterface/NumericInterface.hpp b/btl/NumericInterface/NumericInterface.hpp
similarity index 100%
rename from NumericInterface/NumericInterface.hpp
rename to btl/NumericInterface/NumericInterface.hpp

diff --git a/btl/actions/action_rot.hpp b/btl/actions/action_rot.hpp
index 93cba4e..574254a 100644
--- a/btl/actions/action_rot.hpp
+++ b/btl/actions/action_rot.hpp
@@ -50,7 +50,7 @@ public:
     }
 
     double fpo() {
-        return 2*double(_size);
+        return 6*double(_size);
     }
 
     inline void initialize(){

diff --git a/btl/libs/BLAS/main.cpp b/btl/libs/BLAS/main.cpp
index da156b8..9f43464 100644
--- a/btl/libs/BLAS/main.cpp
+++ b/btl/libs/BLAS/main.cpp
@@ -17,9 +17,14 @@
 //
 
 // Include the numeric interface
-#define NI_FORTRAN
+#ifdef NI_BLAS
+#  define NI_FORTRAN
+#endif
+
 #include "NumericInterface.hpp"
 
+typedef NumericInterface<double> Interface;
+
 // Include the BTL
 #include "utilities.h"
 #include "bench.hh"
@@ -28,20 +33,82 @@
 #include "actionsBLAS.hpp"
 
 #include <string>
+#include <iostream>
+
+using namespace std;
 
 BTL_MAIN;
 
 int main(int argv, char **argc)
 {
-    bench<Action_axpy<NumericInterface<double> > >(4, 6000, 20);
-    bench<Action_rot<NumericInterface<double> > >(4, 6000, 20);
-
-    bench<Action_MatrixVector<NumericInterface<double> > >(4, 2000, 20);
-    bench<Action_MatrixTVector<NumericInterface<double> > >(4, 2000, 20);
-    bench<Action_SymMatrixVector<NumericInterface<double> > >(4, 2000, 20);
-    bench<Action_TriSolveVector<NumericInterface<double> > >(4, 2000, 20);
-    bench<Action_Rank1Update<NumericInterface<double> > >(4, 2000, 20);
-    bench<Action_Rank2Update<NumericInterface<double> > >(4, 2000, 20);
+    bool
+    do_axpy=false, do_rot=false,
+
+    do_MatrixVector=false, do_MatrixTVector=false, do_SymMatrixVector=false,
+    do_Rank1Update=false, do_Rank2Update=false, do_TriSolveVector=false,
+
+    do_MatrixMatrix=false, do_MatrixTMatrix=false,
+    do_TriMatrixMatrix=false, do_TriSolveMatrix=false
+    ;
+
+    int N = 100;
+
+
+    for (int i = 1; i < argv; ++i) {
+      std::string arg = argc[i];
+
+      if (arg == "axpy") do_axpy = true;
+      else if (arg == "rot") do_rot = true;
+
+      else if (arg == "MatrixVector") do_MatrixVector = true;
+      else if (arg == "MatrixTVector") do_MatrixTVector = true;
+      else if (arg == "SymMatrixVector") do_SymMatrixVector = true;
+      else if (arg == "Rank1Update") do_Rank1Update = true;
+      else if (arg == "Rank2Update") do_Rank2Update = true;
+      else if (arg == "TriSolveVector") do_TriSolveVector = true;
+
+      else if (arg == "MatrixMatrix") do_MatrixMatrix = true;
+      else if (arg == "MatrixTMatrix") do_MatrixTMatrix = true;
+      else if (arg == "TriMatrixMatrix") do_TriMatrixMatrix = true;
+      else if (arg == "TrisolveMatrix") do_TriSolveMatrix = true;
+
+      // Check switch -N
+      else if (arg[0] == '-' && arg[1] == 'N') {
+          if (arg[2] != '\0')
+              N = atoi(arg.c_str()+2);
+          else
+              N = atoi(argc[++i]);
+      }
+    }
+
+    if (do_axpy)
+    bench<Action_axpy<Interface> >(MIN_AXPY,MAX_AXPY, N);
+    if (do_rot)
+    bench<Action_rot<Interface> >(MIN_AXPY,MAX_AXPY, N);
+
+    if (do_MatrixVector)
+    bench<Action_MatrixVector<Interface> >(MIN_MV,MAX_MV, N);
+    if (do_MatrixTVector)
+    bench<Action_MatrixTVector<Interface> >(MIN_MV,MAX_MV, N);
+    if (do_SymMatrixVector)
+    bench<Action_SymMatrixVector<Interface> >(MIN_MV,MAX_MV, N);
+    if (do_Rank1Update)
+    bench<Action_Rank1Update<Interface> >(MIN_MV,MAX_MV, N);
+    if (do_Rank2Update)
+    bench<Action_Rank2Update<Interface> >(MIN_MV,MAX_MV, N);
+    if (do_TriSolveVector)
+    bench<Action_TriSolveVector<Interface> >(MIN_MM,MAX_MM, N);
+
+    /*
+    if (matrix_matrix)
+    bench<Action_matrix_matrix_product<Interface> >(MIN_MM,MAX_MM, N);
+    if (aat)
+    bench<Action_aat_product<Interface> >(MIN_MM,MAX_MM, N);
+    if (trisolve_matrix)
+    bench<Action_trisolve_matrix<Interface> >(MIN_MM,MAX_MM, N);
+    if (trmm)
+    bench<Action_trmm<Interface> >(MIN_MM,MAX_MM, N);
+    */
 
 
   return 0;

diff --git a/numbench/modules/__init__.py b/numbench/modules/__init__.py
index ba077a6..5b7cd3c 100644
--- a/numbench/modules/__init__.py
+++ b/numbench/modules/__init__.py
@@ -51,6 +51,7 @@ def loadModule(modname, args=None):
 
     # Get the arguments string
     args = "" if args is None else args
+    args = tuple(args) if type(args) == type([]) else args
     args = args if type(args) == type(()) else tuple(args.split(' '))
 
     # Load the module

diff --git a/numbench/modules/internal/blasBase.py b/numbench/modules/internal/blasBase.py
index bf2faf5..fa88ed5 100644
--- a/numbench/modules/internal/blasBase.py
+++ b/numbench/modules/internal/blasBase.py
@@ -65,7 +65,7 @@ def runTest(self, test, implementation):
       logdir=pjoin(test['logdir'], implementation),
       testdir=pjoin(test['testdir'], implementation),
       btlincludes=('libs/BLAS',),
-      defines=("CBLASNAME=" + self.libname, self.libname.upper() + "_INTERFACE"),
+      defines = ("NI_NAME=" + self.libname, "NI_" + self.libname.upper()),
       flags=alt.getFlags(test, self.libname, implementation),
       tests=self.tests
     )

diff --git a/numbench/utils/btl.py b/numbench/utils/btl.py
index 6801299..cc0a7fe 100644
--- a/numbench/utils/btl.py
+++ b/numbench/utils/btl.py
@@ -23,7 +23,8 @@ from os.path import join as pjoin, dirname
 import os, re, shlex, subprocess as sp
 
 # BTL global flags
-btlincludes = ('actions','generic_bench','generic_bench/utils','libs/STL')
+btlincludes = ('actions', 'generic_bench', 'generic_bench/utils',
+               'NumericInterface')
 btllibraries = ('rt',)
 btldefines = ('NDEBUG',)