[adios] 134/207: Minor fix to python for py3

Alastair McKinstry mckinstry at moszumanska.debian.org
Fri Jun 12 06:04:48 UTC 2015


This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository adios.

commit c1cdee80735fad38d110b569e6dea573b9f070b2
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu May 22 08:26:55 2014 +0100

    Minor fix to python for py3
---
 debian/patches/python3.patch | 160 ++++++++++++++++++++++++-------------------
 1 file changed, 88 insertions(+), 72 deletions(-)

diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 3d92c21..22866db 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -5,8 +5,8 @@ Forwarded: no
 
 Index: adios-1.6.0/utils/skel/bin/skel
 ===================================================================
---- adios-1.6.0.orig/utils/skel/bin/skel	2014-02-19 05:58:09.220062180 +0000
-+++ adios-1.6.0/utils/skel/bin/skel	2014-02-19 05:58:09.208061851 +0000
+--- adios-1.6.0.orig/utils/skel/bin/skel
++++ adios-1.6.0/utils/skel/bin/skel
 @@ -1,5 +1,7 @@
  #!/usr/bin/env python
  
@@ -15,7 +15,7 @@ Index: adios-1.6.0/utils/skel/bin/skel
  import sys
  import os.path
  
-@@ -81,7 +83,7 @@
+@@ -81,7 +83,7 @@ def main(argv=None):
      try:
          config = adios.adiosConfig (args.project + '_skel.xml')
      except (IOError):
@@ -24,7 +24,7 @@ Index: adios-1.6.0/utils/skel/bin/skel
          return 1
  
      if args.subcommand == 'params':
-@@ -114,7 +116,7 @@
+@@ -114,7 +116,7 @@ def main(argv=None):
          skel_submit.generate_submit_scripts_with_args (parser)
          return 0
  
@@ -35,8 +35,8 @@ Index: adios-1.6.0/utils/skel/bin/skel
  if __name__ == "__main__":
 Index: adios-1.6.0/utils/skel/bin/skel_extract.py
 ===================================================================
---- adios-1.6.0.orig/utils/skel/bin/skel_extract.py	2014-02-19 05:58:09.220062180 +0000
-+++ adios-1.6.0/utils/skel/bin/skel_extract.py	2014-02-19 05:58:09.208061851 +0000
+--- adios-1.6.0.orig/utils/skel/bin/skel_extract.py
++++ adios-1.6.0/utils/skel/bin/skel_extract.py
 @@ -1,5 +1,6 @@
  #!/usr/bin/env python
  
@@ -44,7 +44,7 @@ Index: adios-1.6.0/utils/skel/bin/skel_extract.py
  import argparse
  import xml.dom.minidom
  import sys
