Added support for new faceai parameters
All checks were successful
Publish FaceAI Container / publish (push) Successful in 9m39s

This commit is contained in:
MaddoScientisto 2026-05-09 14:46:44 +02:00
commit a026fec62b
12 changed files with 152 additions and 13 deletions

View file

@ -190,6 +190,99 @@ function Get-MulticoreSetting {
return -1
}
function Get-ParallelismSetting {
param(
[Parameter(Mandatory = $true)]
[ValidateSet('cpu', 'gpu')]
[string]$EncoderVariant
)
Write-Host ''
if ($EncoderVariant -eq 'gpu') {
Write-Host "Seleziona il livello di multiprocess per l'elaborazione GPU:"
Write-Host ' 1 = 1/8 dei worker'
Write-Host ' 2 = 1/4 dei worker'
Write-Host ' 3 = 1/2 dei worker (predefinito)'
Write-Host ' 4 = 3/4 dei worker'
Write-Host ' 5 = tutti i worker'
Write-Host ''
$parallelismChoice = Read-Host 'Inserisci il livello (1-5) oppure premi Invio per usare il predefinito (3)'
} else {
Write-Host "Seleziona il livello di multicore per l'elaborazione CPU:"
Write-Host ' 1 = 1/8 dei core'
Write-Host ' 2 = 1/4 dei core'
Write-Host ' 3 = 1/2 dei core (predefinito)'
Write-Host ' 4 = 3/4 dei core'
Write-Host ' 5 = n-2 core'
Write-Host ''
$parallelismChoice = Read-Host 'Inserisci il livello (1-5) oppure premi Invio per usare il predefinito (3)'
}
if ($parallelismChoice -match '^[1-5]$') {
return [int]$parallelismChoice
}
return 3
}
function Get-MinSizeSetting {
Write-Host ''
Write-Host 'Imposta la dimensione minima in pixel del volto da considerare.'
Write-Host 'Premi Invio per usare il predefinito (35).'
Write-Host ''
$minSizeChoice = Read-Host 'Min size'
if ([string]::IsNullOrWhiteSpace($minSizeChoice)) {
return 35
}
if ($minSizeChoice -match '^\d+$' -and [int]$minSizeChoice -gt 0) {
return [int]$minSizeChoice
}
Write-Warning 'Valore non valido. Viene usato il valore predefinito 35.'
return 35
}
function Get-UpsampleSetting {
param(
[Parameter(Mandatory = $true)]
[ValidateSet('cpu', 'gpu')]
[string]$EncoderVariant
)
$defaultEnabled = $EncoderVariant -eq 'cpu'
$defaultLabel = if ($defaultEnabled) { 'S' } else { 'N' }
Write-Host ''
Write-Host 'Vuoi abilitare l''upsample per migliorare il rilevamento dei volti piccoli?'
if ($defaultEnabled) {
Write-Host 'Premi Invio per usare il predefinito consigliato per CPU (S).'
} else {
Write-Host 'Premi Invio per usare il predefinito consigliato per GPU (N).'
}
Write-Host ''
$upsampleChoice = Read-Host "Abilitare upsample? (S/N, predefinito: $defaultLabel)"
if ([string]::IsNullOrWhiteSpace($upsampleChoice)) {
return $defaultEnabled
}
if ($upsampleChoice -match '^(s|si|y|yes)$') {
return $true
}
if ($upsampleChoice -match '^(n|no)$') {
return $false
}
Write-Warning "Scelta non valida. Viene usato il predefinito: $defaultLabel"
return $defaultEnabled
}
function Show-PklFilePicker {
param(
[Parameter(Mandatory = $true)]
@ -343,11 +436,9 @@ function Invoke-FaceEncoding {
$encoderVariant = Get-EncoderVariant
$encoderDir = Join-Path $PSScriptRoot ("face_encoder_{0}" -f $encoderVariant)
$outputDir = Join-Path $encoderDir 'output'
$multicore = -1
if ($encoderVariant -eq 'cpu') {
$multicore = Get-MulticoreSetting
}
$parallelism = Get-ParallelismSetting -EncoderVariant $encoderVariant
$minSize = Get-MinSizeSetting
$useUpsample = Get-UpsampleSetting -EncoderVariant $encoderVariant
$inputPath = [ModernFolderPicker]::Show('Select the folder containing images to encode')
@ -380,17 +471,25 @@ function Invoke-FaceEncoding {
$encoderArgs.Add('-l')
$encoderArgs.Add($logFile)
if ($multicore -ge 0) {
$encoderArgs.Add('-m')
$encoderArgs.Add([string]$multicore)
$encoderArgs.Add('-m')
$encoderArgs.Add([string]$parallelism)
$encoderArgs.Add('-s')
$encoderArgs.Add([string]$minSize)
if ($useUpsample) {
$encoderArgs.Add('-u')
}
Write-Host "Input folder : $($inputFolder.FullName)"
Write-Host "Encoder : $($encoderVariant.ToUpperInvariant())"
Write-Host "Race name : $raceName"
if ($encoderVariant -eq 'cpu') {
Write-Host "Multicore : $(if ($multicore -ge 0) { $multicore } else { 'default (3)' })"
Write-Host "Multicore : $parallelism"
} else {
Write-Host "Multiprocess : $parallelism"
}
Write-Host "Min size : $minSize"
Write-Host "Upsample : $(if ($useUpsample) { 'enabled' } else { 'disabled' })"
Write-Host "Output file : $outputFile"
Write-Host "Log file : $logFile"
Write-Host "Command : $encoderExe $encoderArgs"