Move main tests to hdf5/ and add f16/complex tests

Author: aldanor

Cargo.toml

@@ -15,9 +15,11 @@ edition = "2021"
 [workspace.dependencies]
 # external
 cfg-if = "1.0"
+half = { version = "2.2", default-features = false }
 libc = "0.2"
 libz-sys = { version = "1.1", default-features = false }
 mpi-sys = "0.2"
+num-complex = { version = "0.4", default-features = false }
 regex = "1.8"
 # internal
 hdf5-derive = { version = "0.8.1", path = "hdf5-derive" }  # !V

hdf5-types/Cargo.toml

@@ -15,16 +15,16 @@ edition.workspace = true
 
 [features]
 h5-alloc = []
-complex = ["num-complex"]
-f16 = ["half"]
+complex = ["dep:num-complex"]
+f16 = ["dep:half"]
 
 [dependencies]
 ascii = "1.1"
 cfg-if = { workspace = true }
 hdf5-sys = { workspace = true }
 libc = { workspace = true }
-num-complex = { version = "0.4", optional = true, default-features = false }
-half = { version = "2.2", optional = true, default-features = false }
+num-complex = { workspace = true, optional = true }
+half = { workspace = true, optional = true }
 
 [dev-dependencies]
 quickcheck = { version = "1.0", default-features = false }

hdf5/Cargo.toml

@@ -54,6 +54,8 @@ hdf5-sys = { workspace = true }
 hdf5-types = { workspace = true }
 
 [dev-dependencies]
+half = { workspace = true }
+num-complex = { workspace = true }
 paste = "1.0"
 pretty_assertions = "1.3"
 rand = { version = "0.8", features = ["small_rng"] }

tests/common/gen.rs hdf5/tests/common/gen.rstests/common/gen.rs renamed to hdf5/tests/common/gen.rs

@@ -1,12 +1,16 @@
 use std::convert::TryFrom;
-use std::fmt;
+use std::fmt::{self, Debug};
 use std::iter;
 
 use hdf5::types::{FixedAscii, FixedUnicode, VarLenArray, VarLenAscii, VarLenUnicode};
 use hdf5::H5Type;
 
+use half::f16;
 use ndarray::{ArrayD, SliceInfo, SliceInfoElem};
+use num_complex::Complex;
+use rand::distributions::Standard;
 use rand::distributions::{Alphanumeric, Uniform};
+use rand::prelude::Distribution;
 use rand::prelude::{Rng, SliceRandom};
 
 pub fn gen_shape<R: Rng + ?Sized>(rng: &mut R, ndim: usize) -> Vec<usize> {
@@ -93,6 +97,21 @@ macro_rules! impl_gen_tuple {
 
 impl_gen_tuple! { A, B, C, D, E, F, G, H, I, J, K, L }
 
+impl Gen for f16 {
+    fn gen<R: Rng + ?Sized>(rng: &mut R) -> Self {
+        Self::from_f32(rng.gen())
+    }
+}
+
+impl<T: Debug> Gen for Complex<T>
+where
+    Standard: Distribution<T>,
+{
+    fn gen<R: Rng + ?Sized>(rng: &mut R) -> Self {
+        Self::new(rng.gen(), rng.gen())
+    }
+}
+
 pub fn gen_vec<R: Rng + ?Sized, T: Gen>(rng: &mut R, size: usize) -> Vec<T> {
     iter::repeat(()).map(|_| T::gen(rng)).take(size).collect()
 }

tests/common/macros.rs hdf5/tests/common/macros.rstests/common/macros.rs renamed to hdf5/tests/common/macros.rs

@@ -313,6 +313,21 @@ fn test_read_write_primitive() -> hdf5::Result<()> {
     Ok(())
 }
 
+#[cfg(feature = "f16")]
+#[test]
+fn test_read_write_f16() -> hdf5::Result<()> {
+    test_read_write::<::half::f16>()?;
+    Ok(())
+}
+
+#[cfg(feature = "complex")]
+#[test]
+fn test_read_write_complex() -> hdf5::Result<()> {
+    test_read_write::<::num_complex::Complex32>()?;
+    test_read_write::<::num_complex::Complex64>()?;
+    Ok(())
+}
+
 #[test]
 fn test_read_write_enum() -> hdf5::Result<()> {
     test_read_write::<Enum>()