-@@ -46,7 +47,7 @@
+@@ -46,7 +47,7 @@ def extract (skel_output, dest, select,
      # check the selected fields
      for field in selected_fields:
          if not field in keys:
@@ -53,10 +53,26 @@ Index: adios-1.6.0/utils/skel/bin/skel_extract.py
              return
  
      #Print the header
+@@ -153,13 +154,13 @@ def extract_R (skel_output, select, rank
+ def parse_iteration (filename):
+     #assume filename ends with .xml
+     if not filename.endswith (".xml"):
+-        print "Warning: filename does not meet expectations, should end with .xml"
++        print("Warning: filename does not meet expectations, should end with .xml")
+ 
+     filename = filename [:-4]
+ 
+     iteration = filename.rsplit ("_", 1)[1]
+ 
+-    print iteration
++    print(iteration)
+ 
+     return iteration
+ 
 Index: adios-1.6.0/utils/skel/lib/skelconf.py
 ===================================================================
---- adios-1.6.0.orig/utils/skel/lib/skelconf.py	2014-02-19 05:58:09.220062180 +0000
-+++ adios-1.6.0/utils/skel/lib/skelconf.py	2014-02-19 05:58:09.208061851 +0000
+--- adios-1.6.0.orig/utils/skel/lib/skelconf.py
++++ adios-1.6.0/utils/skel/lib/skelconf.py
 @@ -1,5 +1,5 @@
 +from __future__ import absolute_import, division, print_function, unicode_literals
  import xml.dom.minidom
@@ -64,7 +80,7 @@ Index: adios-1.6.0/utils/skel/lib/skelconf.py
  import skel_settings
  import skel_have_adios_timing
  
-@@ -10,7 +10,7 @@
+@@ -10,7 +10,7 @@ class skelConfig:
  
          nodes = doc.childNodes
          if (nodes.length != 1):
@@ -75,14 +91,14 @@ Index: adios-1.6.0/utils/skel/lib/skelconf.py
  
 Index: adios-1.6.0/utils/gpp/ad_config.py
 ===================================================================
---- adios-1.6.0.orig/utils/gpp/ad_config.py	2014-02-19 05:58:09.220062180 +0000
-+++ adios-1.6.0/utils/gpp/ad_config.py	2014-02-19 05:58:09.208061851 +0000
+--- adios-1.6.0.orig/utils/gpp/ad_config.py
++++ adios-1.6.0/utils/gpp/ad_config.py
 @@ -1,3 +1,4 @@
 +from __future__ import absolute_import, division, print_function, unicode_literals
  import xml.dom.minidom
  import type_mapper
  
-@@ -11,7 +12,7 @@
+@@ -11,7 +12,7 @@ class adiosConfig:
          doc = xml.dom.minidom.parse (config_file_name)
          nodes = doc.childNodes
          if (nodes.length != 1):
@@ -91,7 +107,7 @@ Index: adios-1.6.0/utils/gpp/ad_config.py
              raise SystemExit
          self.config_node = nodes[0]
  
-@@ -41,7 +42,7 @@
+@@ -41,7 +42,7 @@ class adiosConfig:
  
      def get_buffer (self):
          #return the buffer info
@@ -100,7 +116,7 @@ Index: adios-1.6.0/utils/gpp/ad_config.py
  
      def get_host_language (self):
          return self.config_node.getAttribute ('host-language')
-@@ -182,7 +183,7 @@
+@@ -182,7 +183,7 @@ class var:
              return None
          else:
              # place the dimensions in a list and remove the time-index if it is there.
@@ -111,8 +127,8 @@ Index: adios-1.6.0/utils/gpp/ad_config.py
              for d in dims:
 Index: adios-1.6.0/utils/gpp/gpp.py
 ===================================================================
---- adios-1.6.0.orig/utils/gpp/gpp.py	2014-02-19 05:58:09.220062180 +0000
-+++ adios-1.6.0/utils/gpp/gpp.py	2014-02-19 05:58:09.208061851 +0000
+--- adios-1.6.0.orig/utils/gpp/gpp.py
++++ adios-1.6.0/utils/gpp/gpp.py
 @@ -1,5 +1,5 @@
  #!/usr/bin/env python
 -
@@ -120,7 +136,7 @@ Index: adios-1.6.0/utils/gpp/gpp.py
  import sys
  import os
  
-@@ -22,10 +22,10 @@
+@@ -22,10 +22,10 @@ def checkXML (config_file, path):
      if rv == 0:
          return 'success'
      elif rv == 32512:  # System unable to find adios_lint command
@@ -133,7 +149,7 @@ Index: adios-1.6.0/utils/gpp/gpp.py
          return 'failure'
  
  
-@@ -244,7 +244,7 @@
+@@ -244,7 +244,7 @@ def main (argv=None):
    
      # Must be called with one argument, the name of the xml file
      if len (sys.argv) != 2:
@@ -142,7 +158,7 @@ Index: adios-1.6.0/utils/gpp/gpp.py
          return 1
  
  
-@@ -265,7 +265,7 @@
+@@ -265,7 +265,7 @@ def main (argv=None):
      elif lang == 'c' or lang == 'cpp':
          generate_c (config)
      else:
@@ -153,8 +169,8 @@ Index: adios-1.6.0/utils/gpp/gpp.py
  
 Index: adios-1.6.0/utils/skel/lib/adios.py
 ===================================================================
---- adios-1.6.0.orig/utils/skel/lib/adios.py	2014-02-19 05:58:09.220062180 +0000
-+++ adios-1.6.0/utils/skel/lib/adios.py	2014-02-19 05:58:09.212061961 +0000
+--- adios-1.6.0.orig/utils/skel/lib/adios.py
++++ adios-1.6.0/utils/skel/lib/adios.py
 @@ -1,5 +1,5 @@
 +from __future__ import print_function
  import xml.dom.minidom
@@ -162,7 +178,7 @@ Index: adios-1.6.0/utils/skel/lib/adios.py
  import typeMapper
  
  class adiosConfig:
-@@ -12,7 +12,7 @@
+@@ -12,7 +12,7 @@ class adiosConfig:
          doc = xml.dom.minidom.parse (config_file_name)
          nodes = doc.childNodes
          if (nodes.length != 1):
@@ -171,7 +187,7 @@ Index: adios-1.6.0/utils/skel/lib/adios.py
              raise SystemExit
          self.config_node = nodes[0]
  
-@@ -47,7 +47,7 @@
+@@ -47,7 +47,7 @@ class adiosConfig:
  
      def get_buffer (self):
          #return the buffer info
@@ -180,7 +196,7 @@ Index: adios-1.6.0/utils/skel/lib/adios.py
  
      def get_host_language (self):
          return self.host_language
-@@ -157,7 +157,7 @@
+@@ -157,7 +157,7 @@ class var:
              return None
          else:
              # place the dimensions in a list and remove the time-index if it is there.
@@ -191,9 +207,9 @@ Index: adios-1.6.0/utils/skel/lib/adios.py
  
 Index: adios-1.6.0/utils/skel/lib/argparse.py
 ===================================================================
---- adios-1.6.0.orig/utils/skel/lib/argparse.py	2014-02-19 05:58:09.220062180 +0000
-+++ adios-1.6.0/utils/skel/lib/argparse.py	2014-02-19 05:58:09.212061961 +0000
-@@ -81,7 +81,6 @@
+--- adios-1.6.0.orig/utils/skel/lib/argparse.py
++++ adios-1.6.0/utils/skel/lib/argparse.py
+@@ -81,7 +81,6 @@ __all__ = [
      'ZERO_OR_MORE',
  ]
  
@@ -203,8 +219,8 @@ Index: adios-1.6.0/utils/skel/lib/argparse.py
  import re as _re
 Index: adios-1.6.0/utils/skel/lib/skel_install.py
 ===================================================================
---- adios-1.6.0.orig/utils/skel/lib/skel_install.py	2014-02-19 05:58:09.220062180 +0000
-+++ adios-1.6.0/utils/skel/lib/skel_install.py	2014-02-19 05:58:09.212061961 +0000
+--- adios-1.6.0.orig/utils/skel/lib/skel_install.py
++++ adios-1.6.0/utils/skel/lib/skel_install.py
 @@ -1,5 +1,5 @@
  #!/usr/bin/env python
 -
@@ -214,8 +230,8 @@ Index: adios-1.6.0/utils/skel/lib/skel_install.py
  def main(argv=None):
 Index: adios-1.6.0/utils/skel/lib/skel_makefile.py
 ===================================================================
---- adios-1.6.0.orig/utils/skel/lib/skel_makefile.py	2014-02-19 05:58:09.220062180 +0000
-+++ adios-1.6.0/utils/skel/lib/skel_makefile.py	2014-02-19 05:58:09.212061961 +0000
+--- adios-1.6.0.orig/utils/skel/lib/skel_makefile.py
++++ adios-1.6.0/utils/skel/lib/skel_makefile.py
 @@ -1,5 +1,7 @@
  #!/usr/bin/env python
  
@@ -224,7 +240,7 @@ Index: adios-1.6.0/utils/skel/lib/skel_makefile.py
  import argparse
  import os
  import sys
-@@ -190,10 +192,10 @@
+@@ -190,10 +192,10 @@ def main(argv=None):
  
      lang = config.get_host_language ()
      if 'c' == lang or 'C' == lang:
@@ -239,15 +255,15 @@ Index: adios-1.6.0/utils/skel/lib/skel_makefile.py
  
 Index: adios-1.6.0/utils/skel/lib/skel_params.py
 ===================================================================
---- adios-1.6.0.orig/utils/skel/lib/skel_params.py	2014-02-19 05:58:09.220062180 +0000
-+++ adios-1.6.0/utils/skel/lib/skel_params.py	2014-02-19 05:58:40.876928321 +0000
+--- adios-1.6.0.orig/utils/skel/lib/skel_params.py
++++ adios-1.6.0/utils/skel/lib/skel_params.py
 @@ -1,4 +1,5 @@
  #!/usr/bin/env python
 +from __future__ import absolute_import, division, print_function, unicode_literals
  import sys
  import os
  import argparse
-@@ -35,7 +36,7 @@
+@@ -35,7 +36,7 @@ def generate_param_file_with_args (confi
  
      # Only proceed if outfilename does not already exist, or if -f was used
      if os.path.exists (outfilename) and not args.force:
@@ -256,7 +272,7 @@ Index: adios-1.6.0/utils/skel/lib/skel_params.py
          return 999
  
      generate_param_file (args.project, outfilename, config, args.group, args.bpls)
-@@ -46,7 +47,7 @@
+@@ -46,7 +47,7 @@ def generate_param_file (app, outfile, c
      param_file = open (outfile, 'w')
  
      if bplsfile is not None:
@@ -265,7 +281,7 @@ Index: adios-1.6.0/utils/skel/lib/skel_params.py
          bpdata = skel_bpls.bpls (open (bplsfile, 'r') )
  
      #Write the file header
-@@ -148,7 +149,7 @@
+@@ -148,7 +149,7 @@ def main(argv=None):
  
      # Only proceed if outfilename does not already exist.
      if os.path.exists (outfilename):
@@ -276,8 +292,8 @@ Index: adios-1.6.0/utils/skel/lib/skel_params.py
      generate_param_file (args.project, outfilename, config, args.group)
 Index: adios-1.6.0/utils/skel/lib/skel_settings.py
 ===================================================================
---- adios-1.6.0.orig/utils/skel/lib/skel_settings.py	2014-02-19 05:58:09.220062180 +0000
-+++ adios-1.6.0/utils/skel/lib/skel_settings.py	2014-02-19 05:58:09.212061961 +0000
+--- adios-1.6.0.orig/utils/skel/lib/skel_settings.py
++++ adios-1.6.0/utils/skel/lib/skel_settings.py
 @@ -1,5 +1,5 @@
  #!/usr/bin/env python
 -
@@ -285,7 +301,7 @@ Index: adios-1.6.0/utils/skel/lib/skel_settings.py
  import sys
  import os.path
  import shutil
-@@ -20,8 +20,8 @@
+@@ -20,8 +20,8 @@ class skel_settings:
                  continue
              split_line = line.split('=')
              if not len (split_line) == 2:
@@ -296,7 +312,7 @@ Index: adios-1.6.0/utils/skel/lib/skel_settings.py
                  continue
              self.settings_dict[split_line[0]] = split_line[1]
  
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ def create_settings_dir_if_needed():
      if not os.path.exists (skel_settings_dir_name):
          bindir = os.path.dirname (sys.argv[0])
          shutil.copytree (bindir + '/../etc/skel', skel_settings_dir_name)
@@ -307,15 +323,15 @@ Index: adios-1.6.0/utils/skel/lib/skel_settings.py
  def main(argv=None):
 Index: adios-1.6.0/utils/skel/lib/skel_source.py
 ===================================================================
---- adios-1.6.0.orig/utils/skel/lib/skel_source.py	2014-02-19 05:58:09.220062180 +0000
-+++ adios-1.6.0/utils/skel/lib/skel_source.py	2014-02-19 05:58:09.212061961 +0000
+--- adios-1.6.0.orig/utils/skel/lib/skel_source.py
++++ adios-1.6.0/utils/skel/lib/skel_source.py
 @@ -1,4 +1,5 @@
  #!/usr/bin/env python
 +from __future__ import absolute_import, division, print_function, unicode_literals
  import sys
  import os
  import argparse
-@@ -84,25 +85,25 @@
+@@ -84,25 +85,25 @@ def generate_c_write (outfile, config, p
          # same program var (as is done by genarray)
          c_file.write ('\n\n// Scalar declarations')
          declarations = set()
@@ -345,7 +361,7 @@ Index: adios-1.6.0/utils/skel/lib/skel_source.py
              c_file.write (adios.cFormatter.get_initialization (v, params.get_group (g.get_name() ) ) )
  
          if measure.use_sleep_before_open():
-@@ -220,7 +221,7 @@
+@@ -220,7 +221,7 @@ def generate_c_write (outfile, config, p
          # free the array memory
          c_file.write ('\n\n// Free the arrays')
          frees = set()
@@ -354,7 +370,7 @@ Index: adios-1.6.0/utils/skel/lib/skel_source.py
              frees.add ('\nfree (' + v.get_gwrite() + ');')
  
          for f in frees:
-@@ -297,7 +298,7 @@
+@@ -297,7 +298,7 @@ def generate_fortran_write (outfile, con
          # same program var (as is done by genarray)
          f_file.write ('\n\n! Scalar declarations')
          declarations = set()
@@ -363,7 +379,7 @@ Index: adios-1.6.0/utils/skel/lib/skel_source.py
              declarations.add (adios.fortranFormatter.get_declaration (v, params.get_group (g.get_name() ) ) )
  
          for d in declarations:
-@@ -305,7 +306,7 @@
+@@ -305,7 +306,7 @@ def generate_fortran_write (outfile, con
  
          f_file.write ('\n\n! Array declarations')
          declarations = set()
@@ -372,7 +388,7 @@ Index: adios-1.6.0/utils/skel/lib/skel_source.py
              declarations.add (adios.fortranFormatter.get_declaration (v, params.get_group (g.get_name() ) ) )
  
          for d in declarations:
-@@ -335,13 +336,13 @@
+@@ -335,13 +336,13 @@ def generate_fortran_write (outfile, con
          # For now, just do the numerical values first, then come back and do the more
          # complicated ones. This won't cover something like a depends on b, b depends on c,
          # but it will work for the moment
@@ -388,7 +404,7 @@ Index: adios-1.6.0/utils/skel/lib/skel_source.py
              #split at the spaces, just print the ones where the third element is a number
              init_str = adios.fortranFormatter.get_initialization (v, params.get_group (g.get_name() ) )
              if not init_str.split (None, 2)[2].isdigit():
-@@ -350,7 +351,7 @@
+@@ -350,7 +351,7 @@ def generate_fortran_write (outfile, con
          f_file.write ('\n\n! Initialize the arrays')
  
  		# And the vector initializations
@@ -397,7 +413,7 @@ Index: adios-1.6.0/utils/skel/lib/skel_source.py
              f_file.write (adios.fortranFormatter.get_initialization (v, params.get_group (g.get_name() ) ) )
  
  
-@@ -535,7 +536,7 @@
+@@ -535,7 +536,7 @@ def generate_c_read_all (outfile, config
          # same program var (as is done by genarray)
          c_file.write ('\n\n// Scalar declarations')
          declarations = set()
@@ -406,7 +422,7 @@ Index: adios-1.6.0/utils/skel/lib/skel_source.py
              declarations.add (adios.cFormatter.get_declaration (v, params.get_group (g.get_name() ) ) )
  
          for d in declarations:
-@@ -543,7 +544,7 @@
+@@ -543,7 +544,7 @@ def generate_c_read_all (outfile, config
  
          c_file.write ('\n\n// Array declarations')
          declarations = set()
@@ -415,7 +431,7 @@ Index: adios-1.6.0/utils/skel/lib/skel_source.py
              declarations.add (adios.cFormatter.get_declaration (v, params.get_group (g.get_name() ) ) )
  
          for d in declarations:
-@@ -620,7 +621,7 @@
+@@ -620,7 +621,7 @@ def generate_c_read_all (outfile, config
          # free the array memory
          c_file.write ('\n\n// Free the arrays')
          frees = set()
@@ -426,8 +442,8 @@ Index: adios-1.6.0/utils/skel/lib/skel_source.py
          for f in frees:
 Index: adios-1.6.0/utils/skel/lib/skel_submit.py
 ===================================================================
---- adios-1.6.0.orig/utils/skel/lib/skel_submit.py	2014-02-19 05:58:09.220062180 +0000
-+++ adios-1.6.0/utils/skel/lib/skel_submit.py	2014-02-19 05:58:09.212061961 +0000
+--- adios-1.6.0.orig/utils/skel/lib/skel_submit.py
++++ adios-1.6.0/utils/skel/lib/skel_submit.py
 @@ -1,5 +1,5 @@
  #!/usr/bin/env python
 -
@@ -435,7 +451,7 @@ Index: adios-1.6.0/utils/skel/lib/skel_submit.py
  import argparse
  import os
  
-@@ -123,7 +123,7 @@
+@@ -123,7 +123,7 @@ def generate_submit_scripts_from_yaml (a
  
      # Only proceed if outfilename does not already exist, or if -f was used
      if os.path.exists (outfilename) and not args.force:
@@ -444,7 +460,7 @@ Index: adios-1.6.0/utils/skel/lib/skel_submit.py
          return 999
  
      skel_file = open (outfilename, 'w')
-@@ -157,8 +157,8 @@
+@@ -157,8 +157,8 @@ def generate_submit_scripts_with_args (p
          try:
              params = skelconf.skelConfig (args.project + '_params.xml')
          except (IOError):
@@ -457,8 +473,8 @@ Index: adios-1.6.0/utils/skel/lib/skel_submit.py
          generate_submit_scripts_from_xml (params)
 Index: adios-1.6.0/utils/skel/lib/skel_xml.py
 ===================================================================
---- adios-1.6.0.orig/utils/skel/lib/skel_xml.py	2014-02-19 05:58:09.220062180 +0000
-+++ adios-1.6.0/utils/skel/lib/skel_xml.py	2014-02-19 05:59:12.789801918 +0000
+--- adios-1.6.0.orig/utils/skel/lib/skel_xml.py
++++ adios-1.6.0/utils/skel/lib/skel_xml.py
 @@ -1,5 +1,6 @@
  #!/usr/bin/env python
  
@@ -466,7 +482,7 @@ Index: adios-1.6.0/utils/skel/lib/skel_xml.py
  import argparse
  import os
  import xml.dom.minidom
-@@ -67,7 +68,7 @@
+@@ -67,7 +68,7 @@ def create_from_yaml (project,args):
  
      # Only proceed if outfilename does not already exist, or if -f was used
      if os.path.exists (outfilename) and not args.force:
@@ -475,7 +491,7 @@ Index: adios-1.6.0/utils/skel/lib/skel_xml.py
          return 999
  
      skel_file = open (outfilename, 'w')
-@@ -90,7 +91,7 @@
+@@ -90,7 +91,7 @@ def create_from_xml (project, args):
  
      # Only proceed if outfilename does not already exist, or if -f was used
      if os.path.exists (outfilename) and not args.force:
@@ -486,8 +502,8 @@ Index: adios-1.6.0/utils/skel/lib/skel_xml.py
      skel_file = open (outfilename, 'w')
 Index: adios-1.6.0/wrappers/numpy/example/ncdf2bp.py
 ===================================================================
---- adios-1.6.0.orig/wrappers/numpy/example/ncdf2bp.py	2014-02-19 05:58:09.220062180 +0000
-+++ adios-1.6.0/wrappers/numpy/example/ncdf2bp.py	2014-02-19 05:58:09.212061961 +0000
+--- adios-1.6.0.orig/wrappers/numpy/example/ncdf2bp.py
++++ adios-1.6.0/wrappers/numpy/example/ncdf2bp.py
 @@ -1,4 +1,5 @@
  #!/usr/bin/env python
 +from __future__ import absolute_import, division, print_function, unicode_literals
@@ -496,15 +512,15 @@ Index: adios-1.6.0/wrappers/numpy/example/ncdf2bp.py
  import numpy as np
 Index: adios-1.6.0/wrappers/numpy/test/adios_noxml_test.py
 ===================================================================
---- adios-1.6.0.orig/wrappers/numpy/test/adios_noxml_test.py	2014-02-19 05:58:09.220062180 +0000
-+++ adios-1.6.0/wrappers/numpy/test/adios_noxml_test.py	2014-02-19 05:58:09.212061961 +0000
+--- adios-1.6.0.orig/wrappers/numpy/test/adios_noxml_test.py
++++ adios-1.6.0/wrappers/numpy/test/adios_noxml_test.py
 @@ -1,4 +1,5 @@
  #!/usr/bin/env python
 +from __future__ import absolute_import, division, print_function, unicode_literals
  from adios import *
  import numpy as np
  
-@@ -17,7 +18,7 @@
+@@ -17,7 +18,7 @@ NX = 10
  size = 1
  rank = 0
  groupsize =  4 + 4 + 4 + 8 * 1 * NX
@@ -515,15 +531,15 @@ Index: adios-1.6.0/wrappers/numpy/test/adios_noxml_test.py
  write_int(fd, "size", size)
 Index: adios-1.6.0/wrappers/numpy/test/adios_read_test.py
 ===================================================================
---- adios-1.6.0.orig/wrappers/numpy/test/adios_read_test.py	2014-02-19 05:58:09.220062180 +0000
-+++ adios-1.6.0/wrappers/numpy/test/adios_read_test.py	2014-02-19 05:58:09.212061961 +0000
+--- adios-1.6.0.orig/wrappers/numpy/test/adios_read_test.py
++++ adios-1.6.0/wrappers/numpy/test/adios_read_test.py
 @@ -1,4 +1,5 @@
  #!/usr/bin/env python
 +
  from adios import *
  import numpy as np
  
-@@ -9,6 +10,6 @@
+@@ -9,6 +10,6 @@ g.printself()
  v = g.var["/temperature"]
  v.printself()
  
@@ -533,15 +549,15 @@ Index: adios-1.6.0/wrappers/numpy/test/adios_read_test.py
  f.close()
 Index: adios-1.6.0/wrappers/numpy/test/adios_write_test.py
 ===================================================================
---- adios-1.6.0.orig/wrappers/numpy/test/adios_write_test.py	2014-02-19 05:58:09.220062180 +0000
-+++ adios-1.6.0/wrappers/numpy/test/adios_write_test.py	2014-02-19 05:58:09.212061961 +0000
+--- adios-1.6.0.orig/wrappers/numpy/test/adios_write_test.py
++++ adios-1.6.0/wrappers/numpy/test/adios_write_test.py
 @@ -1,4 +1,5 @@
  #!/usr/bin/env python
 +from __future__ import absolute_import, division, print_function, unicode_literals
  import adios
  import numpy as np
  
-@@ -9,7 +10,7 @@
+@@ -9,7 +10,7 @@ NX = 10
  size = 1
  rank = 0
  groupsize =  4 + 4 + 4 + 8 * 1 * NX

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git



More information about the debian-science-commits mailing list