Skip to content

armgit / uzu

Public Imported from GitHub
0

A high-performance inference engine for AI models

Small tests movement (#301)

Aleksandr Golokoz9bd9bbd5cdec
diff --git a/crates/uzu/src/backends/common/hazard_tracker.rs b/crates/uzu/src/backends/common/hazard_tracker.rs
index fc1ea6f4c..0ff025ec6 100644
--- a/crates/uzu/src/backends/common/hazard_tracker.rs
+++ b/crates/uzu/src/backends/common/hazard_tracker.rs
@@ -94,5 +94,5 @@ impl HazardTracker {
}
#[cfg(test)]
-#[path = "../../../tests_unit/hazard_tracker_test.rs"]
-mod hazard_tracker_test;
+#[path = "../../../tests/unit/backends/common/hazard_tracker_test.rs"]
+mod tests;
diff --git a/crates/uzu/tests/common/audio_nanocodec_fsq_reference.rs b/crates/uzu/tests/common/audio/fsq_reference.rs
similarity index 100%
rename from crates/uzu/tests/common/audio_nanocodec_fsq_reference.rs
rename to crates/uzu/tests/common/audio/fsq_reference.rs
diff --git a/crates/uzu/tests/common/audio/mod.rs b/crates/uzu/tests/common/audio/mod.rs
new file mode 100644
index 000000000..4e553289c
--- /dev/null
+++ b/crates/uzu/tests/common/audio/mod.rs
@@ -0,0 +1,2 @@
+pub mod fsq_reference;
+pub mod ops_reference;
diff --git a/crates/uzu/tests/common/audio_nanocodec_ops_reference.rs b/crates/uzu/tests/common/audio/ops_reference.rs
similarity index 100%
rename from crates/uzu/tests/common/audio_nanocodec_ops_reference.rs
rename to crates/uzu/tests/common/audio/ops_reference.rs
diff --git a/crates/uzu/tests/common/mod.rs b/crates/uzu/tests/common/mod.rs
index 42407e933..7ff912dbd 100644
--- a/crates/uzu/tests/common/mod.rs
+++ b/crates/uzu/tests/common/mod.rs
@@ -1,8 +1,7 @@
#![allow(dead_code)]
pub mod assert;
-pub mod audio_nanocodec_fsq_reference;
-pub mod audio_nanocodec_ops_reference;
+pub mod audio;
pub mod path;
pub mod perf;
pub mod proptest;
diff --git a/crates/uzu/tests/integration/session/mod.rs b/crates/uzu/tests/integration/session/mod.rs
index a81650b2a..8ff40c3ad 100644
--- a/crates/uzu/tests/integration/session/mod.rs
+++ b/crates/uzu/tests/integration/session/mod.rs
@@ -1,2 +1,3 @@
mod chat_session;
mod config;
+mod tts_session;
diff --git a/crates/uzu/tests/audio_nanocodec_fsq_test.rs b/crates/uzu/tests/integration/session/tts_session/audio_nanocodec_fsq_test.rs
similarity index 88%
rename from crates/uzu/tests/audio_nanocodec_fsq_test.rs
rename to crates/uzu/tests/integration/session/tts_session/audio_nanocodec_fsq_test.rs
index a03d71722..9f6d1a5d7 100644
--- a/crates/uzu/tests/audio_nanocodec_fsq_test.rs
+++ b/crates/uzu/tests/integration/session/tts_session/audio_nanocodec_fsq_test.rs
@@ -1,6 +1,4 @@
-mod common;
-
-use common::audio_nanocodec_fsq_reference::{fsq_decode_reference, fsq_encode_reference};
+use crate::common::audio::fsq_reference::{fsq_decode_reference, fsq_encode_reference};
#[test]
fn fsq_decode_reference_masks_values_beyond_lengths() {
diff --git a/crates/uzu/tests/audio_nanocodec_runtime_test.rs b/crates/uzu/tests/integration/session/tts_session/audio_nanocodec_runtime_test.rs
similarity index 98%
rename from crates/uzu/tests/audio_nanocodec_runtime_test.rs
rename to crates/uzu/tests/integration/session/tts_session/audio_nanocodec_runtime_test.rs
index bb0767544..4df491ee1 100644
--- a/crates/uzu/tests/audio_nanocodec_runtime_test.rs
+++ b/crates/uzu/tests/integration/session/tts_session/audio_nanocodec_runtime_test.rs
@@ -1,14 +1,13 @@
#![cfg(all(feature = "audio-runtime", metal_backend))]
-mod common;
-
-use common::audio_nanocodec_fsq_reference::{fsq_decode_reference, fsq_encode_reference};
use uzu::{
NanoCodecFsqRuntime, NanoCodecFsqRuntimeConfig,
backends::metal::Metal,
prelude::{AudioCodecRuntime, AudioError, AudioPcmBatch, AudioTokenGrid},
};
+use crate::common::audio::fsq_reference::{fsq_decode_reference, fsq_encode_reference};
+
fn create_runtime() -> NanoCodecFsqRuntime<Metal> {
let config =
NanoCodecFsqRuntimeConfig::new(24_000, 2, vec![8, 6].into_boxed_slice(), 1e-3).expect("valid runtime config");
diff --git a/crates/uzu/tests/integration/session/tts_session/mod.rs b/crates/uzu/tests/integration/session/tts_session/mod.rs
new file mode 100644
index 000000000..eb6a669b8
--- /dev/null
+++ b/crates/uzu/tests/integration/session/tts_session/mod.rs
@@ -0,0 +1,2 @@
+mod audio_nanocodec_fsq_test;
+mod audio_nanocodec_runtime_test;
diff --git a/crates/uzu/tests/audio_kernel_perf_test.rs b/crates/uzu/tests/performance/audio_kernel_perf_test.rs
similarity index 100%
rename from crates/uzu/tests/audio_kernel_perf_test.rs
rename to crates/uzu/tests/performance/audio_kernel_perf_test.rs
diff --git a/crates/uzu/tests/performance/mod.rs b/crates/uzu/tests/performance/mod.rs
index 9e2de76d1..531e1e925 100644
--- a/crates/uzu/tests/performance/mod.rs
+++ b/crates/uzu/tests/performance/mod.rs
@@ -2,6 +2,8 @@
#[path = "../common/mod.rs"]
mod common;
+#[cfg(feature = "audio-runtime")]
+mod audio_kernel_perf_test;
#[cfg(metal_backend)]
mod matmul;
mod model_loading_perf_test;
diff --git a/crates/uzu/tests_unit/hazard_tracker_test.rs b/crates/uzu/tests/unit/backends/common/hazard_tracker_test.rs
similarity index 100%
rename from crates/uzu/tests_unit/hazard_tracker_test.rs
rename to crates/uzu/tests/unit/backends/common/hazard_tracker_test.rs
diff --git a/crates/uzu/tests/unit/kernel/audio/audio_test.rs b/crates/uzu/tests/unit/kernel/audio/audio_test.rs
index e53ead660..514421e4c 100644
--- a/crates/uzu/tests/unit/kernel/audio/audio_test.rs
+++ b/crates/uzu/tests/unit/kernel/audio/audio_test.rs
@@ -16,9 +16,9 @@ use uzu::{
},
};
-use super::super::common::{
- audio_nanocodec_fsq_reference::{fsq_decode_reference, fsq_encode_reference},
- audio_nanocodec_ops_reference::{
+use super::super::common::audio::{
+ fsq_reference::{fsq_decode_reference, fsq_encode_reference},
+ ops_reference::{
CausalConv1dSpec, CausalConvTranspose1dSpec, Conv1dSpec, HalfSnakeSpec, PadMode,
causal_conv_transpose1d_causal_pad_reference, causal_conv_transpose1d_reference, causal_conv1d_reference,
conv1d_reference, half_snake_reference,