Skip to content

GitLab

P
pyhst2
Commit f1826c23 authored by Alessandro Mirone's avatar Alessandro Mirone
Browse files
Options

il reste le cas HEIKKI a corriger

parent 7a4ba969
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 16 deletions
PyHST/Parameters_module.py
View file @ f1826c23
......@@ -2630,7 +2630,7 @@ def retrieve_patches(namelist):
namelist=[namelist]
res=[]
for name in namelist:
h5 = h5py.File(name)
h5 = h5py.File(name,"r")
patches = numpy.array(h5["data"][:],"f")
res.append(patches)
patches= numpy.concatenate(res)
......
PyHST/PyHST.py
View file @ f1826c23
......@@ -310,7 +310,7 @@ def callpyhst(inputfile):
else:
args= [mpi_extra,rshagent,machinefile_name, nprocs, "pyhst_2_"+__init__.version ] + [inputfile]+sys.argv[2:]
seguito = " %s "*len(sys.argv[1:])
comando = ("mpirun --bind-to none %s --mca mpi_warn_on_fork 0 --mca orte_rsh_agent %s -machinefile %s -n %d %s "+seguito) % tuple(args)
comando = ("mpirun %s --mca mpi_warn_on_fork 0 --mca orte_rsh_agent %s -machinefile %s -n %d %s "+seguito) % tuple(args)
print comando +" " +gpus_string
os.system(comando+" " +gpus_string)
......@@ -323,11 +323,11 @@ if(sys.argv[0][-12:]!="sphinx-build"):
mpi_extra=" --byslot "
comando = 'mpirun --bind-to none -V'
comando = 'mpirun -V'
p1 = sub.Popen(args=string.split(comando, " ") ,stdin=sub.PIPE,stdout=sub.PIPE,stderr=sub.PIPE)
msg,errors= p1.communicate()
if " 2." in msg:
mpi_extra=" --bind-to none --map-by slot "
mpi_extra=" --map-by slot "
if P.IF_EXCLUDE is not None:
......@@ -343,7 +343,7 @@ if(sys.argv[0][-12:]!="sphinx-build"):
args= [mpi_extra, rshagent,machinefile_name, nprocs*4,"pyhst_jp2edf2_"+__init__.version ]+[inputfile]+["jp2edf"]+sys.argv[2:]
seguito = " %s "*(len(args)-5)
comando = ("mpirun --bind-to none %s --mca mpi_warn_on_fork 0 --mca orte_rsh_agent %s -machinefile %s -n %d %s "+seguito) % tuple(args)
comando = ("mpirun %s --mca mpi_warn_on_fork 0 --mca orte_rsh_agent %s -machinefile %s -n %d %s "+seguito) % tuple(args)
if P.VERBOSITY>1 : print comando +" " +gpus_string
os.system(comando+" " +gpus_string)
......@@ -445,9 +445,9 @@ if(sys.argv[0][-12:]!="sphinx-build"):
seguito = " %s "*(len(args)-5)
print args
print "mpirun --bind-to none %s --mca mpi_warn_on_fork 0 --mca orte_rsh_agent %s -machinefile %s -n %d %s "+seguito
print "mpirun %s --mca mpi_warn_on_fork 0 --mca orte_rsh_agent %s -machinefile %s -n %d %s "+seguito
comando = ("mpirun --bind-to none %s --mca mpi_warn_on_fork 0 --mca orte_rsh_agent %s -machinefile %s -n %d %s "+seguito) % tuple(args)
comando = ("mpirun %s --mca mpi_warn_on_fork 0 --mca orte_rsh_agent %s -machinefile %s -n %d %s "+seguito) % tuple(args)
if P.VERBOSITY>1 : print comando +" " +gpus_string
os.system(comando+" " +gpus_string)
......@@ -482,7 +482,7 @@ if(sys.argv[0][-12:]!="sphinx-build"):
args= [mpi_extra,rshagent,machinefile_name, nprocs, "pyhst_segment2_"+__init__.version ] + ["spilla",pagbone_outputfile, absbone_outputfile,maskbone_outputfile, remplacement, corrbone_outputfile]+sys.argv[2:]
seguito = " %s "*(len(args)-5)
comando = ("mpirun --bind-to none %s --mca mpi_warn_on_fork 0 --mca orte_rsh_agent %s -machinefile %s -n %d %s "+seguito) % tuple(args)
comando = ("mpirun %s --mca mpi_warn_on_fork 0 --mca orte_rsh_agent %s -machinefile %s -n %d %s "+seguito) % tuple(args)
if P.VERBOSITY>2 : print comando +" " +gpus_string
os.system(comando+" " +gpus_string)
......@@ -554,7 +554,7 @@ if(sys.argv[0][-12:]!="sphinx-build"):
args= [mpi_extra,rshagent,machinefile_name, nprocs, "pyhst_segment2_"+__init__.version ] + [ "incolla", pagbone_outputfile,maskbone_outputfile, correctedvol_outputfile, P.OUTPUT_FILE]+sys.argv[2:]
seguito = " %s "*(len(args)-5)
comando = ("mpirun --bind-to none %s --mca mpi_warn_on_fork 0 --mca orte_rsh_agent %s -machinefile %s -n %d %s "+seguito) % tuple(args)
comando = ("mpirun %s --mca mpi_warn_on_fork 0 --mca orte_rsh_agent %s -machinefile %s -n %d %s "+seguito) % tuple(args)
if P.VERBOSITY>2 :print comando +" " +gpus_string
os.system(comando+" " +gpus_string)
......@@ -575,7 +575,7 @@ if(sys.argv[0][-12:]!="sphinx-build"):
args= [mpi_extra, rshagent,machinefile_name, nprocs,"pyhst_jp2edf2_"+__init__.version ]+[inputfile]+["removejp2"]+sys.argv[2:]
seguito = " %s "*(len(args)-5)
comando = ("mpirun --bind-to none %s -mca btl_tcp_if_exclude docker0 --mca mpi_warn_on_fork 0 --mca orte_rsh_agent %s -machinefile %s -n %d %s "+seguito) % tuple(args)
comando = ("mpirun %s -mca btl_tcp_if_exclude docker0 --mca mpi_warn_on_fork 0 --mca orte_rsh_agent %s -machinefile %s -n %d %s "+seguito) % tuple(args)
if P.VERBOSITY>1 : print comando +" " +gpus_string
os.system(comando+" " +gpus_string)
TEST_PYHST/compara.py
View file @ f1826c23
......@@ -7,12 +7,17 @@ import numpy as np
from PyQt4 import Qt, QtCore
from PyQt4.QtCore import SIGNAL, SLOT
newversionprefix ="/data/scisofttmp/mirone/TEST_PYHST/RESULTS/2017c/gpu2-1304/tests"
referenceprefix="/data/scisofttmp/mirone/TEST_PYHST/RESULTS/2015d/gpu2-0102/tests"
newversionprefix ="/data/scisofttmp/mirone/TEST_PYHST/RESULTS/2018bb/1gpu/tests/"
referenceprefix="/data/scisofttmp/mirone/TEST_PYHST/RESULTS/2018bb/2gpu_bis/tests/"
newversionprefix ="/data/scisofttmp/mirone/TEST_PYHST/RESULTS/2017c_final/2gpu_bis/tests/MULTIPAGANIN/"
# /data/scisofttmp/mirone/TEST_PYHST/RESULTS/2015d/gpu2-0102/tests"
# newversionprefix ="/data/scisofttmp/mirone/TEST_PYHST/RESULTS/2017c_final/2gpu_bis/tests/MULTIPAGANIN/"
# referenceprefix="/data/scisofttmp/mirone/TEST_PYHST/RESULTS/2015d/gpu2-0102/tests/SIRT_LENA/"
referenceprefix ="/data/scisofttmp/mirone/TEST_PYHST/RESULTS/2017c_final/1gpu_bis/tests/MULTIPAGANIN/"
# referenceprefix ="/data/scisofttmp/mirone/TEST_PYHST/RESULTS/2017c_final/1gpu_bis/tests/MULTIPAGANIN/"
import numpy
from mpi4py import MPI
......
TEST_PYHST/nonregression.py
View file @ f1826c23
......@@ -41,9 +41,9 @@ mailserver = None
# mailserver="tuodomain.country"
# LAUNCHING_INSTRUCTION = "echo 'localhost\n' > machinefile ; time PyHST2_2017c input.par gpu2-1304,0"
LAUNCHING_INSTRUCTION = "time PyHST2_2018bb input.par scisoft12,0"
LAUNCHING_INSTRUCTION = "time PyHST2_2018bb input.par"
outputprefix="/data/scisofttmp/mirone/TEST_PYHST/RESULTS/2018bb/1gpu/tests"
outputprefix="/data/scisofttmp/mirone/TEST_PYHST/RESULTS/2018bb/2gpu_bis/tests"
# outputprefix="/data/scisofttmp/mirone/TEST_PYHST/RESULTS/2017c/2gpu_bis/tests"
# outputprefix="/data/scisofttmp/paleo/TEST_PYHST/DATASETS_RED/OUTPUTS"
......@@ -64,6 +64,10 @@ CASI_partial = [ "ID11_SNOW", "LENA", "LENA_MULTIRINGS", "MOUSSE", "MULTIP
casi = CASI_ALL
casi = [
"LENA", "LENA_MULTIRINGS", "MOUSSE", "MULTIPAGANIN","NANOPOINTS", "NNFBP",
"PATCHES_VECTORIAL", "SINO_THRESHOLD", "SIRT_LENA" ]
import fnmatch
import os
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment