3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-07-25 20:47:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

[core] desc.node: Ensure all paths are sent as POSIX strings

Browse source
This commit is contained in:
Candice Bentéjac 2025-06-25 14:53:04 +02:00 • committed by Fabien Castan
parent 517a64d82e
commit caaba97834
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
meshroom/core/desc/node.py
View file

@ -14,8 +14,8 @@ from .attribute import StringParam, ColorParam
import meshroom import meshroom
from meshroom.core import cgroup from meshroom.core import cgroup
_MESHROOM_ROOT = Path(meshroom.__file__).parent.parent _MESHROOM_ROOT = Path(meshroom.__file__).parent.parent.as_posix()
_MESHROOM_COMPUTE = _MESHROOM_ROOT / "bin" / "meshroom_compute" _MESHROOM_COMPUTE = (Path(_MESHROOM_ROOT) / "bin" / "meshroom_compute").as_posix()
class MrNodeType(enum.Enum): class MrNodeType(enum.Enum):
@ -148,14 +148,14 @@ class BaseNode(object):
chunk.saveStatusFile() chunk.saveStatusFile()
cmdList = shlex.split(cmd) cmdList = shlex.split(cmd)
# Resolve executable to full path # Resolve executable to full path
prog = shutil.which(cmdList[0], path=env.get('PATH') if env else None) prog = shutil.which(cmdList[0], path=env.get("PATH") if env else None)
print(f"Starting Process for '{chunk.node.name}'") print(f"Starting Process for '{chunk.node.name}'")
print(f" - commandLine: {cmd}") print(f" - commandLine: {cmd}")
print(f" - logFile: {chunk.logFile}") print(f" - logFile: {chunk.logFile}")
if prog: if prog:
cmdList[0] = prog cmdList[0] = Path(prog).as_posix()
print(f" - command full path: {prog}") print(f" - command full path: {cmdList[0]}")
# Change the process group to avoid Meshroom main process being killed if the # Change the process group to avoid Meshroom main process being killed if the
# subprocess gets terminated by the user or an Out Of Memory (OOM kill). # subprocess gets terminated by the user or an Out Of Memory (OOM kill).

8
meshroom/core/graph.py
View file

@ -7,6 +7,7 @@ from collections.abc import Iterable
import weakref import weakref
from collections import defaultdict, OrderedDict from collections import defaultdict, OrderedDict
from contextlib import contextmanager from contextlib import contextmanager
from pathlib import Path
from enum import Enum from enum import Enum
@ -1400,9 +1401,12 @@ class Graph(BaseObject):
self._unsetFilepath() self._unsetFilepath()
return return
if self._filepath == filepath: # Make sure the path is stored using the POSIX convention
# so that it can be used when creating sub-processes for node execution.
newFilepath = Path(filepath).as_posix()
if self._filepath == newFilepath:
return return
self._filepath = filepath self._filepath = newFilepath
# For now: # For now:
# * cache folder is located next to the graph file # * cache folder is located next to the graph file
# * graph name if the basename of the graph file # * graph name if the basename of the graph file