diff --git a/crates/j2k-metal/src/batch/tests.rs b/crates/j2k-metal/src/batch/tests.rs index befa54b8..023b9b95 100644 --- a/crates/j2k-metal/src/batch/tests.rs +++ b/crates/j2k-metal/src/batch/tests.rs @@ -6,8 +6,9 @@ use j2k_core::{BackendRequest, Downscale, PixelFormat, Rect}; use crate::{Error, MetalSession}; +use super::execute::complete_repeated_device_failure; #[cfg(target_os = "macos")] -use super::execute::{complete_repeated_device_failure, process_batch}; +use super::execute::process_batch; #[cfg(target_os = "macos")] use super::heuristics::GroupedRequests; use super::heuristics::{ diff --git a/crates/j2k-metal/src/encode/tests.rs b/crates/j2k-metal/src/encode/tests.rs index 565ceb0a..af633bfb 100644 --- a/crates/j2k-metal/src/encode/tests.rs +++ b/crates/j2k-metal/src/encode/tests.rs @@ -7,8 +7,10 @@ use super::stage_accelerator::{ use super::MetalEncodeStageAccelerator; #[cfg(target_os = "macos")] use crate::compute; +#[cfg(target_os = "macos")] +use j2k::encode_j2k_lossless; use j2k::{ - encode_j2k_lossless, encode_j2k_lossless_with_accelerator, EncodeBackendPreference, EncodedJ2k, + encode_j2k_lossless_with_accelerator, EncodeBackendPreference, EncodedJ2k, J2kLosslessEncodeOptions, J2kLosslessSamples, }; #[cfg(target_os = "macos")] diff --git a/crates/j2k-metal/src/routing.rs b/crates/j2k-metal/src/routing.rs index c6bd9240..f658f9ac 100644 --- a/crates/j2k-metal/src/routing.rs +++ b/crates/j2k-metal/src/routing.rs @@ -1,6 +1,8 @@ // SPDX-License-Identifier: MIT OR Apache-2.0 -use j2k_core::{BackendRequest, CompressedTransferSyntax, PixelFormat}; +#[cfg(any(target_os = "macos", test))] +use j2k_core::CompressedTransferSyntax; +use j2k_core::{BackendRequest, PixelFormat}; #[cfg(target_os = "macos")] use j2k_metal_support::metal_kernel_route; use j2k_metal_support::{ @@ -15,11 +17,16 @@ pub(crate) const AUTO_DECODE_CPU_FALLBACK_REASON: &str = // Minimum qualified cells from verified Auto-routing artifact // 162a47f7a96b2be88abebc100aab672513af04895532863fa1a293660546f879. +#[cfg(any(target_os = "macos", test))] const AUTO_REPEATED_DECODE_MIN_COUNT: usize = 16; +#[cfg(any(target_os = "macos", test))] const AUTO_REPEATED_GRAY8_MIN_PIXELS: u64 = 2_960_793; +#[cfg(any(target_os = "macos", test))] const AUTO_REPEATED_RGB8_LOSSY_MIN_PIXELS: u64 = 307_200; +#[cfg(any(target_os = "macos", test))] const AUTO_REPEATED_RGB8_LOSSLESS_MIN_PIXELS: u64 = 5_038_848; +#[cfg(any(target_os = "macos", test))] pub(crate) fn auto_repeated_decode_uses_metal( dimensions: (u32, u32), fmt: PixelFormat, diff --git a/crates/j2k-t803/src/runner/metal.rs b/crates/j2k-t803/src/runner/metal.rs index 109c4ff7..a63903cc 100644 --- a/crates/j2k-t803/src/runner/metal.rs +++ b/crates/j2k-t803/src/runner/metal.rs @@ -18,6 +18,7 @@ use crate::{ExecutionLocation, PlatformIdentity}; #[cfg(target_os = "macos")] use super::{cases, encoder, execute}; +#[cfg(target_os = "macos")] const METAL_CLAIM: &str = "Profile-1 Cclass-1 adapter IUT; Profile-1 Cclass-1HF adapter IUT; Annex G JP2 reader via j2k CPU stages (candidate evidence)"; #[cfg(target_os = "macos")]