Merge pull request #154 from OP-DSL/fix/python3

Python3 conversion of codegen
OP-DSL · Nov 8, 2021 · ea03ab3 · ea03ab3
2 parents d5f6fe7 + cf486c2
commit ea03ab3
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 16 deletions.
diff --git a/ops_translator/c/ops.py b/ops_translator/c/ops.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3
 
 # Open source copyright declaration based on BSD open source template:
 # http://www.opensource.org/licenses/bsd-license.php
@@ -643,7 +643,7 @@ def main(source_files):
               repeat = True
               which_file = nk
             else:
-              print('repeated kernel with incompatible arguments: ERROR' + kernels[nk]['name'])
+              print(('repeated kernel with incompatible arguments: ERROR' + kernels[nk]['name']))
               break
 
 

diff --git a/ops_translator/c/ops_gen_mpi_cuda.py b/ops_translator/c/ops_gen_mpi_cuda.py
@@ -49,6 +49,7 @@
 
 import re
 import datetime
+import errno
 import os
 import glob
 
@@ -97,7 +98,7 @@ def ops_gen_mpi_cuda(master, date, consts, kernels, soa_set):
   try:
     os.makedirs('./CUDA')
   except OSError as e:
-    if e.errno != os.errno.EEXIST:
+    if e.errno != errno.EEXIST:
       raise
   for nk in range (0,len(kernels)):
     arg_typ  = kernels[nk]['arg_type']
@@ -694,7 +695,7 @@ def ops_gen_mpi_cuda(master, date, consts, kernels, soa_set):
       code('')
 
     for n in range (0, nargs):
-      if arg_typ[n] == 'ops_arg_gbl' and accs[n] <> OPS_READ:
+      if arg_typ[n] == 'ops_arg_gbl' and accs[n] != OPS_READ:
         code('arg'+str(n)+'.data = block->instance->OPS_reduct_h + reduct_bytes;')
         code('arg'+str(n)+'.data_d = block->instance->OPS_reduct_d + reduct_bytes;')
         code('for (int b=0; b<maxblocks; b++)')

diff --git a/ops_translator/c/ops_gen_mpi_hip.py b/ops_translator/c/ops_gen_mpi_hip.py
@@ -49,6 +49,7 @@
 
 import re
 import datetime
+import errno
 import os
 import glob
 
@@ -676,7 +677,7 @@ def ops_gen_mpi_hip(master, date, consts, kernels, soa_set):
       code('')
 
     for n in range (0, nargs):
-      if arg_typ[n] == 'ops_arg_gbl' and accs[n] <> OPS_READ:
+      if arg_typ[n] == 'ops_arg_gbl' and accs[n] != OPS_READ:
         code('arg'+str(n)+'.data = block->instance->OPS_reduct_h + reduct_bytes;')
         code('arg'+str(n)+'.data_d = block->instance->OPS_reduct_d + reduct_bytes;')
         code('for (int b=0; b<maxblocks; b++)')

diff --git a/ops_translator/c/ops_gen_mpi_inline.py b/ops_translator/c/ops_gen_mpi_inline.py
@@ -51,6 +51,7 @@
 
 import re
 import datetime
+import errno
 import os
 import glob
 
@@ -94,7 +95,7 @@ def ops_gen_mpi_inline(master, date, consts, kernels, soa_set):
   try:
     os.makedirs('./MPI_inline')
   except OSError as e:
-    if e.errno != os.errno.EEXIST:
+    if e.errno != errno.EEXIST:
       raise
 
   ##########################################################################
@@ -472,7 +473,7 @@ def ops_gen_mpi_inline(master, date, consts, kernels, soa_set):
     try:
       os.makedirs('./MPI_inline')
     except OSError as e:
-      if e.errno != os.errno.EEXIST:
+      if e.errno != errno.EEXIST:
         raise
     fid = open('./MPI_inline/'+name+'_mpiinline_kernel_c.c','w')
     date = datetime.datetime.now()

diff --git a/ops_translator/c/ops_gen_mpi_lazy.py b/ops_translator/c/ops_gen_mpi_lazy.py
@@ -49,6 +49,7 @@
 
 import re
 import datetime
+import errno
 import os
 import glob
 
@@ -108,7 +109,7 @@ def ops_gen_mpi_lazy(master, date, consts, kernels, soa_set):
   try:
     os.makedirs('./MPI_OpenMP')
   except OSError as e:
-    if e.errno != os.errno.EEXIST:
+    if e.errno != errno.EEXIST:
       raise
 
   for nk in range (0,len(kernels)):

