changeset 15:a8a3d98e1af4

Compiles, but does not yet run properly
author Some Random Person <seanhalle@yahoo.com>
date Tue, 13 Mar 2012 10:07:00 -0700
parents 2fd4383be82d
children c90753be66bd
files Matrix_Mult.h SSR_Matrix_Mult/Divide_Pr.c SSR_Matrix_Mult/SSR_Matrix_Mult.h
diffstat 3 files changed, 9 insertions(+), 13 deletions(-) [+]
line diff
     1.1 --- a/Matrix_Mult.h	Sat Mar 10 20:35:37 2012 -0800
     1.2 +++ b/Matrix_Mult.h	Tue Mar 13 10:07:00 2012 -0700
     1.3 @@ -15,8 +15,7 @@
     1.4  
     1.5  //==============================  Structures  ==============================
     1.6  
     1.7 -typedef
     1.8 -struct
     1.9 +typedef struct
    1.10   { int32 numRows;
    1.11     int32 numCols;
    1.12     float32 *array;  //2D, but dynamically sized, so use addr arith
    1.13 @@ -31,8 +30,7 @@
    1.14   *  the correct type to tell the compiler how to access fields.
    1.15   * This keeps all app-specific things out of the DKU directory, as per the
    1.16   *  DKU standard. */
    1.17 -typedef
    1.18 -struct
    1.19 +typedef struct
    1.20   { 
    1.21        // pointers to shared data..  the result matrix must be created when the
    1.22        //  left and right matrices are put into the root ancestor DKUPiece.
     2.1 --- a/SSR_Matrix_Mult/Divide_Pr.c	Sat Mar 10 20:35:37 2012 -0800
     2.2 +++ b/SSR_Matrix_Mult/Divide_Pr.c	Tue Mar 13 10:07:00 2012 -0700
     2.3 @@ -7,9 +7,9 @@
     2.4   */
     2.5  
     2.6  
     2.7 -#include "SSR_Matrix_Mult.h"
     2.8  #include <math.h>
     2.9  #include <string.h>
    2.10 +#include "SSR_Matrix_Mult.h"
    2.11  
    2.12     //The time to compute this many result values should equal the time to
    2.13     // perform this division on a matrix of size gives that many result calcs
    2.14 @@ -559,7 +559,7 @@
    2.15   }
    2.16  
    2.17  
    2.18 -int inline
    2.19 +inline int
    2.20  measureMatrixMultPrimitive( SlaveVP *animPr )
    2.21   {
    2.22     int r, c, v, numCycles;
    2.23 @@ -600,3 +600,4 @@
    2.24  
    2.25     return numCycles;
    2.26   }
    2.27 +
     3.1 --- a/SSR_Matrix_Mult/SSR_Matrix_Mult.h	Sat Mar 10 20:35:37 2012 -0800
     3.2 +++ b/SSR_Matrix_Mult/SSR_Matrix_Mult.h	Tue Mar 13 10:07:00 2012 -0700
     3.3 @@ -39,8 +39,7 @@
     3.4   }
     3.5  ResultsParams;
     3.6  
     3.7 -typedef
     3.8 -struct
     3.9 +typedef struct
    3.10   { int32    numRows;
    3.11     int32    numCols;
    3.12     Matrix  *origMatrix;
    3.13 @@ -55,22 +54,20 @@
    3.14  SubMatrix;
    3.15  
    3.16  typedef struct
    3.17 - { SlaveVP *resultPr;
    3.18 + { SlaveVP   *resultPr;
    3.19     SubMatrix *leftSubMatrix;
    3.20     SubMatrix *rightSubMatrix;
    3.21     float32   *partialResultArray;
    3.22   }
    3.23  SMPairParams;
    3.24  
    3.25 -typedef
    3.26 -struct
    3.27 +typedef struct
    3.28   { int32    numVals;
    3.29     int32   *startVals;
    3.30   }
    3.31  SlicingStruc;
    3.32  
    3.33 -typedef
    3.34 -struct
    3.35 +typedef struct
    3.36   {
    3.37     SlicingStruc *leftRowSlices;
    3.38     SlicingStruc *vecSlices;