Skip to content

Commit

Permalink
Merge pull request #13 from scemama/master
Browse files Browse the repository at this point in the history 
Simplified Python2/3 integration
  • Loading branch information
@scemama
scemama authored Jul 7, 2016
2 parents 7c86c41 + bdeac71 commit e409e37
Show file tree
Hide file tree
Showing 4 changed files with 150 additions and 112 deletions.
11 changes: 7 additions & 4 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,23 @@ CFLAGS=-O3 -fPIC -Wall -pedantic -g

default: libf77zmq.so libf77zmq.a f77_zmq.h

$(ZMQ_H):
$(error $(ZMQ_H) : file not found)

zmq.h: $(ZMQ_H)
cp $(ZMQ_H) zmq.h

libf77zmq.so: f77_zmq.o
$(CC) -shared $^ -o $@

libf77zmq.a: f77_zmq.o
$(AR) cr $@ $^

zmq.h: $(ZMQ_H)
cp $(ZMQ_H) .

f77_zmq.o: f77_zmq.c f77_zmq.h
$(CC) $(CFLAGS) -c f77_zmq.c -o $@

f77_zmq.h: create_f77_zmq_h.py zmq.h f77_zmq.c
python2 create_f77_zmq_h.py zmq.h || python3 create_f77_zmq_h_py3.py zmq.h
python create_f77_zmq_h.py zmq.h

clean:
$(RM) -f -- f77_zmq.o f77_zmq.h
Expand Down
106 changes: 6 additions & 100 deletions create_f77_zmq_h.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,106 +24,12 @@
# Universite Paul Sabatier - Bat. 3R1b4, 118 route de Narbonne
# 31062 Toulouse Cedex 09, France



import sys
import ctypes

# The first argument is the location of the ZeroMQ source directory

if len(sys.argv) != 2:
print "usage: %s zmq.h"%(sys.argv[0])
sys.exit(1)

ZMQ_H = sys.argv[1]

def create_lines(f):
result = f.read()
result = result.replace('\\\n', '')
result = result.split('\n')
return result

def create_dict_of_defines(lines,file_out):
"""lines is a list of lines coming from the zmq.h"""
# Fetch all parameters in zmq.h
d = {}
for line in lines:
if line.startswith("#define"):
buffer = line.split()
key = buffer[1]
value = " ".join(buffer[2:])
if key[0] == '_' or '(' in key or ',' in value:
continue
command = "%(key)s=%(value)s\nd['%(key)s']=%(key)s"%locals()
exec command in locals()

# Add the version number:
d['ZMQ_VERSION'] = ZMQ_VERSION_MAJOR*10000 + ZMQ_VERSION_MINOR*100 + ZMQ_VERSION_PATCH
d['ZMQ_PTR'] = ctypes.sizeof(ctypes.c_voidp)
print "==========================================="
print "ZMQ_PTR set to %d (for %d-bit architectures)"%(d['ZMQ_PTR'],d['ZMQ_PTR']*8)
print "==========================================="

# Print to file
keys = list( d.keys() )
keys.sort()
for k in keys:
print >>file_out, " integer %s"%(k)
for k in keys:
print >>file_out, " parameter ( %-20s = %s )"%(k, d[k])
return None

def create_prototypes(lines,file_out):
"""lines is a list of lines coming from the f77_zmq.c file"""
typ_conv = {
'int' : 'integer' ,
'float' : 'real',
'char*' : 'character*(64)',
'double' : 'double precision',
'void*' : 'integer*%d'%(ctypes.sizeof(ctypes.c_voidp)),
'void' : None
}
# Get all the functions of the f77_zmq.c file
d = {}
for line in lines:
if line == "":
continue
if line[0] in " #{}/":
continue
buffer = line.replace('_(','_ (').lower().split()
typ = typ_conv[buffer[0]]
if typ is None:
continue
name = buffer[1][:-1]
d[name] = typ

# Print to file
keys = list( d.keys() )
keys.sort()
for k in keys:
print >>file_out, " %-20s %s"%(d[k],k)
print >>file_out, " %-20s %s"%("external",k)
return None



def main():
file_out = open('f77_zmq.h','w')

file_in = open( ZMQ_H, 'r' )
lines = create_lines(file_in)
file_in.close()

create_dict_of_defines(lines,file_out)

file_in = open( 'f77_zmq.c', 'r' )
lines = create_lines(file_in)
file_in.close()

