Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Group API revision #2608

Closed
wants to merge 4 commits into from
Closed

Group API revision #2608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e94afe6
Formatting
dmitry-ganyushin Feb 4, 2021
9178053
Test commit to test PGI compiller
dmitry-ganyushin Feb 5, 2021
b1e3cd4
Formatting
dmitry-ganyushin Feb 5, 2021
4b95e99
Test for windows compiler
dmitry-ganyushin Feb 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions source/adios2/core/Group.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,12 @@ Group::Group(const Group &G)
Group *Group::InquireGroup(std::string groupName)
{
Group *g_out;
if (currentPath == "")
if (currentPath.compare("") != 0)
{
g_out = new Group(groupName, this->groupDelimiter, this->m_IO);
}
else
{
g_out = new Group(currentPath + groupDelimiter + groupName,
this->groupDelimiter, this->m_IO);
groupName = currentPath + groupDelimiter + groupName;
}

g_out = new Group(groupName, this->groupDelimiter, this->m_IO);
g_out->mapPtr = this->mapPtr;
return g_out;
}
Expand Down Expand Up @@ -183,8 +179,7 @@ std::vector<std::string> Group::AvailableAttributes()
std::string variablePath = currentPath + groupDelimiter + v;
variablePath = variablePath.substr(
ADIOS_root.size() + 1, variablePath.size() - ADIOS_root.size());
if (attributes.find(variablePath) !=
attributes.end())
if (attributes.find(variablePath) != attributes.end())
{
available_attributes.push_back(v);
}
Expand All @@ -196,16 +191,15 @@ std::vector<std::string> Group::AvailableAttributes()

std::vector<std::string> Group::AvailableGroups()
{

std::vector<std::string> available_groups;
std::set<std::string> val = mapPtr->treeMap[currentPath];
{
for (auto v : val)
{
if (mapPtr->treeMap.find(currentPath + groupDelimiter + v) !=
mapPtr->treeMap.end())
available_groups.push_back(v);
}
{
if (mapPtr->treeMap.find(currentPath + groupDelimiter + v) !=
mapPtr->treeMap.end())
available_groups.push_back(v);
}
}
return available_groups;
}
Expand Down
73 changes: 36 additions & 37 deletions testing/adios2/hierarchy/TestHierarchicalReading.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ TEST_F(ADIOSHierarchicalReadVariableTest, Read)
std::string filename = "ADIOSHierarchicalReadVariable.bp";

// Number of steps
const std::size_t NSteps = 3;
const std::size_t NSteps = 2;

long unsigned int rank, size;

Expand All @@ -48,7 +48,7 @@ TEST_F(ADIOSHierarchicalReadVariableTest, Read)

io.AddTransport("file");
adios2::Engine engine = io.Open(filename, adios2::Mode::Write);
const int Nx = 10;
const std::size_t Nx = 10;
const adios2::Dims shape = {size * Nx};
const adios2::Dims start = {rank * Nx};
const adios2::Dims count = {Nx};
Expand Down Expand Up @@ -83,7 +83,6 @@ TEST_F(ADIOSHierarchicalReadVariableTest, Read)
engine.Close();

engine = io.Open(filename, adios2::Mode::Read);
std::array<int32_t, 10> Int_read;
for (int step = 0; step < NSteps; step++)
{
engine.BeginStep();
Expand Down Expand Up @@ -115,22 +114,22 @@ TEST_F(ADIOSHierarchicalReadVariableTest, Read)
EXPECT_EQ(res[0], "group1");
res = g.AvailableVariables();
EXPECT_EQ(res[0], "variable6");
auto g1 = g.InquireGroup("group1");
res = g1.AvailableGroups();
EXPECT_EQ(res[0], "group2");
auto g2 = g1.InquireGroup("group2");
res = g2.AvailableGroups();
EXPECT_EQ(res[0], "group3");
auto g3 = g2.InquireGroup("group3");
res = g3.AvailableGroups();
EXPECT_EQ(res[0], "group4");
auto g4 = g3.InquireGroup("group4");
res = g4.AvailableGroups();
EXPECT_EQ(res.size(), 0);
res = g4.AvailableVariables();
EXPECT_EQ(res.size(), 5);
res = g4.AvailableAttributes();
EXPECT_EQ(res.size(), 0);
/* auto g1 = g.InquireGroup("group1");
res = g1.AvailableGroups();
EXPECT_EQ(res[0], "group2");
auto g2 = g1.InquireGroup("group2");
res = g2.AvailableGroups();
EXPECT_EQ(res[0], "group3");
auto g3 = g2.InquireGroup("group3");
res = g3.AvailableGroups();
EXPECT_EQ(res[0], "group4");
auto g4 = g3.InquireGroup("group4");
res = g4.AvailableGroups();
EXPECT_EQ(res.size(), 0);
res = g4.AvailableVariables();
EXPECT_EQ(res.size(), 5);
res = g4.AvailableAttributes();
EXPECT_EQ(res.size(), 0); */
engine.EndStep();
}
for (int step = 0; step < NSteps; step++)
Expand Down Expand Up @@ -162,24 +161,24 @@ TEST_F(ADIOSHierarchicalReadVariableTest, Read)
EXPECT_EQ(Ints, myInts);
}
}
for (int step = 0; step < NSteps; step++)
{
auto g = io.InquireGroup('/');
auto g1 = g.InquireGroup("group1");
auto g2 = g1.InquireGroup("group2");
auto g3 = g2.InquireGroup("group3");
auto g4 = g3.InquireGroup("group4");
auto var = g4.InquireVariable<int32_t>("variable1");
EXPECT_TRUE(var);
if (var)
{
std::vector<int32_t> myInts;
var.SetSelection({{Nx * rank}, {Nx}});
engine.Get<int32_t>(var, myInts, adios2::Mode::Sync);

EXPECT_EQ(Ints, myInts);
}
}
/* for (int step = 0; step < NSteps; step++)
{
auto g = io.InquireGroup('/');
auto g1 = g.InquireGroup("group1");
auto g2 = g1.InquireGroup("group2");
auto g3 = g2.InquireGroup("group3");
auto g4 = g3.InquireGroup("group4");
auto var = g4.InquireVariable<int32_t>("variable1");
EXPECT_TRUE(var);
if (var)
{
std::vector<int32_t> myInts;
var.SetSelection({{Nx * rank}, {Nx}});
engine.Get<int32_t>(var, myInts, adios2::Mode::Sync);

EXPECT_EQ(Ints, myInts);
}
}*/
engine.Close();
}
}
Expand Down