Commit 025c0959 authored by Alessandro Mirone's avatar Alessandro Mirone

python2 python3 compatibility for a string argument

parent 45173840
......@@ -44,6 +44,10 @@ if(sys.argv[0][-12:]!="sphinx-build"):
from . import string_six
from . import EdfFile
from . import LTSparsePrep
from six import string_types
if mpistatus.status :
from . import setCpuSet
......@@ -2062,7 +2066,7 @@ Units are pixels per projection.
DOUBLERUN4DFF=0
if DOUBLEFFCORRECTION:
if not isinstance(DOUBLEFFCORRECTION, basestring) :
if not isinstance(DOUBLEFFCORRECTION, string_types):
dname = os.path.dirname(OUTPUT_FILE)
dd_path = os.path.join( dname,"pyhst_dff_%.2f.edf"%FF2_SIGMA)
print( " CONTROLLO ", dd_path)
......
......@@ -86,7 +86,7 @@ DO_LINK = 0
global version
global aumento_versione
aumento_versione="f"
aumento_versione="g"
global version
......@@ -406,7 +406,7 @@ def do_pyhst():
CUDA={'include':[]}
CUDA .update(locate_cuda())
CUDA["arch"] = [ "-gencode", "arch=compute_20,code=compute_20",
CUDA["arch"] = [ # "-gencode", "arch=compute_20,code=compute_20",
"-gencode", "arch=compute_30,code=compute_30" ,
"-gencode", "arch=compute_50,code=compute_50"
]
......
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