create_prototypes(lines,file_out)

file_out.close()


if __name__ == '__main__':
main()
if sys.version_info >= (3, 0):
import create_f77_zmq_h_py3 as x
else:
import create_f77_zmq_h_py2 as x
x.main()

129 changes: 129 additions & 0 deletions create_f77_zmq_h_py2.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
#!/usr/bin/env python2
#
# f77_zmq : Fortran 77 bindings for the ZeroMQ library
# Copyright (C) 2014 Anthony Scemama
#
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
# USA
#
# Anthony Scemama <[email protected]>
# Laboratoire de Chimie et Physique Quantiques - UMR5626
# Universite Paul Sabatier - Bat. 3R1b4, 118 route de Narbonne
# 31062 Toulouse Cedex 09, France



import sys
import ctypes

def create_lines(f):
result = f.read()
result = result.replace('\\\n', '')
result = result.split('\n')
return result

def create_dict_of_defines(lines,file_out):
"""lines is a list of lines coming from the zmq.h"""
# Fetch all parameters in zmq.h
d = {}
for line in lines:
if line.startswith("#define"):
buffer = line.split()
key = buffer[1]
value = " ".join(buffer[2:])
if key[0] == '_' or '(' in key or ',' in value:
continue
command = "%(key)s=%(value)s\nd['%(key)s']=%(key)s"%locals()
exec command in locals()

# Add the version number:
d['ZMQ_VERSION'] = ZMQ_VERSION_MAJOR*10000 + ZMQ_VERSION_MINOR*100 + ZMQ_VERSION_PATCH
d['ZMQ_PTR'] = ctypes.sizeof(ctypes.c_voidp)
print "==========================================="
print "ZMQ_PTR set to %d (for %d-bit architectures)"%(d['ZMQ_PTR'],d['ZMQ_PTR']*8)
print "==========================================="

# Print to file
keys = list( d.keys() )
keys.sort()
for k in keys:
print >>file_out, " integer %s"%(k)
for k in keys:
print >>file_out, " parameter ( %-20s = %s )"%(k, d[k])
return None

def create_prototypes(lines,file_out):
"""lines is a list of lines coming from the f77_zmq.c file"""
typ_conv = {
'int' : 'integer' ,
'float' : 'real',
'char*' : 'character*(64)',
'double' : 'double precision',
'void*' : 'integer*%d'%(ctypes.sizeof(ctypes.c_voidp)),
'void' : None
}
# Get all the functions of the f77_zmq.c file
d = {}
for line in lines:
if line == "":
continue
if line[0] in " #{}/":
continue
buffer = line.replace('_(','_ (').lower().split()
typ = typ_conv[buffer[0]]
if typ is None:
continue
name = buffer[1][:-1]
d[name] = typ

# Print to file
keys = list( d.keys() )
keys.sort()
for k in keys:
print >>file_out, " %-20s %s"%(d[k],k)
print >>file_out, " %-20s %s"%("external",k)
return None



def main():
# The first argument is the zmq.h file

if len(sys.argv) != 2:
print "usage: %s zmq.h"%(sys.argv[0])
sys.exit(1)

ZMQ_H = sys.argv[1]

file_out = open('f77_zmq.h','w')

file_in = open( ZMQ_H, 'r' )
lines = create_lines(file_in)
file_in.close()

create_dict_of_defines(lines,file_out)

file_in = open( 'f77_zmq.c', 'r' )
lines = create_lines(file_in)
file_in.close()

create_prototypes(lines,file_out)

file_out.close()


if __name__ == '__main__':
main()
16 changes: 8 additions & 8 deletions create_f77_zmq_h_py3.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,6 @@
import sys
import ctypes

# The first argument is the location of the ZeroMQ source directory

if len(sys.argv) != 2:
print("usage: %s zmq.h"%(sys.argv[0]))
sys.exit(1)

ZMQ_H = sys.argv[1]

def create_lines(f):
result = f.read()
result = result.replace('\\\n', '')
Expand Down Expand Up @@ -109,6 +101,14 @@ def create_prototypes(lines,file_out):


def main():
# The first argument is the zmq.h file

if len(sys.argv) != 2:
print("usage: %s zmq.h"%(sys.argv[0]))
sys.exit(1)

ZMQ_H = sys.argv[1]

file_out = open('f77_zmq.h','w')

file_in = open( ZMQ_H, 'r' )
Expand Down

0 comments on commit e409e37

Please sign in to comment.