En raison du déménagement des baies serveurs, les services gitlab.irstea.fr et mattermost.irstea.fr seront interrompus le samedi 2 octobre 2021 au matin. Ils devraient revenir à la normale dans la journée.

Unverified Commit 62fe739a authored by Julien Veyssier's avatar Julien Veyssier
Browse files

don't fix multiprocess for windows in core anymore, it's enough to do it in plugin


Signed-off-by: default avatarJulien Veyssier <eneiluj@posteo.net>
parent ad441e0a
......@@ -420,11 +420,6 @@ def processReach(params):
'''
def main(parms_file, nbProc, generator=False):
print('---------- HRU-delin Step 2 started ---------------------------------------------')
if platform.system() == 'Windows':
path = os.path.abspath(os.path.join(sys.exec_prefix, '../../bin/pythonw3.exe'))
multiprocessing.set_executable(path)
sys.argv = [None]
print('fix in core again %s'%os.path.abspath(os.path.join(sys.exec_prefix, '../../bin/pythonw3.exe')))
# TODO remove dirty global variables
global logf, gauge_code, gauge_area, reloc_lyr, col_name
......@@ -739,11 +734,6 @@ if __name__ == '__main__':
else:
nbProc = cpu_count()
if platform.system() == 'Windows':
path = os.path.abspath(os.path.join(sys.exec_prefix, '../../bin/pythonw3.exe'))
multiprocessing.set_executable(path)
sys.argv = [None]
# main is a generator but we don't use it here
for pc in main(parms_file, nbProc, False):
pass
......@@ -754,9 +744,4 @@ if __name__ == '__main__':
pass
else:
from .parallel import buildGrassEnv, buildGrassLocation, exportRasters, importRastersInEnv
from .progressColors import *
if platform.system() == 'Windows':
path = os.path.abspath(os.path.join(sys.exec_prefix, '../../bin/pythonw3.exe'))
multiprocessing.set_executable(path)
sys.argv = [None]
print('fix in core %s'%os.path.abspath(os.path.join(sys.exec_prefix, '../../bin/pythonw3.exe')))
\ No newline at end of file
from .progressColors import *
\ No newline at end of file
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