Skip to content

Commit 926ce7b

Browse files
committed
[core] desc.node: Use node's Python executable to call meshroom_compute
If `pythonExecutable` has not been explicitly set in the node's description, then the default `python` will be used. Otherwise, the one set in the description will be used. `_MESHROOM_COMPUTE_EXE` is removed since it is now impossible to determine it outside of the node.
1 parent 1ba572a commit 926ce7b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

meshroom/core/desc/node.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
_MESHROOM_ROOT = Path(meshroom.__file__).parent.parent.as_posix()
1818
_MESHROOM_COMPUTE = (Path(_MESHROOM_ROOT) / "bin" / "meshroom_compute").as_posix()
19-
_MESHROOM_COMPUTE_EXE = f"python {_MESHROOM_COMPUTE}"
2019

2120

2221
class MrNodeType(enum.Enum):
@@ -257,7 +256,8 @@ def getMrNodeType(self):
257256
return MrNodeType.NODE
258257

259258
def processChunkInEnvironment(self, chunk):
260-
meshroomComputeCmd = f"{_MESHROOM_COMPUTE_EXE} {chunk.node.graph.filepath} --node {chunk.node.name} --extern --inCurrentEnv"
259+
meshroomComputeCmd = f"{chunk.node.nodeDesc.pythonExecutable} {_MESHROOM_COMPUTE}"
260+
meshroomComputeCmd += f" {chunk.node.graph.filepath} --node {chunk.node.name} --extern --inCurrentEnv"
261261

262262
if len(chunk.node.getChunks()) > 1:
263263
meshroomComputeCmd += f" --iteration {chunk.range.iteration}"

0 commit comments

Comments
 (0)