# HG changeset patch # User Some Random Person # Date 1331658420 25200 # Node ID a8a3d98e1af407140b4e5bdaa291df8080ac221a # Parent 2fd4383be82d5019f0863fcbcacb524c04b838ab Compiles, but does not yet run properly diff -r 2fd4383be82d -r a8a3d98e1af4 Matrix_Mult.h --- a/Matrix_Mult.h Sat Mar 10 20:35:37 2012 -0800 +++ b/Matrix_Mult.h Tue Mar 13 10:07:00 2012 -0700 @@ -15,8 +15,7 @@ //============================== Structures ============================== -typedef -struct +typedef struct { int32 numRows; int32 numCols; float32 *array; //2D, but dynamically sized, so use addr arith @@ -31,8 +30,7 @@ * the correct type to tell the compiler how to access fields. * This keeps all app-specific things out of the DKU directory, as per the * DKU standard. */ -typedef -struct +typedef struct { // pointers to shared data.. the result matrix must be created when the // left and right matrices are put into the root ancestor DKUPiece. diff -r 2fd4383be82d -r a8a3d98e1af4 SSR_Matrix_Mult/Divide_Pr.c --- a/SSR_Matrix_Mult/Divide_Pr.c Sat Mar 10 20:35:37 2012 -0800 +++ b/SSR_Matrix_Mult/Divide_Pr.c Tue Mar 13 10:07:00 2012 -0700 @@ -7,9 +7,9 @@ */ -#include "SSR_Matrix_Mult.h" #include #include +#include "SSR_Matrix_Mult.h" //The time to compute this many result values should equal the time to // perform this division on a matrix of size gives that many result calcs @@ -559,7 +559,7 @@ } -int inline +inline int measureMatrixMultPrimitive( SlaveVP *animPr ) { int r, c, v, numCycles; @@ -600,3 +600,4 @@ return numCycles; } + diff -r 2fd4383be82d -r a8a3d98e1af4 SSR_Matrix_Mult/SSR_Matrix_Mult.h --- a/SSR_Matrix_Mult/SSR_Matrix_Mult.h Sat Mar 10 20:35:37 2012 -0800 +++ b/SSR_Matrix_Mult/SSR_Matrix_Mult.h Tue Mar 13 10:07:00 2012 -0700 @@ -39,8 +39,7 @@ } ResultsParams; -typedef -struct +typedef struct { int32 numRows; int32 numCols; Matrix *origMatrix; @@ -55,22 +54,20 @@ SubMatrix; typedef struct - { SlaveVP *resultPr; + { SlaveVP *resultPr; SubMatrix *leftSubMatrix; SubMatrix *rightSubMatrix; float32 *partialResultArray; } SMPairParams; -typedef -struct +typedef struct { int32 numVals; int32 *startVals; } SlicingStruc; -typedef -struct +typedef struct { SlicingStruc *leftRowSlices; SlicingStruc *vecSlices;