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

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

bindings/CXX11/cxx11/Engine.cpp

@@ -105,11 +105,6 @@ Engine::Engine(core::Engine *engine) : m_Engine(engine) {}
     template void Engine::Get<T>(const std::string &, std::vector<T> &,        \
                                  const Mode);                                  \
                                                                                \
-    template void Engine::Get<T>(                                              \
-        Variable<T>, typename Variable<T>::Info & info, const Mode);           \
-    template void Engine::Get<T>(                                              \
-        const std::string &, typename Variable<T>::Info &info, const Mode);    \
-                                                                               \
     template std::map<size_t, std::vector<typename Variable<T>::Info>>         \
     Engine::AllStepsBlocksInfo(const Variable<T> variable) const;              \
                                                                                \

bindings/CXX11/cxx11/Engine.h

@@ -264,50 +264,6 @@ class Engine
     void Get(const std::string &variableName, std::vector<T> &dataV,
              const Mode launch = Mode::Deferred);
 
-    /**
-     * Get data associated with a Variable from the Engine. Data is
-     * associated with a block selection, and data is retrieved from
-     * variable's BlockInfo.
-     * @note Preliminary, experimental API, may change soon.
-     * @param variable contains variable metadata information
-     * @param info block info struct associated with block selection,
-     *   call will link with implementation's block info.
-     * @param launch mode policy
-     * <pre>
-     *      Mode::Deferred, lazy evaluation, do not use data until
-     * first PerformGets, EndStep, or Close. This is the preferred way.
-     *      Mode::Sync, data is obtained by the Engine and can be used
-     * immediately.
-     * Special case, only use if necessary.
-     * </pre>
-     * @exception std::invalid_argument for invalid variable or nullptr data
-     */
-    template <class T>
-    void Get(Variable<T> variable, typename Variable<T>::Info &info,
-             const Mode launch = Mode::Deferred);
-    /**
-     * Get data associated with a Variable from the Engine. Data is
-     * associated with a block selection, and data is retrieved from
-     * variable's BlockInfo. Overloaded version
-     * to get variable by name.
-     * @note Preliminary, experimental API, may change soon.
-     * @param variable contains variable metadata information
-     * @param info block info struct associated with block selection,
-     *   call will link with implementation's block info.
-     * @param launch mode policy
-     * <pre>
-     *      Mode::Deferred, lazy evaluation, do not use data until
-     * first PerformGets, EndStep, or Close. This is the preferred way.
-     *      Mode::Sync, data is obtained by the Engine and can be used
-     * immediately.
-     * Special case, only use if necessary.
-     * </pre>
-     * @exception std::invalid_argument for invalid variable or nullptr data
-     */
-    template <class T>
-    void Get(const std::string &variableName, typename Variable<T>::Info &info,
-             const Mode launch = Mode::Deferred);
-
     /** Perform all Get calls in Deferred mode up to this point */
     void PerformGets();
 
@@ -378,11 +334,6 @@ class Engine
     extern template void Engine::Get<T>(const std::string &, std::vector<T> &, \
                                         const Mode);                           \
                                                                                \
-    extern template void Engine::Get<T>(                                       \
-        Variable<T>, typename Variable<T>::Info & info, const Mode);           \
-    extern template void Engine::Get<T>(                                       \
-        const std::string &, typename Variable<T>::Info &info, const Mode);    \
-                                                                               \
     extern template std::map<size_t, std::vector<typename Variable<T>::Info>>  \
     Engine::AllStepsBlocksInfo(const Variable<T> variable) const;              \
                                                                                \

bindings/CXX11/cxx11/Engine.tcc

@@ -34,8 +34,6 @@ ToBlocksInfo(const std::vector<typename core::Variable<
          coreBlocksInfo)
     {
         typename Variable<T>::Info blockInfo;
-        // doesn't work because coreBlockInfo is transient.
-        // blockInfo.m_Info = &coreBlockInfo;
         blockInfo.Start = coreBlockInfo.Start;
         blockInfo.Count = coreBlockInfo.Count;
         blockInfo.IsValue = coreBlockInfo.IsValue;
@@ -48,7 +46,6 @@ ToBlocksInfo(const std::vector<typename core::Variable<
             blockInfo.Min = coreBlockInfo.Min;
             blockInfo.Max = coreBlockInfo.Max;
         }
-        blockInfo.BlockID = coreBlockInfo.BlockID;
         blocksInfo.push_back(blockInfo);
     }
 
@@ -203,11 +200,6 @@ Engine::AllStepsBlocksInfo(const Variable<T> variable) const
     return allStepsBlocksInfo;
 }
 
-// Design Node: All Info structs are copied. This prevents Engine::Get() from
-// connecting the Core Info struct to Binding Info struct when this method is
-// called. Instead of returning a vector, BlocksInfo could populate a vector member
-// of the Variable, and those could contain pointers to the Core Info structs,
-// enabling users of the Inline engine to do Info.Data()
 template <class T>
 std::vector<typename Variable<T>::Info>
 Engine::BlocksInfo(const Variable<T> variable, const size_t step) const

bindings/CXX11/cxx11/Variable.h

@@ -14,7 +14,6 @@
 #include "Operator.h"
 
 #include "adios2/ADIOSTypes.h"
-#include "adios2/core/Variable.h"
 
 namespace adios2
 {

docs/user_guide/source/engines/engines.rst

@@ -14,11 +14,13 @@ Parameters are passed at:
 
 2. Compile time ``IO::AddTransport`` (``adios2_set_transport_parameter`` in C, Fortran)
 
-3. :ref:`Runtime Configuration Files` in the :ref:`ADIOS` component.
+3. :ref:`Runtime Configuration Files` in the :ref:`ADIOS` component.  
 
 .. include:: bp3.rst
 .. include:: hdf5.rst
 .. include:: insitu_mpi.rst
 .. include:: dataman.rst
 .. include:: sst.rst
-.. include:: inline.rst
+
+
+

examples/hello/CMakeLists.txt

@@ -8,7 +8,6 @@ add_subdirectory(bpReader)
 add_subdirectory(bpTimeWriter)
 add_subdirectory(bpFlushWriter)
 add_subdirectory(bpAttributeWriter)
-add_subdirectory(inlineReaderWriter)
 add_subdirectory(skeleton)
 
 if(ADIOS2_HAVE_DataMan)

examples/hello/bpTimeWriter/helloBPTimeWriter.cpp

@@ -90,9 +90,7 @@ int main(int argc, char *argv[])
                 for (unsigned int v = 0; v < variablesSize; ++v)
                 {
                     myFloats[0] = static_cast<float>(v + timeStep);
-                    // Note: Put is deferred, so all variables will see v == 9
-                    // and myFloats[0] == 9, 10, or 11
-                    bpWriter.Put<float>(bpFloats[v], myFloats.data());
+                    bpWriter.Put(bpFloats[v], myFloats.data());
                 }
                 const std::string myString(
                     "Hello from rank: " + std::to_string(rank) +