diff --git a/bin/meshroom_batch b/bin/meshroom_batch index 0ddf6b209b..68b83b4e47 100755 --- a/bin/meshroom_batch +++ b/bin/meshroom_batch @@ -72,8 +72,7 @@ general_group.add_argument( general_group.add_argument( '-s', '--save', metavar='FILE', type=str, required=False, - help='Save the configured Meshroom graph to a project file. It will setup the cache folder ' - 'accordingly if not explicitly changed by --cache.') + help='Save the configured Meshroom graph to a project file. It will setup the cache folder accordingly. ') general_group.add_argument( '--submit', help='Submit on renderfarm instead of local computation.', @@ -100,11 +99,6 @@ advanced_group.add_argument( '--paramOverrides', metavar='NODETYPE:param=value NODEINSTANCE.param=value', type=str, default=None, nargs='*', help='Override specific parameters directly from the command line (by node type or by node names).') -advanced_group.add_argument( - '--cache', metavar='FOLDER', type=str, - default=None, - help='Custom cache folder to write computation results.') - advanced_group.add_argument( '--compute', metavar='', type=lambda x: bool(distutils.util.strtobool(x)), default=True, required=False, help='You can set it to to disable the computation.') @@ -290,11 +284,8 @@ with meshroom.core.graph.GraphModification(graph): raise ValueError('Invalid param override: ' + str(p)) print("\n") - # setup cache directory - graph.cacheDir = args.cache if args.cache else "" - if args.save: - graph.save(args.save, setupProjectFile=not bool(args.cache)) + graph.save(args.save) print(f'File successfully saved: "{args.save}"') # find end nodes (None will compute all graph) diff --git a/meshroom/core/graph.py b/meshroom/core/graph.py index 562cb624f5..9e390e3049 100644 --- a/meshroom/core/graph.py +++ b/meshroom/core/graph.py @@ -1658,7 +1658,7 @@ def executeGraph(graph, toNodes=None, forceCompute=False, forceStatus=False): print('Nodes to execute: ', str([n.name for n in nodes])) - graph.save() + graph.save(setupProjectFile=False) for node in nodes: node.beginSequence(forceCompute)