Skip to content

Fixed Benchmark And Added ALPR To The Benchmark #321

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 23, 2025
Merged

Fixed Benchmark And Added ALPR To The Benchmark #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 42 additions & 10 deletions src/server/wwwroot/assets/explorer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,20 @@ function initVideoDemo() {
}
}

// Function to enable/disable model selection based on selected mode
function toggleModelSelection() {
const alprSelected = document.getElementById('benchmarkModeALPR').checked;
const modelDropdown = document.getElementById('benchmarkModel');

if (alprSelected) {
// Disable the model dropdown when ALPR is selected
modelDropdown.disabled = true;
} else {
// Enable the model dropdown when Object Detection is selected
modelDropdown.disabled = false;
}
}

// Display server and module statuses ==========================================

/**
Expand Down Expand Up @@ -889,6 +903,9 @@ async function setBenchmarkCustomList() {
customModelList.splice(1, 0, { name: "No inference: round-trip speed test only", value: "round-trip"});

setModelList("benchmarkModel", customModelList);

// Initialize model selection state after setting the list
toggleModelSelection();
}
}

Expand Down Expand Up @@ -1139,11 +1156,18 @@ const maxBenchmarkRequests = 50;
let totalBenchmarkRequests = 0;

async function onBenchmark(fileChooser, model_name, parallelism) {

clearImagePreview();

let images = null;
let route = model_name ? ('custom/' + model_name) : 'detection';
let mode = document.querySelector('input[name="benchmarkMode"]:checked').value;

// Ignore model_name when ALPR is selected
let route;
if (mode === "alpr") {
route = "alpr";
} else {
route = model_name ? ('custom/' + model_name) : mode;
}

if (benchmarkModel.value == "round-trip") {
route = "custom/list";
Expand All @@ -1154,22 +1178,30 @@ async function onBenchmark(fileChooser, model_name, parallelism) {
return;
}

previewImage(fileChooser.files[0]);
previewImage(fileChooser);

images = [fileChooser.files[0]];
}

// Warm up
totalBenchmarkRequests = 0;
setResultsHtml("Starting benchmark test using " + mode + " route");

// Perform warmup requests
for (let i = 0; i < warmupCount; i++) {
let data = await submitRequest('vision', route, images);
if (data)
setResultsHtml("Warm up " + i);
try {
await submitRequest('vision', route, images);
}
catch (error) {
console.log("Warmup request failed: " + error);
}
}

// Benchmark
let startMilliseconds = performance.now();
totalBenchmarkRequests = 0;
for (let i = 0; i < parallelism; i++)

// Start actual benchmark
for (let i = 0; i < parallelism; i++) {
sendBenchmarkRequest(route, images, startMilliseconds);
}
}

function sendBenchmarkRequest(route, images, startMilliseconds) {
Expand Down
22 changes: 18 additions & 4 deletions src/server/wwwroot/explorer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>

<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head>
Expand All @@ -14,10 +14,10 @@
<link rel="icon" type="image/png" sizes="16x16" href="assets/favicon-16x16.png">

<link id="bootstrapCss" rel="stylesheet" type="text/css" href="assets/bootstrap-dark.min.css">
<link rel="stylesheet" type="text/css" href="assets/server.css?v=2.9.3">
<link rel="stylesheet" type="text/css" href="assets/server.css?v=2.9.4">

<script type="text/javascript" src="assets/server.js?v=2.9.3"></script>
<script type="text/javascript" src="assets/explorer.js?v=2.9.3"></script>
<script type="text/javascript" src="assets/server.js?v=2.9.4"></script>
<script type="text/javascript" src="assets/explorer.js?v=2.9.4"></script>

<!-- Will only be effective if you're connected to the internet -->
<link rel="preconnect" href="https://fonts.googleapis.com">
Expand Down Expand Up @@ -56,6 +56,9 @@
setInterval(setBenchmarkCustomList, customModelUpdateFreqSec * 1000);

initVideoDemo();

// Initial state of model selection based on default radio selection
toggleModelSelection();
});
</script>

Expand Down Expand Up @@ -249,6 +252,17 @@
<input class="col form-control btn-light" id="benchmarkInput"
type="file" style="width:17rem" onchange="return previewImage(this)" />
</div>
<div class="form-group d-flex mt-2">
<label class="col-form-label col-2">Mode</label>
<div class="form-check form-check-inline mt-2">
<input class="form-check-input" type="radio" name="benchmarkMode" id="benchmarkModeDetection" value="detection" checked onchange="toggleModelSelection()">
<label class="form-check-label" for="benchmarkModeDetection">Object Detection</label>
</div>
<div class="form-check form-check-inline mt-2">
<input class="form-check-input" type="radio" name="benchmarkMode" id="benchmarkModeALPR" value="alpr" onchange="toggleModelSelection()">
<label class="form-check-label" for="benchmarkModeALPR">License Plate Recognition</label>
</div>
</div>
<div class="form-group d-flex justify-content-end mt-2">
<label class="col-form-label col-2">Model</label>
<select id="benchmarkModel" class="form-select me-5">
Expand Down