Skip to content

Commit 38e7141

Browse files
committed
single SESSION for tests
Signed-off-by: Connor Tsui <[email protected]>
1 parent 61ae201 commit 38e7141

7 files changed

Lines changed: 20 additions & 52 deletions

File tree

‎vortex-tensor/src/encodings/turboquant/tests/mod.rs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ mod nullable;
88
mod roundtrip;
99
mod structural;
1010

11-
use std::sync::LazyLock;
12-
1311
use rand::SeedableRng;
1412
use rand::rngs::StdRng;
1513
use rand_distr::Distribution;
@@ -29,22 +27,18 @@ use vortex_array::arrays::fixed_size_list::FixedSizeListArrayExt;
2927
use vortex_array::arrays::scalar_fn::ScalarFnArrayExt;
3028
use vortex_array::dtype::extension::ExtDType;
3129
use vortex_array::extension::EmptyMetadata;
32-
use vortex_array::session::ArraySession;
3330
use vortex_array::validity::Validity;
3431
use vortex_buffer::BufferMut;
3532
use vortex_error::VortexExpect;
3633
use vortex_error::VortexResult;
37-
use vortex_session::VortexSession;
3834

3935
use crate::encodings::turboquant::TurboQuantConfig;
4036
use crate::encodings::turboquant::turboquant_encode_unchecked;
4137
use crate::scalar_fns::l2_denorm::L2Denorm;
4238
use crate::scalar_fns::l2_denorm::normalize_as_l2_denorm;
39+
use crate::tests::SESSION;
4340
use crate::vector::Vector;
4441

45-
static SESSION: LazyLock<VortexSession> =
46-
LazyLock::new(|| VortexSession::empty().with::<ArraySession>());
47-
4842
/// Create a FixedSizeListArray of random f32 vectors with the given validity.
4943
fn make_fsl_with_validity(
5044
num_rows: usize,

‎vortex-tensor/src/lib.rs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,17 @@ pub fn initialize(session: &VortexSession) {
5151
session_arrays.register(ScalarFnArrayPlugin::new(L2Norm));
5252
session_arrays.register(ScalarFnArrayPlugin::new(SorfTransform));
5353
}
54+
55+
#[cfg(test)]
56+
mod tests {
57+
use std::sync::LazyLock;
58+
59+
use vortex_array::session::ArraySession;
60+
use vortex_session::VortexSession;
61+
62+
pub static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
63+
let session = VortexSession::empty().with::<ArraySession>();
64+
crate::initialize(&session);
65+
session
66+
});
67+
}

