diff --git a/Cargo.lock b/Cargo.lock index bc40504..ab3f087 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -116,7 +116,7 @@ dependencies = [ [[package]] name = "birli" -version = "0.12.0" +version = "0.13.0" dependencies = [ "aoflagger_sys", "approx", @@ -1054,9 +1054,9 @@ checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "marlu" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87329073badac25c4d8d4d2544cbfdf389fefba069062d44e6b29ba0912db318" +checksum = "6271f1b61a6dcfd248b1c3a2f8c49bd5b425abe2d2c970263a14390369eab6a6" dependencies = [ "approx", "built", diff --git a/Cargo.toml b/Cargo.toml index 16b79c1..80c0d82 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "birli" description = "A preprocessing pipeline for the Murchison Widefield Array" -version = "0.12.0" +version = "0.13.0" readme = "README.md" homepage = "https://github.com/MWATelescope/Birli" repository = "https://github.com/MWATelescope/Birli" @@ -43,7 +43,7 @@ indicatif = { version = "0.17.0", features = ["rayon"] } itertools = "0.10.0" lazy_static = "1.4.0" log = "0.4.0" -marlu = "0.12.0" +marlu = "0.13.0" regex = "1.4.0" thiserror = "1.0.0" @@ -64,7 +64,7 @@ csv = "1.1" float-cmp = "0.9" glob = "0.3" lexical = "6.0" -marlu = { version = "0.12.0", features = ["approx"] } +marlu = { version = "0.13.0", features = ["approx"] } ndarray = { version = "0.16.0", features = ["approx"] } tempfile = "3.3" diff --git a/RELEASES.md b/RELEASES.md index 1419d95..06b4aee 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,6 +1,12 @@ +# Version 0.13.0 (2024-08-14) + +- 🐛 fix issues compiling on arm64: + - update Marlu 0.13.0 + # Version 0.12.0 (2024-06-27) + - 🐛 bug fixes: - #152 default pfb gains should be cotter2014 for legacy correlator, not jake - 🙏 quality of life: @@ -9,11 +15,13 @@ - update default aoflagger version in makefile and dockerfile # Version 0.11.0 (2024-06-19) + - ➕ dependencies: - Marlu 0.11.0 - built ~0.7.3 # Version 0.10.0 (2023-08-11) + - 🙏 quality of life: - uvfits are now written out with a second DATE and INTTIM - ➕ dependencies: @@ -21,6 +29,7 @@ - use rust version 1.64 # Version 0.9.2 (2023-07-18) + - 🙏 quality of life: - update modtime when writing ms diff --git a/src/flags.rs b/src/flags.rs index 41eef75..7d83eb9 100644 --- a/src/flags.rs +++ b/src/flags.rs @@ -556,6 +556,7 @@ pub fn write_flags( mod tests { use super::write_flags; use glob::glob; + use std::ffi::c_char; use tempfile::tempdir; use crate::{ @@ -677,18 +678,18 @@ mod tests { ); let tests = [ - (0, 0, 0, i8::from(false)), - (0, 0, 1, i8::from(false)), - (0, 1, 0, i8::from(false)), - (0, 1, 1, i8::from(false)), - (0, 2, 0, i8::from(false)), - (0, 2, 1, i8::from(false)), - (1, 0, 0, i8::from(false)), - (1, 0, 1, i8::from(false)), - (1, 1, 0, i8::from(false)), - (1, 1, 1, i8::from(true)), - (1, 2, 0, i8::from(false)), - (1, 2, 1, i8::from(false)), + (0, 0, 0, c_char::from(false)), + (0, 0, 1, c_char::from(false)), + (0, 1, 0, c_char::from(false)), + (0, 1, 1, c_char::from(false)), + (0, 2, 0, c_char::from(false)), + (0, 2, 1, c_char::from(false)), + (1, 0, 0, c_char::from(false)), + (1, 0, 1, c_char::from(false)), + (1, 1, 0, c_char::from(false)), + (1, 1, 1, c_char::from(true)), + (1, 2, 0, c_char::from(false)), + (1, 2, 1, c_char::from(false)), ]; for (timestep_idx, baseline_idx, fine_chan_idx, expected_flag) in tests { let row_idx = timestep_idx * num_baselines + baseline_idx; diff --git a/src/io/mwaf.rs b/src/io/mwaf.rs index 45e1562..5d6b366 100644 --- a/src/io/mwaf.rs +++ b/src/io/mwaf.rs @@ -8,7 +8,10 @@ //! one column. Each cell in the table contains a binary vector of flags for each fine channel in //! the coarse channel. -use std::path::{Path, PathBuf}; +use std::{ + ffi::c_char, + path::{Path, PathBuf}, +}; use fitsio::{tables::ColumnDataType, tables::ColumnDescription, FitsFile}; use indicatif::{MultiProgress, ProgressBar, ProgressDrawTarget, ProgressStyle}; @@ -441,7 +444,7 @@ impl FlagFileSet { let mut status = 0; - let mut flag_cell = vec![0; flag_coarse_chan_view.len_of(Axis(1))]; + let mut flag_cell: Vec = vec![0; flag_coarse_chan_view.len_of(Axis(1))]; for flag_timestep_view in flag_coarse_chan_view.outer_iter() { for (flag_baseline_view, baseline_flag_count) in flag_timestep_view .axis_iter(Axis(1)) @@ -452,7 +455,7 @@ impl FlagFileSet { .zip_eq(flag_baseline_view) .zip_eq(channel_flag_counts.iter_mut()) .for_each(|((a, &b), count)| { - *a = i8::from(b); + *a = c_char::from(b); if b { *count += 1; } @@ -789,7 +792,7 @@ impl FlagFileSet { } #[cfg(test)] - pub(crate) fn read_flags(&self) -> Result, IOError> { + pub(crate) fn read_flags(&self) -> Result, IOError> { let gpubox = &self.gpuboxes[0]; let mut fptr = FitsFile::open(&gpubox.filename)?; let hdu = fits_open_hdu!(&mut fptr, 0)?;