# HG changeset patch
# User Me
# Date 1288146766 25200
# Node ID dd5387f362f696693f2f56f69b963e421209cb71
# Parent  b17ddcc97ffc28fc13f8e6928af45ab6525f2d0c
working version

diff -r b17ddcc97ffc -r dd5387f362f6 src/Application/CILK__Matrix_Mult/CILK__Matrix_Mult.h
--- a/src/Application/CILK__Matrix_Mult/CILK__Matrix_Mult.h	Mon Sep 20 17:11:58 2010 -0700
+++ b/src/Application/CILK__Matrix_Mult/CILK__Matrix_Mult.h	Tue Oct 26 19:32:46 2010 -0700
@@ -8,7 +8,7 @@
 
 #include <stdio.h>
 
-#include "../../VPThread__lib/VPThread.h"
+#include "VMS_primitive_data_types.h"
 #include "../Matrix_Mult.h"
 
 //==============================  Structures  ==============================
@@ -22,14 +22,13 @@
 
 typedef struct
  {
-   VirtProcr *dividerThd;
    int numRows;
    int numCols;
  }
 ResultsParams;
 
 typedef struct
- { VirtProcr *resultsThd;
+ { 
    int        myCol;
    int        myRow;
    int        vectLength;
@@ -62,13 +61,13 @@
 
 
 //============================= Processor Functions =========================
-void divideIntoVectors( void *data, VirtProcr *animatingPr );
-void calcVector(        void *data, VirtProcr *animatingPr );
-void gatherResults(     void *data, VirtProcr *animatingPr );
+//cilk void divideIntoVectors( void *data );
+//cilk float32 calcVector(     void *data );
+
 
 
 //================================ Entry Point ==============================
-Matrix *
+//cilk Matrix *\
 multiplyTheseMatrices( Matrix *leftMatrix, Matrix *rightMatrix );
 
 
diff -r b17ddcc97ffc -r dd5387f362f6 src/Application/Matrix_Mult.c
--- a/src/Application/Matrix_Mult.c	Mon Sep 20 17:11:58 2010 -0700
+++ b/src/Application/Matrix_Mult.c	Tue Oct 26 19:32:46 2010 -0700
@@ -69,7 +69,7 @@
    for( row = 0; row < numRows; row++ )
     {
       if( feof( file ) )  printf( "file ran out too soon" );
-      maxRead = getline( &line, &lineSz, file );
+      maxRead = myGetline( &line, &lineSz, file );
       if( maxRead == -1 ) printf( "prob reading mat line");
       
       if( *line == '\n') continue; //blank line
diff -r b17ddcc97ffc -r dd5387f362f6 src/Application/Matrix_Mult.h
--- a/src/Application/Matrix_Mult.h	Mon Sep 20 17:11:58 2010 -0700
+++ b/src/Application/Matrix_Mult.h	Tue Oct 26 19:32:46 2010 -0700
@@ -10,7 +10,7 @@
 #include <unistd.h>
 #include <malloc.h>
 
-#include "../VPThread__lib/VMS/VMS_primitive_data_types.h"
+#include "CILK__Matrix_Mult/VMS_primitive_data_types.h"
 #include "ParamHelper/Param.h"
 
 //==============================  Structures  ==============================