π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Hide ONNX execution provider identity
laurenspriem3b3e4ea8a0b1
diff --git a/rust/crates/photos/src/ml/indexing.rs b/rust/crates/photos/src/ml/indexing.rsindex 3a54c8ac4f..5ed433d338 100644--- a/rust/crates/photos/src/ml/indexing.rs+++ b/rust/crates/photos/src/ml/indexing.rs@@ -217,7 +217,7 @@ fn analyze_image_inner(};operation.set_stage(AnalysisStage::Finalize);- let used_providers = runtime.used_providers();+ let provider_usage = runtime.provider_usage();Ok(AnalyzeImageResult {file_id,decoded_image_size: dims,@@ -226,8 +226,8 @@ fn analyze_image_inner(clip,pet_faces,pet_bodies,- used_coreml: used_providers.coreml,- used_webgpu: used_providers.webgpu,+ used_coreml: provider_usage.coreml,+ used_webgpu: provider_usage.webgpu,})})}diff --git a/rust/crates/photos/src/ml/onnx/mod.rs b/rust/crates/photos/src/ml/onnx/mod.rsindex 6f0e8b3424..ee11a86f42 100644--- a/rust/crates/photos/src/ml/onnx/mod.rs+++ b/rust/crates/photos/src/ml/onnx/mod.rs@@ -11,13 +11,35 @@ mod providers;mod tensor;pub(crate) use ort::session::Session as SessionHandle;-pub(crate) use providers::{ExecutionMode, ExecutionProvider};+pub(crate) use providers::ExecutionMode;pub(crate) use tensor::{BorrowedFloatTensor, FloatTensorData, PreparedF32Input, run_f32, run_golden_tensor,run_i32_f32, with_prepared_float_output,};-use providers::ProviderPlan;+use providers::{ExecutionProvider, ProviderPlan};++#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]+pub(crate) struct ProviderUsage {+ pub(crate) coreml: bool,+ pub(crate) webgpu: bool,+}++impl ProviderUsage {+ fn from_provider(provider: ExecutionProvider) -> Self {+ Self {+ coreml: provider == ExecutionProvider::CoreMl,+ webgpu: provider == ExecutionProvider::WebGpu,+ }+ }++ pub(crate) fn merge(self, other: Self) -> Self {+ Self {+ coreml: self.coreml || other.coreml,+ webgpu: self.webgpu || other.webgpu,+ }+ }+}#[derive(Debug)]pub(crate) struct OnnxSession {@@ -50,7 +72,7 @@ impl OnnxSession {model_path: &str,model_namespace: &str,mut operation: impl FnMut(&mut Session) -> SessionRunResult<T>,- ) -> MlResult<(T, ExecutionProvider)> {+ ) -> MlResult<(T, ProviderUsage)> {loop {self.ensure_loaded(model_path, model_namespace)?;@@ -64,7 +86,9 @@ impl OnnxSession {.as_mut().expect("session must be loaded before model execution");match operation(session) {- Ok(value) => return Ok((value, execution_provider)),+ Ok(value) => {+ return Ok((value, ProviderUsage::from_provider(execution_provider)));+ }Err(error) => {if self.retry_after_provider_failure(&error) {continue;diff --git a/rust/crates/photos/src/ml/onnx/providers.rs b/rust/crates/photos/src/ml/onnx/providers.rsindex f463e22b87..a6974028f5 100644--- a/rust/crates/photos/src/ml/onnx/providers.rs+++ b/rust/crates/photos/src/ml/onnx/providers.rs@@ -55,7 +55,7 @@ pub(crate) enum ExecutionMode {// fallback providers, for result attribution.#[derive(Clone, Copy, Debug, PartialEq, Eq)]#[allow(dead_code)] // Accelerated variants are constructed only on their target OS.-pub(crate) enum ExecutionProvider {+pub(super) enum ExecutionProvider {CoreMl,WebGpu,Xnnpack,diff --git a/rust/crates/photos/src/ml/runtime.rs b/rust/crates/photos/src/ml/runtime.rsindex 1d803ef09e..f05e1470e6 100644--- a/rust/crates/photos/src/ml/runtime.rs+++ b/rust/crates/photos/src/ml/runtime.rs@@ -32,26 +32,10 @@ struct ModelSlot {state: Mutex<ModelSlotState>,}-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]-pub(crate) struct UsedProviders {- pub(crate) coreml: bool,- pub(crate) webgpu: bool,-}--impl UsedProviders {- fn record(&mut self, provider: onnx::ExecutionProvider) {- match provider {- onnx::ExecutionProvider::CoreMl => self.coreml = true,- onnx::ExecutionProvider::WebGpu => self.webgpu = true,- onnx::ExecutionProvider::Xnnpack | onnx::ExecutionProvider::Cpu => {}- }- }-}-pub(crate) struct MlRuntimeView<'a> {runtime: &'a MlRuntime,model_paths: &'a ModelPaths,- used_providers: Cell<UsedProviders>,+ provider_usage: Cell<onnx::ProviderUsage>,}impl ModelSlot {@@ -108,7 +92,7 @@ impl ModelSlot {&self,path: &str,operation: impl FnMut(&mut onnx::SessionHandle) -> onnx::SessionRunResult<T>,- ) -> MlResult<(T, onnx::ExecutionProvider)> {+ ) -> MlResult<(T, onnx::ProviderUsage)> {if path.trim().is_empty() {return Err(MlError::InvalidRequest(self.model.missing_path_error()));}@@ -173,8 +157,8 @@ impl MlRuntime {}impl<'a> MlRuntimeView<'a> {- pub(crate) fn used_providers(&self) -> UsedProviders {- self.used_providers.get()+ pub(crate) fn provider_usage(&self) -> onnx::ProviderUsage {+ self.provider_usage.get()}pub(crate) fn run<T>(@@ -182,13 +166,12 @@ impl<'a> MlRuntimeView<'a> {model: Model,operation: impl FnMut(&mut onnx::SessionHandle) -> onnx::SessionRunResult<T>,) -> MlResult<T> {- let (value, execution_provider) = self+ let (value, provider_usage) = self.runtime.slot(model).run(self.model_paths.get(model), operation)?;- let mut used = self.used_providers.get();- used.record(execution_provider);- self.used_providers.set(used);+ self.provider_usage+ .set(self.provider_usage.get().merge(provider_usage));Ok(value)}}@@ -223,7 +206,7 @@ pub(crate) fn with_runtime<R>(let runtime_view = MlRuntimeView {runtime: &GLOBAL_RUNTIME,model_paths,- used_providers: Cell::new(UsedProviders::default()),+ provider_usage: Cell::new(onnx::ProviderUsage::default()),};func(&runtime_view)}