1.1 --- a/src/Application/CILK__Matrix_Mult/CILK__Matrix_Mult.h	Mon Sep 20 17:11:58 2010 -0700
     1.2 +++ b/src/Application/CILK__Matrix_Mult/CILK__Matrix_Mult.h	Tue Oct 26 19:32:46 2010 -0700
     1.3 @@ -8,7 +8,7 @@
     1.4  
     1.5  #include <stdio.h>
     1.6  
     1.7 -#include "../../VPThread__lib/VPThread.h"
     1.8 +#include "VMS_primitive_data_types.h"
     1.9  #include "../Matrix_Mult.h"
    1.10  
    1.11  //==============================  Structures  ==============================
    1.12 @@ -22,14 +22,13 @@
    1.13  
    1.14  typedef struct
    1.15   {
    1.16 -   VirtProcr *dividerThd;
    1.17     int numRows;
    1.18     int numCols;
    1.19   }
    1.20  ResultsParams;
    1.21  
    1.22  typedef struct
    1.23 - { VirtProcr *resultsThd;
    1.24 + { 
    1.25     int        myCol;
    1.26     int        myRow;
    1.27     int        vectLength;
    1.28 @@ -62,13 +61,13 @@
    1.29  
    1.30  
    1.31  //============================= Processor Functions =========================
    1.32 -void divideIntoVectors( void *data, VirtProcr *animatingPr );
    1.33 -void calcVector(        void *data, VirtProcr *animatingPr );
    1.34 -void gatherResults(     void *data, VirtProcr *animatingPr );
    1.35 +//cilk void divideIntoVectors( void *data );
    1.36 +//cilk float32 calcVector(     void *data );
    1.37 +
    1.38  
    1.39  
    1.40  //================================ Entry Point ==============================
    1.41 -Matrix *
    1.42 +//cilk Matrix *\
    1.43  multiplyTheseMatrices( Matrix *leftMatrix, Matrix *rightMatrix );
    1.44  
    1.45  

     2.1 --- a/src/Application/Matrix_Mult.c	Mon Sep 20 17:11:58 2010 -0700
     2.2 +++ b/src/Application/Matrix_Mult.c	Tue Oct 26 19:32:46 2010 -0700
     2.3 @@ -69,7 +69,7 @@
     2.4     for( row = 0; row < numRows; row++ )
     2.5      {
     2.6        if( feof( file ) )  printf( "file ran out too soon" );
     2.7 -      maxRead = getline( &line, &lineSz, file );
     2.8 +      maxRead = myGetline( &line, &lineSz, file );
     2.9        if( maxRead == -1 ) printf( "prob reading mat line");
    2.10        
    2.11        if( *line == '\n') continue; //blank line

     3.1 --- a/src/Application/Matrix_Mult.h	Mon Sep 20 17:11:58 2010 -0700
     3.2 +++ b/src/Application/Matrix_Mult.h	Tue Oct 26 19:32:46 2010 -0700
     3.3 @@ -10,7 +10,7 @@
     3.4  #include <unistd.h>
     3.5  #include <malloc.h>
     3.6  
     3.7 -#include "../VPThread__lib/VMS/VMS_primitive_data_types.h"
     3.8 +#include "CILK__Matrix_Mult/VMS_primitive_data_types.h"
     3.9  #include "ParamHelper/Param.h"
    3.10  
    3.11  //==============================  Structures  ==============================