‎vortex-tensor/src/scalar_fns/cosine_similarity.rs‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,6 @@ impl CosineSimilarity {
329329

330330
#[cfg(test)]
331331
mod tests {
332-
use std::sync::LazyLock;
333332

334333
use rstest::rstest;
335334
use vortex_array::ArrayPlugin;
@@ -340,25 +339,18 @@ mod tests {
340339
use vortex_array::arrays::PrimitiveArray;
341340
use vortex_array::arrays::ScalarFnArray;
342341
use vortex_array::arrays::scalar_fn::plugin::ScalarFnArrayPlugin;
343-
use vortex_array::session::ArraySession;
344342
use vortex_array::validity::Validity;
345343
use vortex_error::VortexResult;
346-
use vortex_session::VortexSession;
347344

348345
use crate::scalar_fns::cosine_similarity::CosineSimilarity;
349346
use crate::scalar_fns::l2_denorm::L2Denorm;
347+
use crate::tests::SESSION;
350348
use crate::utils::test_helpers::assert_close;
351349
use crate::utils::test_helpers::constant_tensor_array;
352350
use crate::utils::test_helpers::constant_vector_array;
353351
use crate::utils::test_helpers::tensor_array;
354352
use crate::utils::test_helpers::vector_array;
355353

356-
static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
357-
let session = VortexSession::empty().with::<ArraySession>();
358-
crate::initialize(&session);
359-
session
360-
});
361-
362354
/// Evaluates cosine similarity between two tensor arrays and returns the result as `Vec<f64>`.
363355
fn eval_cosine_similarity(lhs: ArrayRef, rhs: ArrayRef, len: usize) -> VortexResult<Vec<f64>> {
364356
let scalar_fn = CosineSimilarity::new().erased();

‎vortex-tensor/src/scalar_fns/inner_product.rs‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,6 @@ fn execute_dict_constant_inner_product(
692692

693693
#[cfg(test)]
694694
mod tests {
695-
use std::sync::LazyLock;
696695

697696
use rstest::rstest;
698697
use vortex_array::ArrayPlugin;
@@ -703,23 +702,16 @@ mod tests {
703702
use vortex_array::arrays::PrimitiveArray;
704703
use vortex_array::arrays::ScalarFnArray;
705704
use vortex_array::arrays::scalar_fn::plugin::ScalarFnArrayPlugin;
706-
use vortex_array::session::ArraySession;
707705
use vortex_array::validity::Validity;
708706
use vortex_error::VortexResult;
709-
use vortex_session::VortexSession;
710707

711708
use crate::scalar_fns::inner_product::InnerProduct;
712709
use crate::scalar_fns::l2_denorm::L2Denorm;
710+
use crate::tests::SESSION;
713711
use crate::utils::test_helpers::assert_close;
714712
use crate::utils::test_helpers::tensor_array;
715713
use crate::utils::test_helpers::vector_array;
716714

717-
static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
718-
let session = VortexSession::empty().with::<ArraySession>();
719-
crate::initialize(&session);
720-
session
721-
});
722-
723715
/// Evaluates inner product between two tensor arrays and returns the result as `Vec<f64>`.
724716
fn eval_inner_product(lhs: ArrayRef, rhs: ArrayRef, len: usize) -> VortexResult<Vec<f64>> {
725717
let scalar_fn = InnerProduct::new().erased();

‎vortex-tensor/src/scalar_fns/l2_denorm.rs‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,6 @@ fn validate_l2_normalized_rows_impl(
699699

700700
#[cfg(test)]
701701
mod tests {
702-
use std::sync::LazyLock;
703702

704703
use rstest::rstest;
705704
use vortex_array::ArrayPlugin;
@@ -724,30 +723,23 @@ mod tests {
724723
use vortex_array::extension::datetime::Date;
725724
use vortex_array::extension::datetime::TimeUnit;
726725
use vortex_array::scalar::Scalar;
727-
use vortex_array::session::ArraySession;
728726
use vortex_array::validity::Validity;
729727
use vortex_buffer::Buffer;
730728
use vortex_error::VortexResult;
731-
use vortex_session::VortexSession;
732729

733730
use crate::fixed_shape::FixedShapeTensor;
734731
use crate::fixed_shape::FixedShapeTensorMetadata;
735732
use crate::scalar_fns::l2_denorm::L2Denorm;
736733
use crate::scalar_fns::l2_denorm::normalize_as_l2_denorm;
737734
use crate::scalar_fns::l2_denorm::validate_l2_normalized_rows;
735+
use crate::tests::SESSION;
738736
use crate::utils::test_helpers::assert_close;
739737
use crate::utils::test_helpers::constant_tensor_array;
740738
use crate::utils::test_helpers::constant_vector_array;
741739
use crate::utils::test_helpers::tensor_array;
742740
use crate::utils::test_helpers::vector_array;
743741
use crate::vector::Vector;
744742

745-
static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
746-
let session = VortexSession::empty().with::<ArraySession>();
747-
crate::initialize(&session);
748-
session
749-
});
750-
751743
/// Evaluates L2 denorm on a tensor/vector array and returns the executed array.
752744
fn eval_l2_denorm(normalized: ArrayRef, norms: ArrayRef, len: usize) -> VortexResult<ArrayRef> {
753745
let mut ctx = SESSION.create_execution_ctx();

‎vortex-tensor/src/scalar_fns/l2_norm.rs‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ fn l2_norm_row<T: Float + NativePType>(v: &[T]) -> T {
238238

239239
#[cfg(test)]
240240
mod tests {
241-
use std::sync::LazyLock;
242241

243242
use rstest::rstest;
244243
use vortex_array::ArrayPlugin;
@@ -249,22 +248,15 @@ mod tests {
249248
use vortex_array::arrays::PrimitiveArray;
250249
use vortex_array::arrays::ScalarFnArray;
251250
use vortex_array::arrays::scalar_fn::plugin::ScalarFnArrayPlugin;
252-
use vortex_array::session::ArraySession;
253251
use vortex_array::validity::Validity;
254252
use vortex_error::VortexResult;
255-
use vortex_session::VortexSession;
256253

257254
use crate::scalar_fns::l2_norm::L2Norm;
255+
use crate::tests::SESSION;
258256
use crate::utils::test_helpers::assert_close;
259257
use crate::utils::test_helpers::tensor_array;
260258
use crate::utils::test_helpers::vector_array;
261259

262-
static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
263-
let session = VortexSession::empty().with::<ArraySession>();
264-
crate::initialize(&session);
265-
session
266-
});
267-
268260
/// Evaluates L2 norm on a tensor/vector array and returns the result as `Vec<f64>`.
269261
fn eval_l2_norm(input: ArrayRef, len: usize) -> VortexResult<Vec<f64>> {
270262
let scalar_fn = L2Norm::new().erased();

‎vortex-tensor/src/scalar_fns/sorf_transform/tests.rs‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#![allow(clippy::cast_possible_truncation)]
77

88
use std::sync::Arc;
9-
use std::sync::LazyLock;
109

1110
use vortex_array::ArrayPlugin;
1211
use vortex_array::ArrayRef;
@@ -24,28 +23,21 @@ use vortex_array::dtype::Nullability;
2423
use vortex_array::dtype::PType;
2524
use vortex_array::dtype::extension::ExtDType;
2625
use vortex_array::extension::EmptyMetadata;
27-
use vortex_array::session::ArraySession;
2826
use vortex_array::validity::Validity;
2927
use vortex_buffer::Buffer;
3028
use vortex_buffer::BufferMut;
3129
use vortex_error::VortexExpect;
3230
use vortex_error::VortexResult;
33-
use vortex_session::VortexSession;
3431

3532
use super::SorfOptions;
3633
use super::SorfTransform;
3734
use super::rotation::SorfMatrix;
3835
use crate::encodings::turboquant::centroids::compute_centroid_boundaries;
3936
use crate::encodings::turboquant::centroids::find_nearest_centroid;
4037
use crate::encodings::turboquant::centroids::get_centroids;
38+
use crate::tests::SESSION;
4139
use crate::vector::Vector;
4240

43-
static SESSION: LazyLock<VortexSession> = LazyLock::new(|| {
44-
let session = VortexSession::empty().with::<ArraySession>();
45-
crate::initialize(&session);
46-
session
47-
});
48-
4941
/// Build a unit-normalized input vector array and forward-transform + quantize it, returning
5042
/// `(input_f32, Vector<padded_dim>(FSL(Dict(codes, centroids))), padded_dim)`.
5143
///

0 commit comments

Comments
 (0)