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

Enable PGI compiler for DataMan and Table #2421

Merged
merged 5 commits into from
Aug 12, 2020
Merged

Enable PGI compiler for DataMan and Table #2421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8cc87a4
check if DataMan and Table compile with PGI
JasonRuonanWang Aug 11, 2020
6a97c56
fixed warnings
JasonRuonanWang Aug 11, 2020
93a0c64
fixed unreachable statement
JasonRuonanWang Aug 12, 2020
4658fae
removed unused variable in dataman test
JasonRuonanWang Aug 12, 2020
3cd6cc6
fixed unreachable statement in dataman serializer
JasonRuonanWang Aug 12, 2020
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
6 changes: 2 additions & 4 deletions cmake/DetectOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,7 @@ if(ZeroMQ_FOUND)
endif()

# DataMan
# DataMan currently breaks the PGI compiler
if(NOT (CMAKE_CXX_COMPILER_ID STREQUAL "PGI") AND NOT MSVC)
if(NOT MSVC)
if(ZeroMQ_FOUND)
if(ADIOS2_USE_DataMan STREQUAL AUTO)
set(ADIOS2_HAVE_DataMan TRUE)
Expand All @@ -178,7 +177,6 @@ if(NOT (CMAKE_CXX_COMPILER_ID STREQUAL "PGI") AND NOT MSVC)
endif()

# SSC
# SSC currently breaks the PGI compiler
if(NOT MSVC)
if(ADIOS2_HAVE_MPI)
if(ADIOS2_USE_SSC STREQUAL AUTO)
Expand All @@ -190,7 +188,7 @@ if(NOT MSVC)
endif()

# Table
if(NOT (CMAKE_CXX_COMPILER_ID STREQUAL "PGI") AND NOT MSVC)
if(NOT MSVC)
if(ZeroMQ_FOUND)
if(ADIOS2_USE_Table STREQUAL AUTO)
set(ADIOS2_HAVE_Table TRUE)
Expand Down
4 changes: 1 addition & 3 deletions source/adios2/toolkit/format/dataman/DataManSerializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,6 @@ int DataManSerializer::PutDeferredRequest(const std::string &variable,
{
throw("DataManSerializer::PutDeferredRequest() requested "
"start, count and shape do not match");
continue;
}
bool toContinue = false;
for (size_t i = 0; i < start.size(); ++i)
Expand Down Expand Up @@ -778,7 +777,7 @@ VecPtr DataManSerializer::GenerateReply(
"but failed to deserialize due to " +
std::string(e.what()),
true, true);
step = -1;
step = std::numeric_limits<size_t>::max();
return replyLocalBuffer;
}

Expand Down Expand Up @@ -1122,7 +1121,6 @@ DmvVecPtr DataManSerializer::GetEarliestLatestStep(
return nullptr;
}
}
return nullptr;
}

void DataManSerializer::Log(const int level, const std::string &message,
Expand Down
1 change: 0 additions & 1 deletion testing/adios2/engine/dataman/TestDataMan3DMemSelect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ void DataManReaderP2PMemSelect(const Dims &shape, const Dims &start,
dataManIO.SetParameters(engineParams);
adios2::Engine dataManReader = dataManIO.Open("stream", adios2::Mode::Read);
std::vector<int> myInts = reader_data;
size_t i;
while (true)
{
adios2::StepStatus status = dataManReader.BeginStep(StepMode::Read, 5);
Expand Down
2 changes: 0 additions & 2 deletions thirdparty/nlohmann_json/nlohmann_json/src/single_include/nlohmann/json.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6627,8 +6627,6 @@ class binary_reader
}
*out++ = static_cast<char>(current);
}

return true;
}

/*!
Expand Down