diff --git a/ops_translator/c/ops_gen_mpi_openacc.py b/ops_translator/c/ops_gen_mpi_openacc.py
@@ -49,6 +49,7 @@
 
 import re
 import datetime
+import errno
 import os
 import glob
 
@@ -97,7 +98,7 @@ def ops_gen_mpi_openacc(master, date, consts, kernels, soa_set):
   try:
     os.makedirs('./OpenACC')
   except OSError as e:
-    if e.errno != os.errno.EEXIST:
+    if e.errno != errno.EEXIST:
       raise
   for nk in range (0,len(kernels)):
     arg_typ  = kernels[nk]['arg_type']

diff --git a/ops_translator/c/ops_gen_mpi_opencl.py b/ops_translator/c/ops_gen_mpi_opencl.py
@@ -50,6 +50,7 @@
 
 import re
 import datetime
+import errno
 import os
 import glob
 
@@ -107,7 +108,7 @@ def ops_gen_mpi_opencl(master, date, consts, kernels, soa_set):
   try:
     os.makedirs('./OpenCL')
   except OSError as e:
-    if e.errno != os.errno.EEXIST:
+    if e.errno != errno.EEXIST:
       raise
   for nk in range (0,len(kernels)):
     arg_typ  = kernels[nk]['arg_type']
@@ -498,7 +499,7 @@ def ops_gen_mpi_opencl(master, date, consts, kernels, soa_set):
     try:
       os.makedirs('./OpenCL')
     except OSError as e:
-      if e.errno != os.errno.EEXIST:
+      if e.errno != errno.EEXIST:
         raise
     fid = open('./OpenCL/'+name+'.cl','w')
     date = datetime.datetime.now()

diff --git a/ops_translator/fortran/ops_fortran.py b/ops_translator/fortran/ops_fortran.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Open source copyright declaration based on BSD open source template:
 # http://www.opensource.org/licenses/bsd-license.php

diff --git a/ops_translator/fortran/ops_fortran_gen_mpi.py b/ops_translator/fortran/ops_fortran_gen_mpi.py
@@ -50,6 +50,7 @@
 
 import re
 import datetime
+import errno
 import os
 
 import util_fortran
@@ -484,7 +485,7 @@ def ops_fortran_gen_mpi(master, date, consts, kernels):
     try:
       os.makedirs('./MPI')
     except OSError as e:
-      if e.errno != os.errno.EEXIST:
+      if e.errno != errno.EEXIST:
         raise
     fid = open('./MPI/'+name+'_seq_kernel.F90','w')
     date = datetime.datetime.now()

diff --git a/ops_translator/fortran/ops_fortran_gen_mpi_cuda.py b/ops_translator/fortran/ops_fortran_gen_mpi_cuda.py
@@ -50,6 +50,7 @@
 
 import re
 import datetime
+import errno
 import os
 
 import util_fortran
@@ -1099,7 +1100,7 @@ def ops_fortran_gen_mpi_cuda(master, date, consts, kernels):
     try:
       os.makedirs('./CUDA')
     except OSError as e:
-      if e.errno != os.errno.EEXIST:
+      if e.errno != errno.EEXIST:
         raise
     fid = open('./CUDA/'+name+'_cuda_kernel.CUF','w')
     date = datetime.datetime.now()

diff --git a/ops_translator/fortran/ops_fortran_gen_mpi_openacc.py b/ops_translator/fortran/ops_fortran_gen_mpi_openacc.py
@@ -50,6 +50,7 @@
 
 import re
 import datetime
+import errno
 import os
 
 import util_fortran
@@ -565,7 +566,7 @@ def ops_fortran_gen_mpi_openacc(master, date, consts, kernels):
     try:
       os.makedirs('./MPI_OpenACC')
     except OSError as e:
-      if e.errno != os.errno.EEXIST:
+      if e.errno != errno.EEXIST:
         raise
     fid = open('./MPI_OpenACC/'+name+'_openacc_kernel.F90','w')
     date = datetime.datetime.now()

diff --git a/ops_translator/fortran/ops_fortran_gen_mpi_openmp.py b/ops_translator/fortran/ops_fortran_gen_mpi_openmp.py
@@ -49,6 +49,7 @@
 """
 
 import re
+import errno
 import datetime
 import os
 
@@ -515,7 +516,7 @@ def ops_fortran_gen_mpi_openmp(master, date, consts, kernels):
     try:
       os.makedirs('./MPI_OpenMP')
     except OSError as e:
-      if e.errno != os.errno.EEXIST:
+      if e.errno != errno.EEXIST:
         raise
     fid = open('./MPI_OpenMP/'+name+'_omp_kernel.F90','w')
     date = datetime.datetime.now()