mirror of
https://github.com/alicevision/Meshroom.git
synced 2025-06-22 04:27:29 +02:00
Code cleaning
This commit is contained in:
Vincent Demoulin
parent
812e1a80ea
commit
8c7eed2f34
1 changed files with 47 additions and 17 deletions
|
|
@ -71,15 +71,17 @@ Bounded box sizes can be increased by a ratio from 0 to 100%
|
||||||
desc.StringParam(
|
desc.StringParam(
|
||||||
name="prompt",
|
name="prompt",
|
||||||
label="Prompt",
|
label="Prompt",
|
||||||
description="What to segment.",
|
description="What to segment, separated by point or one item per line",
|
||||||
value="person",
|
value="person",
|
||||||
|
semantic="multiline",
|
||||||
uid=[0],
|
uid=[0],
|
||||||
),
|
),
|
||||||
desc.StringParam(
|
desc.StringParam(
|
||||||
name="synonyms",
|
name="synonyms",
|
||||||
label="Synonyms",
|
label="Synonyms",
|
||||||
description="Synonyms to prompt separated by commas. eg: man,woman,boy,girl can be used as synonyms of person",
|
description="Synonyms to prompt separated by commas or one item per line. eg: man,woman,boy,girl,human,people can be used as synonyms of person",
|
||||||
value="man,woman,boy,girl,human,people",
|
value="man\nwoman\nboy\ngirl\nhuman\npeople",
|
||||||
|
semantic="multiline",
|
||||||
uid=[0],
|
uid=[0],
|
||||||
),
|
),
|
||||||
desc.BoolParam(
|
desc.BoolParam(
|
||||||
|
|
@ -118,12 +120,30 @@ Bounded box sizes can be increased by a ratio from 0 to 100%
|
||||||
value=False,
|
value=False,
|
||||||
uid=[0],
|
uid=[0],
|
||||||
),
|
),
|
||||||
|
desc.ChoiceParam(
|
||||||
|
name="extension",
|
||||||
|
label="Output File Extension",
|
||||||
|
description="Output image file extension.\n"
|
||||||
|
"If unset, the output file extension will match the input's if possible.",
|
||||||
|
value="exr",
|
||||||
|
values=["exr", "png", "jpg"],
|
||||||
|
exclusive=True,
|
||||||
|
uid=[0],
|
||||||
|
group='', # remove from command line params
|
||||||
|
),
|
||||||
|
desc.BoolParam(
|
||||||
|
name="outputBboxImage",
|
||||||
|
label="Output Bounded Box Image",
|
||||||
|
description="Write source image with bounded boxes baked in.",
|
||||||
|
value=False,
|
||||||
|
uid=[0],
|
||||||
|
),
|
||||||
desc.ChoiceParam(
|
desc.ChoiceParam(
|
||||||
name="verboseLevel",
|
name="verboseLevel",
|
||||||
label="Verbose Level",
|
label="Verbose Level",
|
||||||
description="Verbosity level (fatal, error, warning, info, debug, trace).",
|
description="Verbosity level (fatal, error, warning, info, debug).",
|
||||||
value="info",
|
value="info",
|
||||||
values=["fatal", "error", "warning", "info", "debug", "trace"],
|
values=["fatal", "error", "warning", "info", "debug"],
|
||||||
exclusive=True,
|
exclusive=True,
|
||||||
uid=[],
|
uid=[],
|
||||||
)
|
)
|
||||||
|
|
@ -142,13 +162,13 @@ Bounded box sizes can be increased by a ratio from 0 to 100%
|
||||||
label="Masks",
|
label="Masks",
|
||||||
description="Generated segmentation masks.",
|
description="Generated segmentation masks.",
|
||||||
semantic="image",
|
semantic="image",
|
||||||
value=lambda attr: desc.Node.internalFolder + "<VIEW_ID>.exr" if not attr.node.keepFilename.value else desc.Node.internalFolder + "<FILENAME>.exr",
|
value=lambda attr: desc.Node.internalFolder + ("<FILENAME>" if attr.node.keepFilename.value else "<VIEW_ID>") + "." + attr.node.extension.value,
|
||||||
group="",
|
group="",
|
||||||
uid=[],
|
uid=[],
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
||||||
def resolvedPaths(self, inputSfm, outDir, keepFilename):
|
def resolvedPaths(self, inputSfm, outDir, keepFilename, ext):
|
||||||
paths = {}
|
paths = {}
|
||||||
dataAV = av.sfmData.SfMData()
|
dataAV = av.sfmData.SfMData()
|
||||||
if av.sfmDataIO.load(dataAV, inputSfm, av.sfmDataIO.ALL) and os.path.isdir(outDir):
|
if av.sfmDataIO.load(dataAV, inputSfm, av.sfmDataIO.ALL) and os.path.isdir(outDir):
|
||||||
|
|
@ -156,11 +176,11 @@ Bounded box sizes can be increased by a ratio from 0 to 100%
|
||||||
for id, v in views.items():
|
for id, v in views.items():
|
||||||
inputFile = v.getImage().getImagePath()
|
inputFile = v.getImage().getImagePath()
|
||||||
if keepFilename:
|
if keepFilename:
|
||||||
outputFileMask = os.path.join(outDir, Path(inputFile).stem + '.exr')
|
outputFileMask = os.path.join(outDir, Path(inputFile).stem + '.' + ext)
|
||||||
outputFileBoxes = os.path.join(outDir, "bboxes_" + Path(inputFile).stem + '.jpg')
|
outputFileBoxes = os.path.join(outDir, Path(inputFile).stem + "_bboxes" + '.jpg')
|
||||||
else:
|
else:
|
||||||
outputFileMask = os.path.join(outDir, str(id) + '.exr')
|
outputFileMask = os.path.join(outDir, str(id) + '.' + ext)
|
||||||
outputFileBoxes = os.path.join(outDir, "bboxes_" + str(id) + '.exr')
|
outputFileBoxes = os.path.join(outDir, str(id) + "_bboxes" + '.jpg')
|
||||||
paths[inputFile] = (outputFileMask, outputFileBoxes)
|
paths[inputFile] = (outputFileMask, outputFileBoxes)
|
||||||
|
|
||||||
return paths
|
return paths
|
||||||
|
|
@ -177,7 +197,7 @@ Bounded box sizes can be increased by a ratio from 0 to 100%
|
||||||
|
|
||||||
chunk.logger.info('Chunk range from {} to {}'.format(chunk.range.start, chunk.range.last))
|
chunk.logger.info('Chunk range from {} to {}'.format(chunk.range.start, chunk.range.last))
|
||||||
|
|
||||||
outFiles = self.resolvedPaths(chunk.node.input.value, chunk.node.output.value, chunk.node.keepFilename.value)
|
outFiles = self.resolvedPaths(chunk.node.input.value, chunk.node.output.value, chunk.node.keepFilename.value, chunk.node.extension.value)
|
||||||
|
|
||||||
if not os.path.exists(chunk.node.output.value):
|
if not os.path.exists(chunk.node.output.value):
|
||||||
os.mkdir(chunk.node.output.value)
|
os.mkdir(chunk.node.output.value)
|
||||||
|
|
@ -190,6 +210,11 @@ Bounded box sizes can be increased by a ratio from 0 to 100%
|
||||||
SAM_CHECKPOINT_PATH = chunk.node.segmentationModelPath.value,
|
SAM_CHECKPOINT_PATH = chunk.node.segmentationModelPath.value,
|
||||||
useGPU = chunk.node.useGpu.value)
|
useGPU = chunk.node.useGpu.value)
|
||||||
|
|
||||||
|
prompt = chunk.node.prompt.value.replace('\n','.')
|
||||||
|
chunk.logger.debug('prompt: {}'.format(prompt))
|
||||||
|
synonyms = chunk.node.synonyms.value.replace('\n',',')
|
||||||
|
chunk.logger.debug('synonyms: {}'.format(synonyms))
|
||||||
|
|
||||||
for k, (iFile, oFile) in enumerate(outFiles.items()):
|
for k, (iFile, oFile) in enumerate(outFiles.items()):
|
||||||
if k >= chunk.range.start and k <= chunk.range.last:
|
if k >= chunk.range.start and k <= chunk.range.last:
|
||||||
img = image.loadImage(iFile)
|
img = image.loadImage(iFile)
|
||||||
|
|
@ -201,15 +226,17 @@ Bounded box sizes can be increased by a ratio from 0 to 100%
|
||||||
invert = chunk.node.maskInvert.value,
|
invert = chunk.node.maskInvert.value,
|
||||||
verbose = False)
|
verbose = False)
|
||||||
|
|
||||||
|
chunk.logger.debug('image: {}'.format(iFile))
|
||||||
chunk.logger.debug('tags: {}'.format(tags))
|
chunk.logger.debug('tags: {}'.format(tags))
|
||||||
chunk.logger.debug('bboxes: {}'.format(bboxes))
|
chunk.logger.debug('bboxes: {}'.format(bboxes))
|
||||||
|
|
||||||
image.writeImage(oFile[0], mask)
|
image.writeImage(oFile[0], mask)
|
||||||
|
|
||||||
imgBoxes = (img * 255.0).astype('uint8')
|
if (chunk.node.outputBboxImage.value):
|
||||||
for bbox in bboxes:
|
imgBoxes = (img * 255.0).astype('uint8')
|
||||||
imgBoxes = image.addRectangle(imgBoxes, bbox)
|
for bbox in bboxes:
|
||||||
image.writeImage(oFile[1], imgBoxes)
|
imgBoxes = image.addRectangle(imgBoxes, bbox)
|
||||||
|
image.writeImage(oFile[1], imgBoxes)
|
||||||
|
|
||||||
del processor
|
del processor
|
||||||
torch.cuda.empty_cache()
|
torch.cuda.empty_cache()
|
||||||
|
|
@ -218,5 +245,8 @@ Bounded box sizes can be increased by a ratio from 0 to 100%
|
||||||
chunk.logManager.end()
|
chunk.logManager.end()
|
||||||
|
|
||||||
def stopProcess(sel, chunk):
|
def stopProcess(sel, chunk):
|
||||||
del processor
|
try:
|
||||||
|
del processor
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue