Changes in / [e7b1f5b:b060d3c]

Files:

• GNUmakefile (modified) (1 diff)
• python/genericio.py (modified) (4 diffs)

GNUmakefile

@@ -63 +63 @@
 BASE_CPPFLAGS := $(BLOSC_CPPFLAGS) -I. -D__STDC_CONSTANT_MACROS
 
-UNAME_S := $(shell uname -s)
-ifeq ($(UNAME_S),Linux)
-    OPENMPFLAG=-fopenmp
-endif
-
 FEDIR = frontend
-FE_CFLAGS := -g -fPIC -O3 $(OPENMPFLAG) -std=gnu99
+FE_CFLAGS := -g -fPIC -O3 -fopenmp -std=gnu99
 FE_CPPFLAGS := $(BASE_CPPFLAGS) -Ithirdparty/sqlite -DGENERICIO_NO_MPI
 
 MPIDIR = mpi
-MPI_CFLAGS := -g -O3 $(OPENMPFLAG) -std=gnu99
+MPI_CFLAGS := -g -O3 -fopenmp -std=gnu99
 MPI_CPPFLAGS := $(BASE_CPPFLAGS)
 

python/genericio.py

@@ -38 +38 @@
 # *****************************************************************************
 
-from __future__ import print_function
 import numpy as np
 import ctypes as ct
-import os,sys
+import os
 
 #Define where the library is and load it
@@ -73 +72 @@
 
 def gio_read(file_name,var_name):
-    if sys.version_info[0] == 3:
-        file_name = bytes(file_name,'ascii')
-        var_name = bytes(var_name,'ascii')
     var_size = libpygio.get_elem_num(file_name)
     var_type = libpygio.get_variable_type(file_name,var_name)
     field_count = libpygio.get_variable_field_count(file_name,var_name)
     if(var_type==10):
-        print("Variable not found")
+        print "Variable not found"
         return
     elif(var_type==9):
-        print("variable type not known (not int32/int64/float/double)")
+        print "variable type not known (not int32/int64/float/double)"
     elif(var_type==0):
         #float
@@ -106 +102 @@
 
 def gio_has_variable(file_name,var_name):
-    if sys.version_info[0] == 3:
-        file_name=bytes(file_name,'ascii')
-        var_name=bytes(var_name,'ascii')
     var_size = libpygio.get_elem_num(file_name)
     var_type = libpygio.get_variable_type(file_name,var_name)
@@ -114 +107 @@
 
 def gio_inspect(file_name):
-    if sys.version_info[0] == 3:
-        file_name=bytes(file_name,'ascii')
     libpygio.inspect_gio(file_name)