changeset 16:c90753be66bd

More progress towards getting common_ancestor working
author Some Random Person <seanhalle@yahoo.com>
date Tue, 13 Mar 2012 18:31:04 -0700
parents a8a3d98e1af4
children d0c179cdf75a
files SSR_Matrix_Mult/Divide_Pr.c SSR_Matrix_Mult/subMatrix_Pr.c
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line diff
     1.1 --- a/SSR_Matrix_Mult/Divide_Pr.c	Tue Mar 13 10:07:00 2012 -0700
     1.2 +++ b/SSR_Matrix_Mult/Divide_Pr.c	Tue Mar 13 18:31:04 2012 -0700
     1.3 @@ -360,7 +360,7 @@
     1.4     int32 leftRowIdxOffset;
     1.5     SMPairParams *subMatrixPairParams;
     1.6     float32 numToPutOntoEachCore, leftOverFraction;
     1.7 -   int32 numCores, coreToScheduleOnto, numVecOnCurrCore;
     1.8 +   int32 numCores, coreToAssignOnto, numVecOnCurrCore;
     1.9  
    1.10     numLeftColIdxs  = numColIdxs;
    1.11     numRightColIdxs = numVecIdxs;
    1.12 @@ -370,7 +370,7 @@
    1.13     numToPutOntoEachCore = numRowIdxs*numColIdxs/numCores;
    1.14     leftOverFraction = 0;
    1.15     numVecOnCurrCore = 0;
    1.16 -   coreToScheduleOnto = 0;
    1.17 +   coreToAssignOnto = 0;
    1.18  
    1.19     for( resRowIdx = 0; resRowIdx < numRowIdxs; resRowIdx++ )
    1.20      {
    1.21 @@ -396,7 +396,7 @@
    1.22              SSR__create_procr_with_affinity( &calcSubMatrixProduct,
    1.23                                               subMatrixPairParams,
    1.24                                               animatingPr,
    1.25 -                                             coreToScheduleOnto );
    1.26 +                                             coreToAssignOnto );
    1.27            }
    1.28  
    1.29              //Trying to distribute the subMatrix-vectors across the cores, so
    1.30 @@ -416,11 +416,11 @@
    1.31               { numVecOnCurrCore = 0;
    1.32               }
    1.33                 //Move to next core, max core-value to incr to is numCores -1
    1.34 -            if( coreToScheduleOnto >= numCores -1 )
    1.35 -             { coreToScheduleOnto = 0;
    1.36 +            if( coreToAssignOnto >= numCores -1 )
    1.37 +             { coreToAssignOnto = 0;
    1.38               }
    1.39              else
    1.40 -             { coreToScheduleOnto += 1;
    1.41 +             { coreToAssignOnto += 1;
    1.42               }
    1.43            }
    1.44   
     2.1 --- a/SSR_Matrix_Mult/subMatrix_Pr.c	Tue Mar 13 10:07:00 2012 -0700
     2.2 +++ b/SSR_Matrix_Mult/subMatrix_Pr.c	Tue Mar 13 18:31:04 2012 -0700
     2.3 @@ -38,7 +38,7 @@
     2.4   *It calculates the product of two sub-portions of the input matrices
     2.5   * by using Intel's mkl library for single-core.
     2.6   *
     2.7 - *This demonstrates using optimized single-threaded code inside scheduled
     2.8 + *This demonstrates using optimized single-threaded code inside assigned
     2.9   * work-units.
    2.10   *
    2.11   *When done, it sends the result to the result processor