changeset 18:5671f96e0b5f

changed to DEBUG__printf to be consistent and easier to remember
author Some Random Person <seanhalle@yahoo.com>
date Mon, 19 Mar 2012 10:29:43 -0700
parents d0c179cdf75a
children 233fe8a5208f
files SSR_Matrix_Mult/Divide_Pr.c SSR_Matrix_Mult/Result_Pr.c SSR_Matrix_Mult/subMatrix_Pr.c main.c
diffstat 4 files changed, 8 insertions(+), 10 deletions(-) [+]
line diff
     1.1 --- a/SSR_Matrix_Mult/Divide_Pr.c	Wed Mar 14 23:22:00 2012 -0700
     1.2 +++ b/SSR_Matrix_Mult/Divide_Pr.c	Mon Mar 19 10:29:43 2012 -0700
     1.3 @@ -122,7 +122,7 @@
     1.4     SlicingStrucCarrier *slicingStrucCarrier;
     1.5     float32         *resultArray; //points to array inside result matrix
     1.6     
     1.7 -         DEBUG_Print( dbgAppFlow, "start divide\n")
     1.8 +         DEBUG__printf( dbgAppFlow, "start divide")
     1.9  
    1.10           int32
    1.11           divideProbe = VMS_App__create_single_interval_probe( "divideProbe",
    1.12 @@ -155,7 +155,7 @@
    1.13         (float32)rightMatrix->numCols  < NUM_CELLS_IN_SEQUENTIAL_CUTOFF )
    1.14      {
    1.15        //====== Do sequential multiply on a single core
    1.16 -            DEBUG_Print( dbgAppFlow, "doing sequential")
    1.17 +            DEBUG__printf( dbgAppFlow, "doing sequential")
    1.18              
    1.19           //transpose the right matrix
    1.20        float32 *
    1.21 @@ -194,7 +194,7 @@
    1.22        resultsParams->numRows     = leftMatrix->numRows;
    1.23        resultsParams->resultArray = resultArray;
    1.24  
    1.25 -
    1.26 +            DEBUG__printf(dbgAppFlow,"**create result Pr**")
    1.27        resultPr =
    1.28           SSR__create_procr_with( &gatherResults, resultsParams, animPr);
    1.29  
    1.30 @@ -214,7 +214,7 @@
    1.31     //===============  Work done -- send results back =================
    1.32  
    1.33  
    1.34 -         DEBUG_Print( dbgAppFlow, "end divide\n")
    1.35 +         DEBUG__printf( dbgAppFlow, "end divide")
    1.36  
    1.37           VMS_App__record_interval_end_in_probe( divideProbe );
    1.38           VMS_App__print_stats_of_all_probes();
     2.1 --- a/SSR_Matrix_Mult/Result_Pr.c	Wed Mar 14 23:22:00 2012 -0700
     2.2 +++ b/SSR_Matrix_Mult/Result_Pr.c	Mon Mar 19 10:29:43 2012 -0700
     2.3 @@ -34,7 +34,7 @@
     2.4     void           *msg;
     2.5     SMPairParams   *resParams;
     2.6  
     2.7 -         DEBUG_Print( dbgAppFlow, "start resultPr\n")
     2.8 +         DEBUG__printf( dbgAppFlow, "**resultPr started**");
     2.9           
    2.10     params    = (ResultsParams *)_params;
    2.11     dividerPr = params->dividerPr;
     3.1 --- a/SSR_Matrix_Mult/subMatrix_Pr.c	Wed Mar 14 23:22:00 2012 -0700
     3.2 +++ b/SSR_Matrix_Mult/subMatrix_Pr.c	Mon Mar 19 10:29:43 2012 -0700
     3.3 @@ -51,7 +51,7 @@
     3.4     float32        *leftArray,  *rightArray, *resArray;
     3.5     SubMatrix      *leftSubMatrix, *rightSubMatrix;
     3.6  
     3.7 -         DEBUG_Print1(dbgAppFlow, "start sub-matrix mult: %d\n", animatingPr->slaveID)
     3.8 +         DEBUG__printf1(dbgAppFlow, "start sub-matrix mult: %d", animatingPr->slaveID)
     3.9           #ifdef TURN_ON_DEBUG_PROBES
    3.10           int32 subMatrixProbe = VMS_App__create_single_interval_probe( "subMtx",
    3.11                                                                  animatingPr);
     4.1 --- a/main.c	Wed Mar 14 23:22:00 2012 -0700
     4.2 +++ b/main.c	Mon Mar 19 10:29:43 2012 -0700
     4.3 @@ -11,8 +11,6 @@
     4.4  #include "Matrix_Mult.h"
     4.5  #include "SSR_Matrix_Mult/SSR_Matrix_Mult.h"
     4.6  
     4.7 -char __ProgramName[] = "Blocked Matrix Multiply";
     4.8 -char __DataSet[255];
     4.9  /**
    4.10   * 
    4.11   */
    4.12 @@ -20,7 +18,7 @@
    4.13   { Matrix      *leftMatrix, *rightMatrix, *resultMatrix;
    4.14     ParamBag    *paramBag;
    4.15     
    4.16 -   printf( "arguments: %s | %s\n", argv[0], argv[1] );
    4.17 +   DEBUG__printf2(TRUE, "arguments: %s | %s", argv[0], argv[1] );
    4.18  
    4.19     paramBag = makeParamBag();
    4.20     readParamFileIntoBag( argv[1], paramBag );
    4.21 @@ -30,7 +28,7 @@
    4.22  
    4.23     printf("\nresult matrix: \n");
    4.24     printMatrix( resultMatrix );
    4.25 -//   SSR__print_stats();
    4.26 +   
    4.27     fflush(stdin);
    4.28     
    4.29     exit(0); //cleans up