Skip to content

Commit 38d5787

Browse files
mhk197mhk197
committed
use FoR::try_new in benches and cuda tests
Signed-off-by: Matt Katz <mhkatz97@gmail.com>
1 parent 6c7c59c commit 38d5787

3 files changed

Lines changed: 48 additions & 36 deletions

File tree

‎vortex-cuda/benches/dynamic_dispatch_cuda.rs‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -360,10 +360,11 @@ fn bench_dict_bp_codes_alp_for_bp_values_dynanmic_dispatch(c: &mut Criterion) {
360360
let bp = BitPackedData::encode(for_arr.encoded(), values_bit_width, &mut ctx)
361361
.vortex_expect("bitpack values");
362362
let values_tree = ALP::new(
363-
FoR::try_new_chunked(
363+
FoR::try_new(
364364
bp.into_array(),
365-
for_arr.references().clone(),
366-
for_arr.offset(),
365+
for_arr
366+
.constant_reference()
367+
.vortex_expect("constant reference"),
367368
)
368369
.vortex_expect("for_new")
369370
.into_array(),
@@ -672,10 +673,11 @@ fn bench_dict_bp_codes_alp_for_bp_values_composed_standalone(c: &mut Criterion)
672673
.vortex_expect("constant reference"))
673674
.try_into()
674675
.vortex_expect("values reference");
675-
let values_for = FoR::try_new_chunked(
676+
let values_for = FoR::try_new(
676677
values_bp.clone().into_array(),
677-
for_arr.references().clone(),
678-
for_arr.offset(),
678+
for_arr
679+
.constant_reference()
680+
.vortex_expect("constant reference"),
679681
)
680682
.vortex_expect("for_new")
681683
.into_array();
@@ -771,10 +773,11 @@ fn bench_alp_for_bitpacked_f64(c: &mut Criterion) {
771773
assert!(bp.patches().is_none(), "expected only ALP patches");
772774

773775
let tree = ALP::new(
774-
FoR::try_new_chunked(
776+
FoR::try_new(
775777
bp.into_array(),
776-
for_arr.references().clone(),
777-
for_arr.offset(),
778+
for_arr
779+
.constant_reference()
780+
.vortex_expect("constant reference"),
778781
)
779782
.vortex_expect("for_new")
780783
.into_array(),
@@ -895,10 +898,11 @@ fn bench_alp_for_bitpacked(c: &mut Criterion) {
895898
.vortex_expect("bitpack encode");
896899

897900
let tree = ALP::new(
898-
FoR::try_new_chunked(
901+
FoR::try_new(
899902
bp.into_array(),
900-
for_arr.references().clone(),
901-
for_arr.offset(),
903+
for_arr
904+
.constant_reference()
905+
.vortex_expect("constant reference"),
902906
)
903907
.vortex_expect("for_new")
904908
.into_array(),

‎vortex-cuda/src/dynamic_dispatch/mod.rs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -971,10 +971,11 @@ mod tests {
971971
let bp = BitPacked::encode(for_arr.encoded(), 6, &mut ctx)?;
972972

973973
let tree = ALP::new(
974-
FoR::try_new_chunked(
974+
FoR::try_new(
975975
bp.into_array(),
976-
for_arr.references().clone(),
977-
for_arr.offset(),
976+
for_arr
977+
.constant_reference()
978+
.vortex_expect("constant reference"),
978979
)?
979980
.into_array(),
980981
exponents,
@@ -1909,10 +1910,11 @@ mod tests {
19091910
let bp = BitPacked::encode(for_arr.encoded(), 6, &mut ctx)?;
19101911

19111912
let tree = ALP::new(
1912-
FoR::try_new_chunked(
1913+
FoR::try_new(
19131914
bp.into_array(),
1914-
for_arr.references().clone(),
1915-
for_arr.offset(),
1915+
for_arr
1916+
.constant_reference()
1917+
.vortex_expect("constant reference"),
19161918
)?
19171919
.into_array(),
19181920
exponents,

‎vortex/benches/common_encoding_tree_throughput.rs‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,11 @@ mod setup {
111111
let compressed = FoR::encode(uint_array, &mut ctx).unwrap();
112112
let inner = compressed.encoded();
113113
let bp = BitPacked::encode(inner, 8, &mut ctx).unwrap();
114-
FoR::try_new_chunked(
114+
FoR::try_new(
115115
bp.into_array(),
116-
compressed.references().clone(),
117-
compressed.offset(),
116+
compressed
117+
.constant_reference()
118+
.vortex_expect("constant reference"),
118119
)
119120
.unwrap()
120121
.into_array()
@@ -135,10 +136,11 @@ mod setup {
135136
let for_array = FoR::encode(alp_encoded_prim, &mut ctx).unwrap();
136137
let inner = for_array.encoded();
137138
let bp = BitPacked::encode(inner, 8, &mut ctx).unwrap();
138-
let for_with_bp = FoR::try_new_chunked(
139+
let for_with_bp = FoR::try_new(
139140
bp.into_array(),
140-
for_array.references().clone(),
141-
for_array.offset(),
141+
for_array
142+
.constant_reference()
143+
.vortex_expect("constant reference"),
142144
)
143145
.unwrap();
144146

@@ -217,10 +219,11 @@ mod setup {
217219
let ends_for = FoR::encode(ends_prim, &mut ctx).unwrap();
218220
let ends_inner = ends_for.encoded();
219221
let ends_bp = BitPacked::encode(ends_inner, 8, &mut ctx).unwrap();
220-
let compressed_ends = FoR::try_new_chunked(
222+
let compressed_ends = FoR::try_new(
221223
ends_bp.into_array(),
222-
ends_for.references().clone(),
223-
ends_for.offset(),
224+
ends_for
225+
.constant_reference()
226+
.vortex_expect("constant reference"),
224227
)
225228
.unwrap()
226229
.into_array();
@@ -369,10 +372,11 @@ mod setup {
369372
let days_for = FoR::encode(days_prim, &mut ctx).unwrap();
370373
let days_inner = days_for.encoded();
371374
let days_bp = BitPacked::encode(days_inner, 16, &mut ctx).unwrap();
372-
let compressed_days = FoR::try_new_chunked(
375+
let compressed_days = FoR::try_new(
373376
days_bp.into_array(),
374-
days_for.references().clone(),
375-
days_for.offset(),
377+
days_for
378+
.constant_reference()
379+
.vortex_expect("constant reference"),
376380
)
377381
.unwrap()
378382
.into_array();
@@ -386,10 +390,11 @@ mod setup {
386390
let seconds_for = FoR::encode(seconds_prim, &mut ctx).unwrap();
387391
let seconds_inner = seconds_for.encoded();
388392
let seconds_bp = BitPacked::encode(seconds_inner, 17, &mut ctx).unwrap();
389-
let compressed_seconds = FoR::try_new_chunked(
393+
let compressed_seconds = FoR::try_new(
390394
seconds_bp.into_array(),
391-
seconds_for.references().clone(),
392-
seconds_for.offset(),
395+
seconds_for
396+
.constant_reference()
397+
.vortex_expect("constant reference"),
393398
)
394399
.unwrap()
395400
.into_array();
@@ -402,10 +407,11 @@ mod setup {
402407
let subseconds_for = FoR::encode(subseconds_prim, &mut ctx).unwrap();
403408
let subseconds_inner = subseconds_for.encoded();
404409
let subseconds_bp = BitPacked::encode(subseconds_inner, 20, &mut ctx).unwrap();
405-
let compressed_subseconds = FoR::try_new_chunked(
410+
let compressed_subseconds = FoR::try_new(
406411
subseconds_bp.into_array(),
407-
subseconds_for.references().clone(),
408-
subseconds_for.offset(),
412+
subseconds_for
413+
.constant_reference()
414+
.vortex_expect("constant reference"),
409415
)
410416
.unwrap()
411417
.into_array();

0 commit comments

Comments
 (0)