-
Notifications
You must be signed in to change notification settings - Fork 28
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
Fixes build and tests on Windows #1519
Conversation
/style |
@white238 -- I am not sure that this worked. It seemed to trigger an action, but for some reason, the action was cancelled. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me.
@@ -88,87 +90,87 @@ namespace visit { | |||
#define NOCOLOR 122 | |||
|
|||
// Tables | |||
extern VISIT_VTK_LIGHT_API int numClipCasesHex; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for fixing the export macro. I don't know how I overlooked that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(there were a lot of files :) )
#ifndef UMPIRE_event_HPP | ||
#define UMPIRE_event_HPP | ||
|
||
+#include <chrono> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@davidbeckingsale -- My local machine did not need this on Windows, but our CI needed this for [email protected].
I saw that it was recently added to umpire@develop -- LLNL/Umpire#934
: value(extractIDFromObject(parentObject, localName_, globalName_)) | ||
{ | ||
std::swap(localName, localName_); | ||
std::swap(globalName, globalName_); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@doutriaux1 @bgunnar5 @gwaegner -- this was tricky to track down.
Presumably msvc has a different order of processing the arguments than clang and other compilers, or it wiped out the strings after moving them, rather than leaving them unchanged.
The call to extractIDFromObject
was happening after localName_
and globalName_
were already moved.
if(!group_name.empty()) | ||
{ | ||
grp->loadExternalData(path); | ||
} | ||
else | ||
{ | ||
m_bp_grp->loadExternalData(path); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@white238 and @nselliott -- This was necessary to get loadExternalData()
working in our Windows configuration, which has MPI for axom and a serial mfem.
I am not sure if we have test coverage for the if
part (where the users provide a group_name
)
The former is not available in msvc compiler
Fixes some MIR tests that check for the existence of data paths.
Chooses a better partition for the quick sort so it doesn't run out of stack space.
Limit the scope of the saved and loaded variables and use EXPECT_EQ instead of EXPECT_TRUE.
There's no guaranteed on the order of operations that constructor parameters are accessed. This was using references to strings before/after they were moved of the IDType constructor.
... when MFEM is built without MPI support. Instead of loading from the hierarchy root when the user doesn't specify a group, load from the blueprint group.
99d4ebf
to
b116749
Compare
This will be changed through uberenv in a separate PR.
Summary
static constexpr
w/ c++14. This might be relaxed in c++17Status:
ubsan
MFEMSidreDataCollection::LoadExternalData()
. Perhaps related to changes from:MFEMSidreDataCollection::LoadExternalData
and add test cases for variousLoadExternalData
functions #1473