Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ exclude = [".git*", "dev_utils/**/*", "tests/**/*"]

[dependencies]
num-traits = { version = "0.2", default-features = false }
half = { version = "2.4", default-features = false, features=["num-traits"], optional = true }
half = { version = "2.6", default-features = false, features=["num-traits"], optional = true }
ndarray = { version = "0.16.1", default-features = false, optional = true }
arrow = { version = ">0", default-features = false, optional = true }
arrow2 = { version = ">0.0", default-features = false, optional = true }
Expand Down
4 changes: 2 additions & 2 deletions dev_utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ description = "Shared utilities for development (tests & benchmarks)"

[dependencies]
num-traits = { version = "0.2", default-features = false }
half = { version = "2.4", default-features = false, features = ["num-traits", "rand_distr"] }
rand = { version = "0.8.5" }
half = { version = "2.6", default-features = false, features = ["num-traits", "rand_distr"] }
rand = { version = "0.9.1", default-features = false}
14 changes: 7 additions & 7 deletions dev_utils/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ use num_traits::Zero;

use std::ops::{Add, Sub};

use rand::distributions::Uniform;
use rand::{thread_rng, Rng};
use rand::distr::Uniform;
use rand::{rng, Rng};

// worst case array that alternates between increasing max and decreasing min values
pub fn get_worst_case_array<T>(n: usize, step: T) -> Vec<T>
Expand All @@ -26,17 +26,17 @@ where
arr
}

pub trait SampleUniformFullRange: rand::distributions::uniform::SampleUniform {
pub trait SampleUniformFullRange: rand::distr::uniform::SampleUniform {
const MIN: Self;
const MAX: Self;

// random array that samples between min and max of Self
fn get_random_array(n: usize) -> Vec<Self>
where
Self: Copy + rand::distributions::uniform::SampleUniform,
Self: Copy + rand::distr::uniform::SampleUniform,
{
let rng = thread_rng();
let uni = Uniform::new_inclusive(Self::MIN, Self::MAX);
let rng = rng();
let uni = Uniform::new_inclusive(Self::MIN, Self::MAX).unwrap();
rng.sample_iter(uni).take(n).collect()
}
}
Expand All @@ -62,7 +62,7 @@ macro_rules! impl_full_range_uniform_float {

fn get_random_array(n: usize) -> Vec<Self>
where
Self: Copy + rand::distributions::uniform::SampleUniform,
Self: Copy + rand::distr::uniform::SampleUniform,
{
// Get a uniform random array of integers
let rand_arr_int: Vec<$t_int> = <$t_int>::get_random_array(n);
Expand Down
2 changes: 1 addition & 1 deletion src/simd/simd_f16_ignore_nan.rs
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ mod avx512_ignore_nan {
#[inline(always)]
unsafe fn _mm_set1(a: f16) -> __m512i {
let data: [f16; LANE_SIZE] = [a; LANE_SIZE];
_f16_as_m521i_to_i16ord(_mm512_loadu_si512(data.as_ptr() as *const i32))
_f16_as_m521i_to_i16ord(_mm512_loadu_si512(data.as_ptr() as *const _))
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/simd/simd_f32_return_nan.rs
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ mod avx512 {

#[inline(always)]
unsafe fn _mm_loadu(data: *const f32) -> __m512i {
_f32_as_m512i_to_i32ord(_mm512_loadu_si512(data as *const i32))
_f32_as_m512i_to_i32ord(_mm512_loadu_si512(data as *const _))
}

#[inline(always)]
Expand Down
2 changes: 1 addition & 1 deletion src/simd/simd_i32.rs
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ mod avx512 {

#[inline(always)]
unsafe fn _mm_loadu(data: *const i32) -> __m512i {
_mm512_loadu_si512(data as *const i32)
_mm512_loadu_si512(data as *const _)
}

#[inline(always)]
Expand Down
1 change: 1 addition & 0 deletions src/simd/simd_u16.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ const XOR_VALUE: i16 = -0x8000; // i16::MIN

#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
#[inline(always)]
#[allow(unnecessary_transmutes)]
fn _i16ord_to_u16(ord_i16: i16) -> u16 {
// let v = ord_i16 ^ -0x8000;
unsafe { std::mem::transmute::<i16, u16>(ord_i16 ^ XOR_VALUE) }
Expand Down
1 change: 1 addition & 0 deletions src/simd/simd_u32.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ const XOR_VALUE: i32 = -0x80000000; // i32::MIN

#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
#[inline(always)]
#[allow(unnecessary_transmutes)]
fn _i32ord_to_u32(ord_i32: i32) -> u32 {
// let v = ord_i32 ^ -0x80000000;
unsafe { std::mem::transmute::<i32, u32>(ord_i32 ^ XOR_VALUE) }
Expand Down
1 change: 1 addition & 0 deletions src/simd/simd_u64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ const XOR_VALUE: i64 = -0x8000000000000000; // i64::MIN

#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
#[inline(always)]
#[allow(unnecessary_transmutes)]
fn _i64ord_to_u64(ord_i64: i64) -> u64 {
// let v = ord_i64 ^ -0x8000000000000000;
unsafe { std::mem::transmute::<i64, u64>(ord_i64 ^ XOR_VALUE) }
Expand Down
1 change: 1 addition & 0 deletions src/simd/simd_u8.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ const XOR_VALUE: i8 = -0x80; // i8::MIN

#[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
#[inline(always)]
#[allow(unnecessary_transmutes)]
fn _i8ord_to_u8(ord_i8: i8) -> u8 {
// let v = ord_i8 ^ -0x80;
unsafe { std::mem::transmute::<i8, u8>(ord_i8 ^ XOR_VALUE) }
Expand Down
Loading