From 48f3ac6c2c754cc6b9767db35a8bdbc250e0b9e3 Mon Sep 17 00:00:00 2001
From: wfg <wfg@pc0098504.ornl.gov>
Date: Tue, 28 Mar 2017 12:51:41 -0400
Subject: [PATCH] Fixing Python bindings in groupless branch
---
bindings/python/include/ADIOSPy.h | 2 +-
bindings/python/src/ADIOSPy.cpp | 6 +++---
bindings/python/src/EnginePy.cpp | 2 +-
bindings/python/test_hello.py | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/bindings/python/include/ADIOSPy.h b/bindings/python/include/ADIOSPy.h
index 65cf2cfcf..584526e80 100644
--- a/bindings/python/include/ADIOSPy.h
+++ b/bindings/python/include/ADIOSPy.h
@@ -56,7 +56,7 @@ public:
VariablePy DefineVariablePy( const std::string name, const pyList localDimensionsPy = pyList(),
const pyList globalDimensionsPy = pyList(), const pyList globalOffsetsPy = pyList() );
- MethodPy& DeclareMethodPy( const std::string methodName, const std::string type = "" );
+ MethodPy& DeclareMethodPy( const std::string methodName );
EnginePy OpenPy( const std::string name, const std::string accessMode, const MethodPy& method, pyObject py_comm = pyObject() );
diff --git a/bindings/python/src/ADIOSPy.cpp b/bindings/python/src/ADIOSPy.cpp
index 609b7e632..f92bc8a6d 100644
--- a/bindings/python/src/ADIOSPy.cpp
+++ b/bindings/python/src/ADIOSPy.cpp
@@ -17,7 +17,7 @@ namespace adios
ADIOSPy::ADIOSPy( MPI_Comm mpiComm, const bool debug ):
- ADIOS( mpiComm, debug )
+ ADIOS( mpiComm, adios::Verbose::ERROR, debug )
{ }
@@ -31,9 +31,9 @@ void ADIOSPy::HelloMPI( )
}
-MethodPy& ADIOSPy::DeclareMethodPy( const std::string methodName, const std::string type )
+MethodPy& ADIOSPy::DeclareMethodPy( const std::string methodName )
{
- Method& method = DeclareMethod( methodName, type );
+ Method& method = DeclareMethod( methodName );
return *reinterpret_cast<MethodPy*>( &method );
}
diff --git a/bindings/python/src/EnginePy.cpp b/bindings/python/src/EnginePy.cpp
index 3bb80cdd3..790e997e3 100644
--- a/bindings/python/src/EnginePy.cpp
+++ b/bindings/python/src/EnginePy.cpp
@@ -68,7 +68,7 @@ void EnginePy::WritePy( VariablePy& variable, const pyArray& array )
void EnginePy::Advance( )
{
-
+ m_Engine->Advance( );
}
diff --git a/bindings/python/test_hello.py b/bindings/python/test_hello.py
index db0b2c6ef..a383b573f 100644
--- a/bindings/python/test_hello.py
+++ b/bindings/python/test_hello.py
@@ -26,7 +26,7 @@ if( rank % 2 == 1 ): # odd ranks only
#Setup method and print summary
-ioSettings = adios.DeclareMethod("adiosSettings", "BPFileWriter")
+ioSettings = adios.DeclareMethod("adiosSettings")
ioSettings.SetParameters( profile_units = 'mus' )
ioSettings.AddTransport( 'File', have_metadata_file = 'no', profile_units = 'mus' ) # POSIX is default, just checking
@@ -41,4 +41,4 @@ bpFileWriter.Close( )
if( rank == 0 ):
print "Done writing " + str( size ) + " bp files"
- ioSettings.PrintAll( ) # just prints a summary of Method/Transport parameters
\ No newline at end of file
+ ioSettings.PrintAll( ) # just prints a summary of Method/Transport parameters
--
GitLab