mirror of
https://gitlab.com/scemama/irpf90.git
synced 2024-09-02 01:33:42 +02:00
Better parallelization. Dummy touches when empty
Version:1.1.65
This commit is contained in:
parent
4179c67037
commit
3b532d1ac9
@ -40,7 +40,13 @@ def create():
|
|||||||
if var.is_touched:
|
if var.is_touched:
|
||||||
out += var.toucher
|
out += var.toucher
|
||||||
|
|
||||||
out = map(lambda x: "%s\n"%(x),out)
|
if out != []:
|
||||||
|
out = map(lambda x: "%s\n"%(x),out)
|
||||||
|
else:
|
||||||
|
out = """
|
||||||
|
subroutine irpf90_dummy_touch()
|
||||||
|
end
|
||||||
|
"""
|
||||||
if not same_file(FILENAME,out):
|
if not same_file(FILENAME,out):
|
||||||
file = open(FILENAME,'w')
|
file = open(FILENAME,'w')
|
||||||
file.writelines(out)
|
file.writelines(out)
|
||||||
|
38
src/util.py
38
src/util.py
@ -25,7 +25,7 @@
|
|||||||
# scemama@irsamc.ups-tlse.fr
|
# scemama@irsamc.ups-tlse.fr
|
||||||
|
|
||||||
import os
|
import os
|
||||||
NTHREADS=int(os.getenv('OMP_NUM_THREADS',4))
|
NTHREADS=int(os.getenv('OMP_NUM_THREADS',2))
|
||||||
|
|
||||||
def strip(x):
|
def strip(x):
|
||||||
return x.strip()
|
return x.strip()
|
||||||
@ -135,6 +135,12 @@ def parallel_loop(f,source):
|
|||||||
|
|
||||||
src = [ [] for i in xrange(NTHREADS) ]
|
src = [ [] for i in xrange(NTHREADS) ]
|
||||||
index = 0
|
index = 0
|
||||||
|
try:
|
||||||
|
source = map( lambda x: (len(x[1]),(x[0], x[1])), source )
|
||||||
|
source.sort()
|
||||||
|
source = map( lambda x: x[1], source )
|
||||||
|
except:
|
||||||
|
pass
|
||||||
for i in source:
|
for i in source:
|
||||||
index += 1
|
index += 1
|
||||||
if index == NTHREADS:
|
if index == NTHREADS:
|
||||||
@ -143,34 +149,36 @@ def parallel_loop(f,source):
|
|||||||
|
|
||||||
thread_id = 0
|
thread_id = 0
|
||||||
fork = 1
|
fork = 1
|
||||||
|
r = range(0,NTHREADS)
|
||||||
for thread_id in xrange(1,NTHREADS):
|
for thread_id in xrange(1,NTHREADS):
|
||||||
|
r[thread_id], w = os.pipe()
|
||||||
fork = os.fork()
|
fork = os.fork()
|
||||||
if fork == 0:
|
if fork == 0:
|
||||||
|
os.close(r[thread_id])
|
||||||
|
w = os.fdopen(w,'w')
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
|
os.close(w)
|
||||||
|
r[thread_id] = os.fdopen(r[thread_id],'r')
|
||||||
pidlist[thread_id] = fork
|
pidlist[thread_id] = fork
|
||||||
thread_id = 0
|
thread_id = 0
|
||||||
|
|
||||||
|
result = []
|
||||||
for filename, text in src[thread_id]:
|
for filename, text in src[thread_id]:
|
||||||
result = f(filename,text)
|
result.append( (filename, f(filename,text)) )
|
||||||
file = open('%s.pickle'%filename,'w')
|
|
||||||
pickle.dump(result,file,-1)
|
result.sort()
|
||||||
file.close()
|
|
||||||
|
|
||||||
if fork == 0:
|
if fork == 0:
|
||||||
|
pickle.dump(result,w,-1)
|
||||||
|
w.close()
|
||||||
os._exit(0)
|
os._exit(0)
|
||||||
|
|
||||||
for i in xrange(1,NTHREADS):
|
for i in xrange(1,NTHREADS):
|
||||||
|
result += pickle.load(r[i])
|
||||||
|
r[i].close()
|
||||||
if os.waitpid(pidlist[i],0)[1] != 0:
|
if os.waitpid(pidlist[i],0)[1] != 0:
|
||||||
os._exit(0)
|
raise OSError
|
||||||
|
|
||||||
result = []
|
|
||||||
for filename,text in source:
|
|
||||||
file = open('%s.pickle'%filename,'r')
|
|
||||||
data = pickle.load(file)
|
|
||||||
file.close()
|
|
||||||
os.remove('%s.pickle'%filename)
|
|
||||||
result.append( (filename, data) )
|
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user