Alexander_KS/SAPFOR
4
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arrayJson #56

Merged
Alexander_KS merged 6 commits from arrayJson into master 2025-05-18 15:32:13 +00:00
Conversation 0 Commits 6 Files Changed 6 +17 -17
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 718b1738a1 - Show all commits

34
src/Distribution/Array.h
View File

@@ -106,7 +106,7 @@ namespace Distribution
MAP<STRING, SET<int>> usagePlaces; MAP<STRING, SET<int>> usagePlaces;
VECTOR<bool> mappedDims; VECTOR<bool> mappedDims;
VECTOR<bool> depracateToDistribute; VECTOR<bool> deprecateToDistribute;
bool ompThreadPrivate; bool ompThreadPrivate;
bool privateInLoop; bool privateInLoop;
@@ -171,7 +171,7 @@ namespace Distribution
sizes.resize(dimSize); sizes.resize(dimSize);
sizesExpr.resize(dimSize); sizesExpr.resize(dimSize);
mappedDims.resize(dimSize); mappedDims.resize(dimSize);
depracateToDistribute.resize(dimSize); deprecateToDistribute.resize(dimSize);
for (int z = 0; z < dimSize; ++z) for (int z = 0; z < dimSize; ++z)
{ {
@@ -179,7 +179,7 @@ namespace Distribution
PAIR<int, int> initVal = std::make_pair(0, 0); PAIR<int, int> initVal = std::make_pair(0, 0);
sizesExpr[z] = std::make_pair(std::make_pair((Expression*)NULL, initVal), std::make_pair((Expression*)NULL, initVal)); sizesExpr[z] = std::make_pair(std::make_pair((Expression*)NULL, initVal), std::make_pair((Expression*)NULL, initVal));
mappedDims[z] = false; mappedDims[z] = false;
depracateToDistribute[z] = false; deprecateToDistribute[z] = false;
} }
GenUniqKey(); GenUniqKey();
@@ -214,7 +214,7 @@ namespace Distribution
uniqKey = copy.uniqKey; uniqKey = copy.uniqKey;
containsInRegions = copy.containsInRegions; containsInRegions = copy.containsInRegions;
mappedDims = copy.mappedDims; mappedDims = copy.mappedDims;
depracateToDistribute = copy.depracateToDistribute; deprecateToDistribute = copy.deprecateToDistribute;
ompThreadPrivate = copy.ompThreadPrivate; ompThreadPrivate = copy.ompThreadPrivate;
privateInLoop = copy.privateInLoop; privateInLoop = copy.privateInLoop;
inEquivalence = copy.inEquivalence; inEquivalence = copy.inEquivalence;
@@ -226,7 +226,7 @@ namespace Distribution
int countToRem = 0; int countToRem = 0;
for (int z = 0; z < dimSize; ++z) for (int z = 0; z < dimSize; ++z)
{ {
if (!mappedDims[z] || depracateToDistribute[z]) if (!mappedDims[z] || deprecateToDistribute[z])
{ {
needToRemove = true; needToRemove = true;
countToRem++; countToRem++;
@@ -246,19 +246,19 @@ namespace Distribution
for (int z = 0; z < dimSize; ++z) for (int z = 0; z < dimSize; ++z)
{ {
if (mappedDims[z] && !depracateToDistribute[z]) if (mappedDims[z] && !deprecateToDistribute[z])
{ {
newSizes.push_back(sizes[z]); newSizes.push_back(sizes[z]);
newSizesExpr.push_back(sizesExpr[z]); newSizesExpr.push_back(sizesExpr[z]);
newMappedDims.push_back(mappedDims[z]); newMappedDims.push_back(mappedDims[z]);
newDepr.push_back(depracateToDistribute[z]); newDepr.push_back(deprecateToDistribute[z]);
} }
} }
sizes = newSizes; sizes = newSizes;
sizesExpr = newSizesExpr; sizesExpr = newSizesExpr;
mappedDims = newMappedDims; mappedDims = newMappedDims;
depracateToDistribute = newDepr; deprecateToDistribute = newDepr;
dimSize = (int)sizes.size(); dimSize = (int)sizes.size();
return false; return false;
@@ -445,9 +445,9 @@ namespace Distribution
retVal["isLoopArrayFlag"] = (int)isLoopArrayFlag; retVal["isLoopArrayFlag"] = (int)isLoopArrayFlag;
JSON deprToDist = nlohmann::json::array(); JSON deprToDist = nlohmann::json::array();
for (int i = 0; i < depracateToDistribute.size(); ++i) for (int i = 0; i < deprecateToDistribute.size(); ++i)
deprToDist.push_back((int)depracateToDistribute[i]); deprToDist.push_back((int)deprecateToDistribute[i]);
retVal["depracateToDist"] = deprToDist; retVal["deprecateToDist"] = deprToDist;
JSON mappedDimsJ = nlohmann::json::array(); JSON mappedDimsJ = nlohmann::json::array();
for (int i = 0; i < mappedDims.size(); ++i) for (int i = 0; i < mappedDims.size(); ++i)
@@ -605,13 +605,13 @@ namespace Distribution
{ {
if (dim >= dimSize) if (dim >= dimSize)
return; return;
depracateToDistribute[dim] = value; deprecateToDistribute[dim] = value;
} }
void DeprecateAllDims() void DeprecateAllDims()
{ {
for (int dim = 0; dim < dimSize; ++dim) for (int dim = 0; dim < dimSize; ++dim)
depracateToDistribute[dim] = true; deprecateToDistribute[dim] = true;
} }
bool IsDimDepracated(const int dim) const bool IsDimDepracated(const int dim) const
@@ -621,9 +621,9 @@ namespace Distribution
else else
{ {
if (templateDimsOrder.size() == 0) if (templateDimsOrder.size() == 0)
return depracateToDistribute[dim]; return deprecateToDistribute[dim];
else else
return depracateToDistribute[templateDimsOrder[dim]]; return deprecateToDistribute[templateDimsOrder[dim]];
} }
} }
@@ -631,11 +631,11 @@ namespace Distribution
{ {
bool ret = true; bool ret = true;
for (int z = 0; z < dimSize; ++z) for (int z = 0; z < dimSize; ++z)
ret = ret && depracateToDistribute[z]; ret = ret && deprecateToDistribute[z];
return ret; return ret;
} }
const VECTOR<bool>& GetDeprecetedDims() const { return depracateToDistribute; } const VECTOR<bool>& GetDeprecetedDims() const { return deprecateToDistribute; }
int GetTypeSize() const { return typeSize; } int GetTypeSize() const { return typeSize; }