From f6eb72c068872679ac8d82a9e54dedfb338baa61 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Wed, 23 Nov 2011 18:28:08 +0100 Subject: [PATCH] TEST Version:1.2.7 --- example/Makefile | 2 +- example/irp_example1.irp.f | 10 +++------- example/uvwt.irp.f | 2 +- src/util.py | 8 +------- src/version.py | 2 +- 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/example/Makefile b/example/Makefile index 4602bb7..67c451e 100644 --- a/example/Makefile +++ b/example/Makefile @@ -1,4 +1,4 @@ -IRPF90 = irpf90 #-a -d +IRPF90 = irpf90 -a -d FC = gfortran FCFLAGS= -O2 diff --git a/example/irp_example1.irp.f b/example/irp_example1.irp.f index 0072883..02f5493 100644 --- a/example/irp_example1.irp.f +++ b/example/irp_example1.irp.f @@ -1,14 +1,10 @@ program irp_example1 - integer :: x(w) + integer :: x(W) BEGIN_SHELL [ /bin/bash ] echo print *, \'Compiled by `whoami` on `date`\' echo print *, \'$FC $FCFLAGS\' echo print *, \'$IRPF90\' END_SHELL - call run - -end - -subroutine run - print *, 't = ', t +! print *, 't = ', t + print *, u2 end diff --git a/example/uvwt.irp.f b/example/uvwt.irp.f index 61d061d..63655a1 100644 --- a/example/uvwt.irp.f +++ b/example/uvwt.irp.f @@ -8,7 +8,7 @@ END_PROVIDER BEGIN_PROVIDER [ integer, v ] v = u2+w+2 -!END_PROVIDER +END_PROVIDER BEGIN_PROVIDER [ integer, u1 ] integer :: fu diff --git a/src/util.py b/src/util.py index d20ff86..b0890bc 100644 --- a/src/util.py +++ b/src/util.py @@ -173,16 +173,10 @@ def parallel_loop(f,source): w.close() os._exit(0) - OK = True - for i in xrange(1,NTHREADS): - if os.waitpid(pidlist[i],0)[1] != 0: - OK = False - if not OK: - sys.exit(1) - for i in xrange(1,NTHREADS): result += pickle.load(r[i]) r[i].close() + os.waitpid(pidlist[i],0)[1] return result diff --git a/src/version.py b/src/version.py index fd95535..9aaf21b 100644 --- a/src/version.py +++ b/src/version.py @@ -1 +1 @@ -version = "1.2.6" +version = "1.2.7"