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

Revert "Merge pull request #1047 from aronhelser/inline_engine_start" #1168

Closed

Conversation

chuckatkins
Copy link
Contributor

This reverts commit 46c0364, reversing
changes made to f8bfbfd.

Inline engine currently breaks install so we're reverting it until outstanding issues are resolved

…ne_start"

This reverts commit 46c0364, reversing
changes made to f8bfbfd.
@germasch
Copy link
Contributor

@chuckatkins, since I think this this revert failed because in between my cxx11-bindings stuff got deleted, I looked at what happened. I think you need to add this patch to fix the revert:

diff --git a/bindings/CXX11/cxx11/Engine.tcc b/bindings/CXX11/cxx11/Engine.tcc
index dc771274..70ef0d84 100644
--- a/bindings/CXX11/cxx11/Engine.tcc
+++ b/bindings/CXX11/cxx11/Engine.tcc
@@ -152,24 +152,6 @@ void Engine::Get(const std::string &variableName, std::vector<T> &dataV,
     m_Engine->Get(variableName, reinterpret_cast<std::vector<IOType> &>(dataV), launch);
 }

-template <class T>
-void Engine::Get(Variable<T> variable, typename Variable<T>::Info& info, const Mode launch)
-{
-    using IOType = typename TypeInfo<T>::IOType;
-    adios2::helper::CheckForNullptr(m_Engine, "in call to Engine::Get");
-    adios2::helper::CheckForNullptr(
-        variable.m_Variable, "for variable in call to Engine::Get");
-    info.m_Info = m_Engine->Get(*variable.m_Variable, launch);
-}
-
-template <class T>
-void Engine::Get(const std::string &variableName, typename Variable<T>::Info& info, const Mode launch)
-{
-    using IOType = typename TypeInfo<T>::IOType;
-    adios2::helper::CheckForNullptr(m_Engine, "in call to Engine::Get");
-    info.m_Info = m_Engine->Get<IOType>(variableName, launch);
-}
-
 template <class T>
 std::map<size_t, std::vector<typename Variable<T>::Info>>
 Engine::AllStepsBlocksInfo(const Variable<T> variable) const
diff --git a/bindings/CXX11/cxx11/Variable.h b/bindings/CXX11/cxx11/Variable.h
index 1dc3fc12..4f0922ff 100644
--- a/bindings/CXX11/cxx11/Variable.h
+++ b/bindings/CXX11/cxx11/Variable.h
@@ -14,6 +14,7 @@
 #include "Operator.h"

 #include "adios2/ADIOSTypes.h"
+#include "adios2/core/Variable.h"

 namespace adios2
 {

@williamfgc
Copy link
Contributor

@chuckatkins please hold this. I am working on a fix to the issue reverting to private core headers. I'll do a PR this morning. @germasch thanks, your additions shouldn't be affected.

williamfgc added a commit to williamfgc/ADIOS2 that referenced this pull request Feb 13, 2019
This commit effectively makes core header private
Address what PR ornladios#1168 is trying to revert
williamfgc added a commit to williamfgc/ADIOS2 that referenced this pull request Feb 13, 2019
This commit effectively makes core header private
Address what PR ornladios#1168 is trying to revert
@williamfgc
Copy link
Contributor

@chuckatkins no need to revert, make install is fixed in current master

@chuckatkins
Copy link
Contributor Author

Fixed by @williamfgc

@chuckatkins chuckatkins deleted the revert-inline-merge branch February 20, 2019 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants