chizeta/cnorxz
chizeta/cnorxz
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mpi: more on rank format (TODO: think about pos)

Browse source
This commit is contained in:
Christian Zimmermann 2024-10-16 23:32:36 -07:00
parent 82dcfbde2e
commit 19a4cd2467
2 changed files with 35 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/opt/mpi/include/rrange.cc.h
View file

@ -32,7 +32,8 @@ namespace CNORXZ
mK(std::make_shared<IndexK>(mRange->geom())), mK(std::make_shared<IndexK>(mRange->geom())),
mNRanks(getNumRanks()), mNRanks(getNumRanks()),
mRankFormat(in.mRankFormat), mRankFormat(in.mRankFormat),
mRankOffset(in.mRankOffset) mRankOffset(in.mRankOffset),
mStepRatio(in.mStepRatio)
{ {
*this = in.lex(); *this = in.lex();
} }
@ -46,6 +47,7 @@ namespace CNORXZ
mNRanks = getNumRanks(); mNRanks = getNumRanks();
mRankOffset = in.mRankOffset; mRankOffset = in.mRankOffset;
mRankFormat = in.mRankFormat; mRankFormat = in.mRankFormat;
mStepRatio = mStepRatio;
*this = in.lex(); *this = in.lex();
return *this; return *this;
} }
@ -57,7 +59,8 @@ namespace CNORXZ
mK(std::make_shared<IndexK>(mRange->geom())), mK(std::make_shared<IndexK>(mRange->geom())),
mNRanks(getNumRanks()), mNRanks(getNumRanks()),
mRankFormat(1), mRankFormat(1),
mRankOffset(0) mRankOffset(0),
mStepRatio(mI->pmax().val())
{ {
*this = lexpos; *this = lexpos;
} }
@ -69,7 +72,8 @@ namespace CNORXZ
mK(k), mK(k),
mNRanks(getNumRanks()), mNRanks(getNumRanks()),
mRankFormat(1), mRankFormat(1),
mRankOffset(0) mRankOffset(0),
mStepRatio(mI->pmax().val())
{ {
(*this)(); (*this)();
} }
@ -133,6 +137,8 @@ namespace CNORXZ
*mK = pos / mI->lmax().val(); *mK = pos / mI->lmax().val();
*mI = pos % mI->lmax().val(); *mI = pos % mI->lmax().val();
} }
// replace line once we know what to do !!!
//IB::mPos = mK->pos() * mStepRatio + mI->pos();
IB::mPos = mK->pos() * mI->pmax().val() + mI->pos(); IB::mPos = mK->pos() * mI->pmax().val() + mI->pos();
return *this; return *this;
} }
@ -399,6 +405,7 @@ namespace CNORXZ
} }
} }
} }
//IB::mPos = mK->pos() * mStepRatio + mI->pos();
IB::mPos = mK->pos() * mI->pmax().val() + mI->pos(); IB::mPos = mK->pos() * mI->pmax().val() + mI->pos();
return *this; return *this;
} }
@ -422,15 +429,21 @@ namespace CNORXZ
} }
template <class IndexI, class IndexK> template <class IndexI, class IndexK>
void RIndex<IndexI,IndexK>::setRankFormat(SizeT rankFormat) void RIndex<IndexI,IndexK>::setRankFormat(SizeT rankFormat, SizeT stepRatio)
{ {
const SizeT nr = getRankNumber(); const SizeT nr = getRankNumber();
mRankFormat = rankFormat; mRankFormat = rankFormat;
CXZ_ASSERT(mNRanks % mRankFormat == 0, "rankFormat (" << mRankFormat
<< ") does not divide total number of ranks (" << mNRanks << ")");
mStepRatio = stepRatio;
if(mStepRatio == 0){
mStepRatio = mI->pmax().val();
}
CXZ_ASSERT(mStepRatio % mRankFormat == 0, "rankFormat (" << mRankFormat
<< ") does not divide stepRatio (" << mStepRatio << ")");
const SizeT kmax = mK->pmax().val(); const SizeT kmax = mK->pmax().val();
const SizeT nextblocks = kmax * mRankFormat; const SizeT nextblocks = kmax * mRankFormat;
mRankOffset = nr % mRankFormat + ( nr / nextblocks ) * nextblocks; mRankOffset = nr % mRankFormat + ( nr / nextblocks ) * nextblocks;
CXZ_ASSERT(mNRanks % mRankFormat == 0, "rankFormat (" << mRankFormat
<< ") does not divide total number of ranks (" << mNRanks << ")");
} }
template <class IndexI, class IndexK> template <class IndexI, class IndexK>
@ -439,6 +452,12 @@ namespace CNORXZ
return mRankFormat; return mRankFormat;
} }
template <class IndexI, class IndexK>
SizeT RIndex<IndexI,IndexK>::stepRatio() const
{
return mStepRatio;
}
template <class IndexI, class IndexK, class I1> template <class IndexI, class IndexK, class I1>
decltype(auto) operator*(const Sptr<RIndex<IndexI,IndexK>>& a, const Sptr<I1>& b) decltype(auto) operator*(const Sptr<RIndex<IndexI,IndexK>>& a, const Sptr<I1>& b)
{ {

12
src/opt/mpi/include/rrange.h
View file

@ -159,12 +159,19 @@ namespace CNORXZ
/** Get index indicating the current rank this index points to. */ /** Get index indicating the current rank this index points to. */
Sptr<IndexK> rankI() const; Sptr<IndexK> rankI() const;
/** Set the rank format. */ /** Set the rank format.
void setRankFormat(SizeT rankFormat); @param rankFormat Format of the rank index K.
@param stepRatio stepSize of K over stepsize of I; needs to be dividable by rankFormat.
If stepRatio == 0, it is set to the default value = mI->pmax().val().
*/
void setRankFormat(SizeT rankFormat, SizeT stepRatio = 0);
/** Get the rank format. */ /** Get the rank format. */
SizeT rankFormat() const; SizeT rankFormat() const;
/** Get step ratio. */
SizeT stepRatio() const;
private: private:
SizeT mLex = 0; SizeT mLex = 0;
Sptr<RangeType> mRange; /**< RRange. */ Sptr<RangeType> mRange; /**< RRange. */
@ -173,6 +180,7 @@ namespace CNORXZ
SizeT mNRanks; /**< Number of ranks; in general different from but dividable by mK's maximum. */ SizeT mNRanks; /**< Number of ranks; in general different from but dividable by mK's maximum. */
SizeT mRankFormat = 1; /**< Frequency of ranks to be served by this index. */ SizeT mRankFormat = 1; /**< Frequency of ranks to be served by this index. */
SizeT mRankOffset = 0; /** < Offset in case this index only serves a sub-slice of ranks .*/ SizeT mRankOffset = 0; /** < Offset in case this index only serves a sub-slice of ranks .*/
SizeT mStepRatio; /**< Ratio between the stepsizes of mK and mI. */
}; };
template <class IndexI, class IndexK> template <class IndexI, class IndexK>