# HG changeset patch # User Some Random Person # Date 1332178183 25200 # Node ID 5671f96e0b5f8bcc6295b337a9c754c703bfea76 # Parent d0c179cdf75a2c8192a7c3ce242d44fc58fc6018 changed to DEBUG__printf to be consistent and easier to remember diff -r d0c179cdf75a -r 5671f96e0b5f SSR_Matrix_Mult/Divide_Pr.c --- a/SSR_Matrix_Mult/Divide_Pr.c Wed Mar 14 23:22:00 2012 -0700 +++ b/SSR_Matrix_Mult/Divide_Pr.c Mon Mar 19 10:29:43 2012 -0700 @@ -122,7 +122,7 @@ SlicingStrucCarrier *slicingStrucCarrier; float32 *resultArray; //points to array inside result matrix - DEBUG_Print( dbgAppFlow, "start divide\n") + DEBUG__printf( dbgAppFlow, "start divide") int32 divideProbe = VMS_App__create_single_interval_probe( "divideProbe", @@ -155,7 +155,7 @@ (float32)rightMatrix->numCols < NUM_CELLS_IN_SEQUENTIAL_CUTOFF ) { //====== Do sequential multiply on a single core - DEBUG_Print( dbgAppFlow, "doing sequential") + DEBUG__printf( dbgAppFlow, "doing sequential") //transpose the right matrix float32 * @@ -194,7 +194,7 @@ resultsParams->numRows = leftMatrix->numRows; resultsParams->resultArray = resultArray; - + DEBUG__printf(dbgAppFlow,"**create result Pr**") resultPr = SSR__create_procr_with( &gatherResults, resultsParams, animPr); @@ -214,7 +214,7 @@ //=============== Work done -- send results back ================= - DEBUG_Print( dbgAppFlow, "end divide\n") + DEBUG__printf( dbgAppFlow, "end divide") VMS_App__record_interval_end_in_probe( divideProbe ); VMS_App__print_stats_of_all_probes(); diff -r d0c179cdf75a -r 5671f96e0b5f SSR_Matrix_Mult/Result_Pr.c --- a/SSR_Matrix_Mult/Result_Pr.c Wed Mar 14 23:22:00 2012 -0700 +++ b/SSR_Matrix_Mult/Result_Pr.c Mon Mar 19 10:29:43 2012 -0700 @@ -34,7 +34,7 @@ void *msg; SMPairParams *resParams; - DEBUG_Print( dbgAppFlow, "start resultPr\n") + DEBUG__printf( dbgAppFlow, "**resultPr started**"); params = (ResultsParams *)_params; dividerPr = params->dividerPr; diff -r d0c179cdf75a -r 5671f96e0b5f SSR_Matrix_Mult/subMatrix_Pr.c --- a/SSR_Matrix_Mult/subMatrix_Pr.c Wed Mar 14 23:22:00 2012 -0700 +++ b/SSR_Matrix_Mult/subMatrix_Pr.c Mon Mar 19 10:29:43 2012 -0700 @@ -51,7 +51,7 @@ float32 *leftArray, *rightArray, *resArray; SubMatrix *leftSubMatrix, *rightSubMatrix; - DEBUG_Print1(dbgAppFlow, "start sub-matrix mult: %d\n", animatingPr->slaveID) + DEBUG__printf1(dbgAppFlow, "start sub-matrix mult: %d", animatingPr->slaveID) #ifdef TURN_ON_DEBUG_PROBES int32 subMatrixProbe = VMS_App__create_single_interval_probe( "subMtx", animatingPr); diff -r d0c179cdf75a -r 5671f96e0b5f main.c --- a/main.c Wed Mar 14 23:22:00 2012 -0700 +++ b/main.c Mon Mar 19 10:29:43 2012 -0700 @@ -11,8 +11,6 @@ #include "Matrix_Mult.h" #include "SSR_Matrix_Mult/SSR_Matrix_Mult.h" -char __ProgramName[] = "Blocked Matrix Multiply"; -char __DataSet[255]; /** * */ @@ -20,7 +18,7 @@ { Matrix *leftMatrix, *rightMatrix, *resultMatrix; ParamBag *paramBag; - printf( "arguments: %s | %s\n", argv[0], argv[1] ); + DEBUG__printf2(TRUE, "arguments: %s | %s", argv[0], argv[1] ); paramBag = makeParamBag(); readParamFileIntoBag( argv[1], paramBag ); @@ -30,7 +28,7 @@ printf("\nresult matrix: \n"); printMatrix( resultMatrix ); -// SSR__print_stats(); + fflush(stdin); exit(0); //cleans up