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

Changed parameters for DAOS API functions. #3266

Merged
merged 3 commits into from Jul 6, 2022
Merged

Changed parameters for DAOS API functions. #3266

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f984179
Changed parameters for DAOS API functions.
dmitry-ganyushin Jun 29, 2022
0640a10
Added conditionals for DAOS API functions.
dmitry-ganyushin Jul 5, 2022
1f0d757
Using preprocessor version variable from daos_version.h
dmitry-ganyushin Jul 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 19 additions & 4 deletions source/adios2/toolkit/transport/file/FileDaos.cpp
View file
Open in desktop
Expand Up @@ -31,7 +31,6 @@

#define CheckDAOSReturnCode(r) CheckDAOSReturnCodeF((r), __FILE__, __LINE__)
#define DefaultMaxDFSBatchSize 8589934592

namespace adios2
{
namespace transport
Expand Down Expand Up @@ -194,13 +193,21 @@ class FileDaos::Impl

// std::cout << "single process start daos_pool_connect..." <<
// std::endl;
#if DAOS_API_VERSION_MAJOR == 2
rc = daos_pool_connect(uuid_c, Group.c_str(), poolFlags, &poh, NULL,
NULL);
#else
rc = daos_pool_connect(UUID, Group.c_str(), poolFlags, &poh, NULL,
NULL);
#endif
CheckDAOSReturnCode(rc);
// std::cout << "single process daos_pool_connect succeeded!" <<
// std::endl;

#if DAOS_API_VERSION_MAJOR == 2
rc = daos_cont_open(poh, cuuid_c, contFlags, &coh, NULL, NULL);
#else
rc = daos_cont_open(poh, CUUID, contFlags, &coh, NULL, NULL);
#endif
CheckDAOSReturnCode(rc);
// std::cout << "single process daos_cont_open succeeded!" <<
// std::endl;
Expand All @@ -220,12 +227,20 @@ class FileDaos::Impl
if (comm.Rank() == 0)
{
// std::cout << "start daos_pool_connect..." << std::endl;
#if DAOS_API_VERSION_MAJOR == 2
rc = daos_pool_connect(uuid_c, Group.c_str(), poolFlags, &poh,
NULL, NULL);
#else
rc = daos_pool_connect(UUID, Group.c_str(), poolFlags, &poh,
NULL, NULL);
#endif
CheckDAOSReturnCode(rc);
// std::cout << "daos_pool_connect succeeded!" << std::endl;

#if DAOS_API_VERSION_MAJOR == 2
rc = daos_cont_open(poh, cuuid_c, contFlags, &coh, NULL, NULL);
#else
rc = daos_cont_open(poh, CUUID, contFlags, &coh, NULL, NULL);
#endif
CheckDAOSReturnCode(rc);
// std::cout << "daos_cont_open succeeded!" << std::endl;

Expand Down Expand Up @@ -975,4 +990,4 @@ void FileDaos::Truncate(const size_t length)
}

} // end namespace transport
} // end namespace adios2
} // end namespace adios2