3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-04-29 10:17:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

Create Init functions for nodes, submitters and pipelines

Browse source
This commit is contained in:
Vincent Demoulin 2024-07-05 09:04:09 +02:00 • committed by Fabien Castan
parent b173de5a73
commit a6be4e4938
5 changed files with 34 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/meshroom_batch
View file

@ -14,6 +14,7 @@ from meshroom import multiview
from meshroom.core.desc import InitNode from meshroom.core.desc import InitNode
import logging import logging
meshroom.core.initPlugins()
parser = argparse.ArgumentParser(description='Launch the full photogrammetry or Panorama HDR pipeline.') parser = argparse.ArgumentParser(description='Launch the full photogrammetry or Panorama HDR pipeline.')
parser.add_argument('-i', '--input', metavar='NODEINSTANCE:"SFM/FOLDERS/IMAGES;..."', type=str, nargs='*', parser.add_argument('-i', '--input', metavar='NODEINSTANCE:"SFM/FOLDERS/IMAGES;..."', type=str, nargs='*',

2
bin/meshroom_compute
View file

@ -31,6 +31,8 @@ parser.add_argument('-i', '--iteration', type=int,
args = parser.parse_args() args = parser.parse_args()
meshroom.core.initNodes()
graph = meshroom.core.graph.loadGraph(args.graphFile) graph = meshroom.core.graph.loadGraph(args.graphFile)
if args.cache: if args.cache:
graph.cacheDir = args.cache graph.cacheDir = args.cache

3
bin/meshroom_submit
View file

@ -22,4 +22,7 @@ parser.add_argument("--submitLabel",
args = parser.parse_args() args = parser.parse_args()
meshroom.core.initNodes()
meshroom.core.initSubmitters()
meshroom.core.graph.submit(args.meshroomFile, args.submitter, toNode=args.toNode, submitLabel=args.submitLabel) meshroom.core.graph.submit(args.meshroomFile, args.submitter, toNode=args.toNode, submitLabel=args.submitLabel)

46
meshroom/core/__init__.py
View file

@ -330,30 +330,32 @@ def loadPipelineTemplates(folder):
if file.endswith(".mg") and file not in pipelineTemplates: if file.endswith(".mg") and file not in pipelineTemplates:
pipelineTemplates[os.path.splitext(file)[0]] = os.path.join(folder, file) pipelineTemplates[os.path.splitext(file)[0]] = os.path.join(folder, file)
meshroomFolder = os.path.dirname(os.path.dirname(__file__)) def initNodes():
meshroomFolder = os.path.dirname(os.path.dirname(__file__))
additionalNodesPath = os.environ.get("MESHROOM_NODES_PATH", "").split(os.pathsep) additionalNodesPath = os.environ.get("MESHROOM_NODES_PATH", "").split(os.pathsep)
# filter empty strings # filter empty strings
additionalNodesPath = [i for i in additionalNodesPath if i] additionalNodesPath = [i for i in additionalNodesPath if i]
nodesFolders = [os.path.join(meshroomFolder, 'nodes')] + additionalNodesPath
# Load plugins: for f in nodesFolders:
# - Nodes
nodesFolders = [os.path.join(meshroomFolder, 'nodes')] + additionalNodesPath
for f in nodesFolders:
loadAllNodes(folder=f) loadAllNodes(folder=f)
# - Submitters def initSubmitters():
subs = loadSubmitters(os.environ.get("MESHROOM_SUBMITTERS_PATH", meshroomFolder), 'submitters') meshroomFolder = os.path.dirname(os.path.dirname(__file__))
subs = loadSubmitters(os.environ.get("MESHROOM_SUBMITTERS_PATH", meshroomFolder), 'submitters')
for sub in subs: for sub in subs:
registerSubmitter(sub()) registerSubmitter(sub())
# Load pipeline templates: check in the default folder and any folder the user might have def initPipelines():
# added to the environment variable meshroomFolder = os.path.dirname(os.path.dirname(__file__))
additionalPipelinesPath = os.environ.get("MESHROOM_PIPELINE_TEMPLATES_PATH", "").split(os.pathsep) # Load pipeline templates: check in the default folder and any folder the user might have
additionalPipelinesPath = [i for i in additionalPipelinesPath if i] # added to the environment variable
pipelineTemplatesFolders = [os.path.join(meshroomFolder, 'pipelines')] + additionalPipelinesPath additionalPipelinesPath = os.environ.get("MESHROOM_PIPELINE_TEMPLATES_PATH", "").split(os.pathsep)
additionalPipelinesPath = [i for i in additionalPipelinesPath if i]
for f in pipelineTemplatesFolders: pipelineTemplatesFolders = [os.path.join(meshroomFolder, 'pipelines')] + additionalPipelinesPath
for f in pipelineTemplatesFolders:
loadPipelineTemplates(f) loadPipelineTemplates(f)
def initPlugins():
initNodes()
initSubmitters()
initPipelines()

2
meshroom/ui/app.py
View file

@ -124,6 +124,8 @@ class MeshroomApp(QApplication):
# - clean cache directory and make sure it exists on disk # - clean cache directory and make sure it exists on disk
ThumbnailCache.initialize() ThumbnailCache.initialize()
meshroom.core.initPlugins()
# QML engine setup # QML engine setup
qmlDir = os.path.join(pwd, "qml") qmlDir = os.path.join(pwd, "qml")
url = os.path.join(qmlDir, "main.qml") url = os.path.join(qmlDir, "main.qml")