Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-19 00:41:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Preload OD models before import to check quantization (#2056)

Browse Source 
Co-authored-by: samfreund <samf.236@proton.me>
Co-authored-by: Sam Freund <techguy763@gmail.com>
This commit is contained in:
Rikhil Chilka
2025-08-16 01:59:22 -04:00
committed by GitHub
parent 2ab7a2e389
commit 2eb224a55f
4 changed files with 49 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -39,8 +39,8 @@ ext {
openCVversion = "4.10.0-3"
javalinVersion = "5.6.2"
libcameraDriverVersion = "v2025.0.3"
rknnVersion = "dev-v2025.0.0-1-g33b6263"
rubikVersion = "v2025.1.0"
rknnVersion = "dev-v2025.0.0-5-g666c0c6"
rubikVersion = "dev-v2025.1.0-8-g067a316"
frcYear = "2025"
mrcalVersion = "v2025.0.0";

2
photon-core/src/main/java/org/photonvision/vision/objects/RknnObjectDetector.java
View File

@@ -74,6 +74,8 @@ public class RknnObjectDetector implements ObjectDetector {
if (objPointer <= 0) {
throw new RuntimeException(
"Failed to create detector from path " + model.modelFile.getPath());
} else if (!RknnJNI.isQuantized(objPointer)) {
throw new UnsupportedOperationException("Model must be quantized.");
}
logger.debug("Created detector for model " + model.modelFile.getName());

2
photon-core/src/main/java/org/photonvision/vision/objects/RubikObjectDetector.java
View File

@@ -80,6 +80,8 @@ public class RubikObjectDetector implements ObjectDetector {
+ ". Please ensure the model is valid and compatible with the Rubik backend.");
throw new RuntimeException(
"Failed to create detector from path " + model.modelFile.getPath());
} else if (!RubikJNI.isQuantized(ptr)) {
throw new UnsupportedOperationException("Model must be quantized.");
}
logger.debug("Created detector for model " + model.modelFile.getName());

52
photon-server/src/main/java/org/photonvision/server/RequestHandler.java
View File

@@ -58,6 +58,9 @@ import org.photonvision.common.util.file.ProgramDirectoryUtilities;
import org.photonvision.vision.calibration.CameraCalibrationCoefficients;
import org.photonvision.vision.camera.CameraQuirk;
import org.photonvision.vision.camera.PVCameraInfo;
import org.photonvision.vision.objects.ObjectDetector;
import org.photonvision.vision.objects.RknnModel;
import org.photonvision.vision.objects.RubikModel;
import org.photonvision.vision.processes.VisionSourceManager;
import org.zeroturnaround.zip.ZipUtil;
@@ -656,18 +659,49 @@ public class RequestHandler {
modelFile.content().transferTo(out);
}
ModelProperties modelProperties =
new ModelProperties(
modelPath,
modelFile.filename().replaceAll("." + family.extension(), ""),
labels,
width,
height,
family,
version);
ObjectDetector objDetector = null;
try {
objDetector =
switch (family) {
case RUBIK -> new RubikModel(modelProperties).load();
case RKNN -> new RknnModel(modelProperties).load();
};
} catch (RuntimeException e) {
ctx.status(400);
ctx.result("Failed to load object detection model: " + e.getMessage());
try {
Files.deleteIfExists(modelPath);
} catch (IOException ex) {
e.addSuppressed(ex);
}
logger.error("Failed to load object detection model", e);
return;
} finally {
// this finally block will run regardless of what happens in try/catch
// please see https://docs.oracle.com/javase/tutorial/essential/exceptions/finally.html
// for a summary on how finally works
if (objDetector != null) {
objDetector.release();
}
}
ConfigManager.getInstance()
.getConfig()
.neuralNetworkPropertyManager()
.addModelProperties(
new ModelProperties(
modelPath,
modelFile.filename().replaceAll("." + family.extension(), ""),
labels,
width,
height,
family,
version));
.addModelProperties(modelProperties);
logger.debug(
ConfigManager.getInstance().getConfig().neuralNetworkPropertyManager().toString());