Mercurial > cgi-bin > hgwebdir.cgi > PR > Applications > Vthread > Vthread__Blocked_Matrix_Mult__Bench

changeset 14:2e8285290937 V0

find changesets by author, revision, files, or words in the commit message
merging wrong commit
author Merten Sach <msach@mailbox.tu-berlin.de>
date Fri, 16 Sep 2011 20:15:07 +0200
parents e27175b02fd3 f8d3f16e70c8
children
files
diffstat 3 files changed, 15 insertions(+), 2 deletions(-) [+]
line diff
     1.1 --- a/src/Application/VPThread__Matrix_Mult/Divide_Pr.c	Tue Jul 26 16:34:48 2011 +0200
     1.2 +++ b/src/Application/VPThread__Matrix_Mult/Divide_Pr.c	Fri Sep 16 20:15:07 2011 +0200
     1.3 @@ -56,6 +56,17 @@
     1.4              SlicingStrucCarrier *slicingStrucCarrier,
     1.5              VirtProcr *resultPr, VirtProcr *animatingPr );
     1.6  
     1.7 +void inline
     1.8 +copyTranspose( int32 numRows, int32 numCols,
     1.9 +               int32 origStartRow, int32 origStartCol, int32 origStride,
    1.10 +               float32 *subArray, float32 *origArray );
    1.11 +
    1.12 +void inline
    1.13 +multiplyMatrixArraysTransposed( int32 vecLength, int32 numResRows,
    1.14 +                                int32 numResCols,
    1.15 +                                float32 *leftArray, float32 *rightArray,
    1.16 +                                float32 *resArray );
    1.17 +
    1.18  
    1.19  
    1.20  /*Divider creates one processor for every sub-matrix

     2.1 --- a/src/Application/VPThread__Matrix_Mult/subMatrix_Pr.c	Tue Jul 26 16:34:48 2011 +0200
     2.2 +++ b/src/Application/VPThread__Matrix_Mult/subMatrix_Pr.c	Fri Sep 16 20:15:07 2011 +0200
     2.3 @@ -10,7 +10,8 @@
     2.4  
     2.5  #include "VPThread__Matrix_Mult.h"
     2.6  
     2.7 -
     2.8 +//Declarations
     2.9 +//===================================================
    2.10  
    2.11  void inline
    2.12  copyFromOrig( SubMatrix *subMatrix, VirtProcr *animPr );
    2.13 @@ -31,6 +32,7 @@
    2.14                        float32 *leftArray, float32 *rightArray,
    2.15                        float32 *resArray );
    2.16  
    2.17 +//===================================================
    2.18  
    2.19  /*A  processor is created with an environment that holds two matrices,
    2.20   * the row and col that it owns, and the name of a result gathering

     3.1 --- a/src/Application/main.c	Tue Jul 26 16:34:48 2011 +0200
     3.2 +++ b/src/Application/main.c	Fri Sep 16 20:15:07 2011 +0200
     3.3 @@ -16,7 +16,7 @@
     3.4  
     3.5  void printParams(ParamBag *paramBag)
     3.6  {
     3.7 -    snprintf(&__DataSet, 255,
     3.8 +    snprintf((char*)&__DataSet, 255,
     3.9                  "#\tLeft Matrix %d x %d,\n#\tRight Matrix %d x %d",
    3.10                  getParamFromBag("leftMatrixRows", paramBag)->intValue,
    3.11                  getParamFromBag("leftMatrixCols", paramBag)->intValue,