π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Rename ONNX golden module to golden test
laurenspriem062f4ad00f7f
diff --git a/rust/crates/photos/src/ml/mod.rs b/rust/crates/photos/src/ml/mod.rsindex f0c79a77e1..405a1649e4 100644--- a/rust/crates/photos/src/ml/mod.rs+++ b/rust/crates/photos/src/ml/mod.rs@@ -6,8 +6,8 @@ pub mod face;pub mod indexing;mod model;mod onnx;-pub use onnx::golden;-pub use onnx::golden::tooling as golden_tooling;+pub use onnx::golden_test;+pub use onnx::golden_test::tooling as golden_tooling;mod pet;mod postprocess;mod preprocess;diff --git a/rust/crates/photos/src/ml/onnx.rs b/rust/crates/photos/src/ml/onnx.rsindex ec63e9cd8c..bb64caeaf6 100644--- a/rust/crates/photos/src/ml/onnx.rs+++ b/rust/crates/photos/src/ml/onnx.rs@@ -4,7 +4,7 @@ use std::{fmt, path::Path};use crate::ml::error::{MlError, MlResult};mod coreml_cache;-pub mod golden;+pub mod golden_test;mod providers;mod tensor;mod webgpu;@@ -438,12 +438,12 @@ fn run_session_self_test(provider_label: &str,) -> MlResult<()> {let model_file = model_file_label(model_path);- let Some(entry) = golden::lookup(model_path) else {+ let Some(entry) = golden_test::lookup(model_path) else {return Err(MlError::Ort(format!("golden self-test entry missing for '{model_file}'")));};- let golden_input = golden::prepare_input(entry).map_err(|reason| {+ let golden_input = golden_test::prepare_input(entry).map_err(|reason| {MlError::Ort(format!("golden self-test input invalid for '{model_file}': {reason}"))@@ -463,7 +463,7 @@ fn run_session_self_test(return Err(error.into());}};- if let Err(reason) = golden::validate_output(entry, &zero_output) {+ if let Err(reason) = golden_test::validate_output(entry, &zero_output) {log::error!("{provider_label} zero-input warm-up failed for '{model_file}': {reason}; \falling back to the next execution provider"@@ -487,7 +487,7 @@ fn run_session_self_test(return Err(error.into());}};- match golden::compare_output(entry, &golden_output) {+ match golden_test::compare_output(entry, &golden_output) {Ok(distance) => {log::info!("{provider_label} golden self-test for '{model_file}' passed \diff --git a/rust/crates/photos/src/ml/onnx/golden/data.rs b/rust/crates/photos/src/ml/onnx/golden_test/data.rssimilarity index 99%rename from rust/crates/photos/src/ml/onnx/golden/data.rsrename to rust/crates/photos/src/ml/onnx/golden_test/data.rsindex 8ec62d64f4..e2e4cf6951 100644--- a/rust/crates/photos/src/ml/onnx/golden/data.rs+++ b/rust/crates/photos/src/ml/onnx/golden_test/data.rs@@ -1,4 +1,4 @@-// Generated file. Do not edit by hand.+// Generated golden-test data. Do not edit by hand.//// Regenerate with:// cargo run -p ente-photos --example ml_goldens -- generatediff --git a/rust/crates/photos/src/ml/onnx/golden/mod.rs b/rust/crates/photos/src/ml/onnx/golden_test/mod.rssimilarity index 99%rename from rust/crates/photos/src/ml/onnx/golden/mod.rsrename to rust/crates/photos/src/ml/onnx/golden_test/mod.rsindex a178723824..2a764c83c9 100644--- a/rust/crates/photos/src/ml/onnx/golden/mod.rs+++ b/rust/crates/photos/src/ml/onnx/golden_test/mod.rs@@ -1,4 +1,4 @@-// Accelerated ONNX providers must reproduce CPU-generated golden outputs+// Accelerated ONNX providers must pass golden tests against CPU-generated outputs// because drivers can return plausible but numerically corrupt results while// reporting success. Deterministic inputs exercise the same kernels as real// inputs because these models have no data-dependent control flow.diff --git a/rust/crates/photos/src/ml/onnx/golden/tooling.rs b/rust/crates/photos/src/ml/onnx/golden_test/tooling.rssimilarity index 98%rename from rust/crates/photos/src/ml/onnx/golden/tooling.rsrename to rust/crates/photos/src/ml/onnx/golden_test/tooling.rsindex c642280d25..c798054fea 100644--- a/rust/crates/photos/src/ml/onnx/golden/tooling.rs+++ b/rust/crates/photos/src/ml/onnx/golden_test/tooling.rs@@ -11,7 +11,7 @@ use super::data::GOLDEN_ENTRIES;const GOLDEN_NOISE_SEED: u64 = 0x0060_1DE2_5EED_2026;const GENERATED_FILE_HEADER: &str = "\-// Generated file. Do not edit by hand.+// Generated golden-test data. Do not edit by hand.//// Regenerate with:// cargo run -p ente-photos --example ml_goldens -- generate@@ -104,11 +104,11 @@ pub fn verify_goldens_against_pins(pins: &[PinnedModel]) -> Vec<String> {for (file_name, pinned_sha) in &pinned {match committed.get(file_name) {None => failures.push(format!(- "{file_name}: no committed golden entry; regenerate ONNX golden data"+ "{file_name}: no committed golden entry; regenerate ONNX golden-test data")),Some(committed_sha) if committed_sha != pinned_sha => failures.push(format!("{file_name}: model content changed (pinned sha256 {pinned_sha}, golden \- generated from {committed_sha}); regenerate ONNX golden data"+ generated from {committed_sha}); regenerate ONNX golden-test data")),Some(_) => {}}@@ -117,7 +117,7 @@ pub fn verify_goldens_against_pins(pins: &[PinnedModel]) -> Vec<String> {if !pinned.contains_key(file_name) {failures.push(format!("{file_name}: committed golden entry does not correspond to any pinned \- production model; regenerate ONNX golden data"+ production model; regenerate ONNX golden-test data"));}}diff --git a/rust/crates/photos/src/ml/onnx/providers.rs b/rust/crates/photos/src/ml/onnx/providers.rsindex 20f24630cd..670a34237e 100644--- a/rust/crates/photos/src/ml/onnx/providers.rs+++ b/rust/crates/photos/src/ml/onnx/providers.rs@@ -28,7 +28,7 @@ use super::coreml_cache;target_os = "macos",target_os = "windows"))]-use super::golden;+use super::golden_test;#[cfg(any(target_os = "android",target_os = "ios",@@ -266,7 +266,7 @@ fn platform_default_providers(_model_path: &str) -> Vec<ExecutionProvider> {target_os = "windows"))]fn golden_entry_required(model_path: &str, provider_label: &str) -> bool {- if golden::lookup(model_path).is_some() {+ if golden_test::lookup(model_path).is_some() {return true;}log::error!(diff --git a/rust/crates/photos/src/ml/onnx/tensor.rs b/rust/crates/photos/src/ml/onnx/tensor.rsindex c11f5f4ac7..044e6d502c 100644--- a/rust/crates/photos/src/ml/onnx/tensor.rs+++ b/rust/crates/photos/src/ml/onnx/tensor.rs@@ -8,7 +8,7 @@ use ort::{use crate::ml::error::{MlError, MlResult};-use super::{SessionRunError, SessionRunResult, golden};+use super::{SessionRunError, SessionRunResult, golden_test};pub(crate) struct PreparedF32Input {f32_data: Vec<f32>,@@ -65,10 +65,10 @@ impl PreparedF32Input {pub(crate) fn run_golden_tensor(session: &mut Session,input_shape: &[i64],- input: &golden::PreparedGoldenInput,+ input: &golden_test::PreparedGoldenInput,) -> SessionRunResult<Vec<f32>> {let outputs = match input {- golden::PreparedGoldenInput::F32(data) => {+ golden_test::PreparedGoldenInput::F32(data) => {if session_expects_f16(session) {let input_tensor = Tensor::<half::f16>::from_array((input_shape,@@ -81,7 +81,7 @@ pub(crate) fn run_golden_tensor(session.run(ort::inputs![input_tensor])?}}- golden::PreparedGoldenInput::I32(data) => {+ golden_test::PreparedGoldenInput::I32(data) => {let input_tensor = TensorRef::<i32>::from_array_view((input_shape, data.as_slice()))?;session.run(ort::inputs![input_tensor])?}diff --git a/rust/crates/photos/tests/support/ml_indexing.rs b/rust/crates/photos/tests/support/ml_indexing.rsindex 505dfd892c..a6b19b4b74 100644--- a/rust/crates/photos/tests/support/ml_indexing.rs+++ b/rust/crates/photos/tests/support/ml_indexing.rs@@ -401,7 +401,7 @@ impl GoldenTestAssets {}pub(crate) fn golden_data_path() -> Result<PathBuf> {- Ok(PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("src/ml/onnx/golden/data.rs"))+ Ok(PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("src/ml/onnx/golden_test/data.rs"))}}