Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added support for unknown image detector/descriptor type #2252

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion meshroom/nodes/aliceVision/FeatureMatching.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class FeatureMatching(desc.AVCommandLineNode):
label="Describer Types",
description="Describer types used to describe an image.",
value=["dspsift"],
values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", "sift_ocv", "akaze_ocv", "tag16h5"],
values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", "sift_ocv", "akaze_ocv", "tag16h5", "unknown"],
exclusive=False,
uid=[0],
joinChar=",",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/nodes/aliceVision/StructureFromMotion.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class StructureFromMotion(desc.AVCommandLineNode):
label="Describer Types",
description="Describer types used to describe an image.",
value=["dspsift"],
values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", "sift_ocv", "akaze_ocv", "tag16h5"],
values=["sift", "sift_float", "sift_upright", "dspsift", "akaze", "akaze_liop", "akaze_mldb", "cctag3", "cctag4", "sift_ocv", "akaze_ocv", "tag16h5", "unknown"],
exclusive=False,
uid=[0],
joinChar=",",
Expand Down
7 changes: 4 additions & 3 deletions meshroom/submitters/rippleSubmitter.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ def createTask(self, meshroomFile, node, parents):
"INTENSIVE":",gpu16G"
}

#Specify some constraints
requirements = "!\"rs*\",@.mem>25{gpu}".format(gpu=gpudict[node.nodeDesc.gpu.name])

#decide if we need multiple slots
minProcessors = 1
maxProcessors = 1
Expand All @@ -52,12 +55,10 @@ def createTask(self, meshroomFile, node, parents):
minProcessors = 2
#if more than 2 are available without waiting, use 3 or 4
maxProcessors = 4
requirements = requirements + ",!\"rr*\""
elif Level.NORMAL in (node.nodeDesc.ram, node.nodeDesc.cpu):
#if 2 are available, otherwise 1
maxProcessors = 2

#Specify some constraints
requirements = "!\"rs*\",@.mem>25{gpu}".format(gpu=gpudict[node.nodeDesc.gpu.name])

#specify which node to wait before launching the current one
waitsFor = []
Expand Down