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.

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

Small quality of life improvements to basic examples. #1532

Merged
merged 6 commits into from
Jun 25, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
39 changes: 20 additions & 19 deletions examples/hello/bpReader/helloBPReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
* Created on: Feb 16, 2017
* Author: William F Godoy [email protected]
*/

#include <ios> //std::ios_base::failure
#include <iostream> //std::cout
#include <mpi.h>
Expand All @@ -26,12 +25,7 @@ int main(int argc, char *argv[])
int rank, size;
MPI_Comm_rank(MPI_COMM_WORLD, &rank);
MPI_Comm_size(MPI_COMM_WORLD, &size);

/** Application variable */
const std::size_t Nx = 10;
std::vector<float> myFloats(Nx);
std::vector<int> myInts(Nx);

std::string filename = "myVector_cpp.bp";
try
{
/** ADIOS class factory of IO class objects, DebugON is recommended */
Expand All @@ -42,8 +36,7 @@ int main(int argc, char *argv[])
adios2::IO bpIO = adios.DeclareIO("ReadBP");

/** Engine derived class, spawned to start IO operations */
adios2::Engine bpReader =
bpIO.Open("myVector_cpp.bp", adios2::Mode::Read);
adios2::Engine bpReader = bpIO.Open(filename, adios2::Mode::Read);

const std::map<std::string, adios2::Params> variables =
bpIO.AvailableVariables();
Expand All @@ -64,12 +57,15 @@ int main(int argc, char *argv[])
bpIO.InquireVariable<float>("bpFloats");
adios2::Variable<int> bpInts = bpIO.InquireVariable<int>("bpInts");

const std::size_t Nx = 10;
if (bpFloats) // means found
{
std::vector<float> myFloats;

// read only the chunk corresponding to our rank
bpFloats.SetSelection({{Nx * rank}, {Nx}});
// myFloats.data is pre-allocated
NAThompson marked this conversation as resolved.
Show resolved Hide resolved
bpReader.Get<float>(bpFloats, myFloats.data(), adios2::Mode::Sync);
bpReader.Get<float>(bpFloats, myFloats, adios2::Mode::Sync);

std::cout << "MyFloats: \n";
for (const auto number : myFloats)
Expand All @@ -81,12 +77,13 @@ int main(int argc, char *argv[])

if (bpInts) // means not found
{
std::vector<int> myInts;
// read only the chunk corresponding to our rank
bpInts.SetSelection({{Nx * rank}, {Nx}});
// myInts.data is pre-allocated
bpReader.Get<int>(bpInts, myInts.data(), adios2::Mode::Sync);

std::cout << "MyInts: \n";
bpReader.Get<int>(bpInts, myInts, adios2::Mode::Sync);

std::cout << "myInts: \n";
for (const auto number : myInts)
{
std::cout << number << " ";
Expand All @@ -99,21 +96,25 @@ int main(int argc, char *argv[])
}
catch (std::invalid_argument &e)
{
std::cout << "Invalid argument exception, STOPPING PROGRAM from rank "
std::cerr << "Invalid argument exception, STOPPING PROGRAM from rank "
<< rank << "\n";
std::cout << e.what() << "\n";
std::cerr << e.what() << "\n";
}
catch (std::ios_base::failure &e)
{
std::cout << "IO System base failure exception, STOPPING PROGRAM "
std::cerr << "IO System base failure exception, STOPPING PROGRAM "
"from rank "
<< rank << "\n";
std::cout << e.what() << "\n";
std::cerr << e.what() << "\n";
std::cerr
<< "The file " << filename << " does not exist."
<< " Presumably this is because hello_bpWriter has not been run."
<< " Run ./hello_bpWriter before running this program.\n";
}
catch (std::exception &e)
{
std::cout << "Exception, STOPPING PROGRAM from rank " << rank << "\n";
std::cout << e.what() << "\n";
std::cerr << "Exception, STOPPING PROGRAM from rank " << rank << "\n";
std::cerr << e.what() << "\n";
}

MPI_Finalize();
Expand Down
40 changes: 26 additions & 14 deletions examples/hello/bpReader/helloBPReader_nompi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@

int main(int argc, char *argv[])
{
/** Application variable */
const std::size_t Nx = 10;
std::vector<float> myFloats(Nx);
std::vector<int> myInts(Nx);
std::string filename = "myVector_cpp.bp";

try
{
Expand All @@ -33,8 +30,7 @@ int main(int argc, char *argv[])
adios2::IO bpIO = adios.DeclareIO("ReadBP");

/** Engine derived class, spawned to start IO operations */
adios2::Engine bpReader =
bpIO.Open("myVector_cpp.bp", adios2::Mode::Read);
adios2::Engine bpReader = bpIO.Open(filename, adios2::Mode::Read);

/** Write variable for buffering */
adios2::Variable<float> bpFloats =
Expand All @@ -44,31 +40,47 @@ int main(int argc, char *argv[])

if (bpFloats)
{
bpReader.Get<float>(bpFloats, myFloats.data(), adios2::Mode::Sync);
std::vector<float> myFloats;
bpReader.Get<float>(bpFloats, myFloats, adios2::Mode::Sync);
std::cout << "Float vector inside " << filename << ": {";
for (auto &x : myFloats)
{
std::cout << x << ", ";
}
std::cout << "}\n";
}

if (bpInts)
{
bpReader.Get<int>(bpInts, myInts.data(), adios2::Mode::Sync);
std::vector<int> myInts;
bpReader.Get<int>(bpInts, myInts, adios2::Mode::Sync);
}
else
{
std::cout << "There are no integer datasets in " << filename
<< ".\n";
}

/** Close bp file, engine becomes unreachable after this*/
bpReader.Close();
}
catch (std::invalid_argument &e)
{
std::cout << "Invalid argument exception, STOPPING PROGRAM\n";
std::cout << e.what() << "\n";
std::cerr << "Invalid argument exception, STOPPING PROGRAM\n";
std::cerr << e.what() << "\n";
}
catch (std::ios_base::failure &e)
{
std::cout << "IO System base failure exception, STOPPING PROGRAM\n";
std::cout << e.what() << "\n";
std::cerr << "IO System base failure exception, STOPPING PROGRAM\n";
std::cerr << e.what() << "\n";
std::cerr << "The file " << filename << " does not exist."
<< " Presumably this is because hello_bpWriter has not been "
"run. Run ./hello_bpWriter before running this program.\n";
}
catch (std::exception &e)
{
std::cout << "Exception, STOPPING PROGRAM\n";
std::cout << e.what() << "\n";
std::cerr << "Exception, STOPPING PROGRAM\n";
std::cerr << e.what() << "\n";
}

return 0;
Expand Down
7 changes: 5 additions & 2 deletions examples/hello/bpWriter/helloBPWriter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ int main(int argc, char *argv[])
adios2::Variable<std::string> bpString =
bpIO.DefineVariable<std::string>("bpString");

std::string filename = "myVector_cpp.bp";
/** Engine derived class, spawned to start IO operations */
adios2::Engine bpFileWriter =
bpIO.Open("myVector_cpp.bp", adios2::Mode::Write);
adios2::Engine bpFileWriter = bpIO.Open(filename, adios2::Mode::Write);

/** Put variables for buffering, template type is optional */
bpFileWriter.Put<float>(bpFloats, myFloats.data());
Expand All @@ -64,6 +64,9 @@ int main(int argc, char *argv[])

/** Create bp file, engine becomes unreachable after this*/
bpFileWriter.Close();
std::cout << "Wrote file " << filename
NAThompson marked this conversation as resolved.
Show resolved Hide resolved
<< " to disk. It can now be read by running "
"./bin/hello_bpReader.\n";
}
catch (std::invalid_argument &e)
{
Expand Down
19 changes: 11 additions & 8 deletions examples/hello/bpWriter/helloBPWriter_nompi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,30 +35,33 @@ int main(int argc, char *argv[])
adios2::Variable<float> bpFloats = bpIO.DefineVariable<float>(
"bpFloats", {}, {}, {Nx}, adios2::ConstantDims);

std::string filename = "myVector_cpp.bp";
/** Engine derived class, spawned to start IO operations */
adios2::Engine bpWriter =
bpIO.Open("myVector_cpp.bp", adios2::Mode::Write);
adios2::Engine bpWriter = bpIO.Open(filename, adios2::Mode::Write);

/** Write variable for buffering */
bpWriter.Put<float>(bpFloats, myFloats.data());

/** Create bp file, engine becomes unreachable after this*/
bpWriter.Close();
std::cout << "Wrote file " << filename
<< " to disk. It can now be read by running "
"./bin/hello_bpReader.\n";
}
catch (std::invalid_argument &e)
NAThompson marked this conversation as resolved.
Show resolved Hide resolved
{
std::cout << "Invalid argument exception, STOPPING PROGRAM\n";
std::cout << e.what() << "\n";
std::cerr << "Invalid argument exception, STOPPING PROGRAM\n";
std::cerr << e.what() << "\n";
}
catch (std::ios_base::failure &e)
{
std::cout << "IO System base failure exception, STOPPING PROGRAM\n";
std::cout << e.what() << "\n";
std::cerr << "IO System base failure exception, STOPPING PROGRAM\n";
std::cerr << e.what() << "\n";
}
catch (std::exception &e)
{
std::cout << "Exception, STOPPING PROGRAM\n";
std::cout << e.what() << "\n";
std::cerr << "Exception, STOPPING PROGRAM\n";
std::cerr << e.what() << "\n";
}

return 0;
Expand Down