From e13ae8925fddda59b28358721c632c87c60e914d Mon Sep 17 00:00:00 2001 From: d3v-null Date: Wed, 14 Aug 2024 13:48:52 +0800 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20=20marlu,=20rubbl,=20ndarr?= =?UTF-8?q?ay,=20byteorder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.lock | 86 +++++++++++++++++++++++++++++++++--------------------- Cargo.toml | 8 ++--- src/cli.rs | 4 +-- 3 files changed, 58 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ba9bf24..bc40504 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -176,9 +176,9 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cast" @@ -449,7 +449,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.28", + "syn 2.0.74", ] [[package]] @@ -466,7 +466,7 @@ checksum = "5fb2a9757fb085d6d97856b28d4f049141ca4a61a64c697f4426433b5f6caa1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.74", ] [[package]] @@ -1054,9 +1054,9 @@ checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "marlu" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e611f77c79511e2d3f22dda0ef8ebe311b40cf6abffa4dbe10484f18a9377eb" +checksum = "87329073badac25c4d8d4d2544cbfdf389fefba069062d44e6b29ba0912db318" dependencies = [ "approx", "built", @@ -1136,24 +1136,32 @@ dependencies = [ [[package]] name = "ndarray" -version = "0.15.6" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" +checksum = "087ee1ca8a7c22830c2bba4a96ed8e72ce0968ae944349324d52522f66aa3944" dependencies = [ "approx", "matrixmultiply", "num-complex", "num-integer", "num-traits", + "portable-atomic 1.7.0", + "portable-atomic-util", "rawpointer", "rayon", ] +[[package]] +name = "never" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c96aba5aa877601bb3f6dd6a63a969e1f82e60646e81e71b14496995e9853c91" + [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ "num-traits", ] @@ -1166,7 +1174,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.74", ] [[package]] @@ -1181,9 +1189,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -1268,14 +1276,23 @@ version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e30165d31df606f5726b090ec7592c308a0eaf61721ff64c9a3018e344a8753e" dependencies = [ - "portable-atomic 1.4.2", + "portable-atomic 1.7.0", ] [[package]] name = "portable-atomic" -version = "1.4.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f32154ba0af3a075eefa1eda8bb414ee928f62303a54ea85b8d6638ff1a6ee9e" +checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" + +[[package]] +name = "portable-atomic-util" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcdd8420072e66d54a407b3316991fe946ce3ab1083a7f575b2463866624704d" +dependencies = [ + "portable-atomic 1.7.0", +] [[package]] name = "prettytable-rs" @@ -1293,18 +1310,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.32" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -1395,12 +1412,13 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "rubbl_casatables" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a048158e9953c00dec139ff81a37cb4cc28e00c18be189ef704b167911ba9863" +checksum = "3b735aaa1993effdc3715a270e9ae6f2afa44de55228d916b32f088e8d2694c7" dependencies = [ "cc", "ndarray", + "never", "rubbl_casatables_impl", "rubbl_core", "thiserror", @@ -1417,9 +1435,9 @@ dependencies = [ [[package]] name = "rubbl_core" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51804c5510b8e90db157d56ec29560916da9c35a2e53bf57380978c214c9ec2e" +checksum = "07d81c00458933f85fd0021152cca476d4943d2141343976caae74c5a14a2d4e" dependencies = [ "byteorder", "ndarray", @@ -1502,7 +1520,7 @@ checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.74", ] [[package]] @@ -1547,9 +1565,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" dependencies = [ "proc-macro2", "quote", @@ -1620,22 +1638,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.74", ] [[package]] @@ -1759,7 +1777,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.74", "wasm-bindgen-shared", ] @@ -1781,7 +1799,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.74", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/Cargo.toml b/Cargo.toml index 6640785..16b79c1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,14 +36,14 @@ cfitsio-static = ["marlu/cfitsio-static"] all-static = ["cfitsio-static"] [dependencies] -byteorder = "1.4.3" +byteorder = "1.5.0" cfg-if = "1.0.0" derive_builder = "0.11.1" indicatif = { version = "0.17.0", features = ["rayon"] } itertools = "0.10.0" lazy_static = "1.4.0" log = "0.4.0" -marlu = "0.11.0" +marlu = "0.12.0" regex = "1.4.0" thiserror = "1.0.0" @@ -64,8 +64,8 @@ csv = "1.1" float-cmp = "0.9" glob = "0.3" lexical = "6.0" -marlu = { version = "0.11.0", features = ["approx"] } -ndarray = { version = "0.15.4", features = ["approx-0_5"] } +marlu = { version = "0.12.0", features = ["approx"] } +ndarray = { version = "0.16.0", features = ["approx"] } tempfile = "3.3" [build-dependencies] diff --git a/src/cli.rs b/src/cli.rs index 4855011..d876542 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -3961,8 +3961,8 @@ mod tests_aoflagger_flagset { assert_eq!(left_header.num_rows, right_header.num_rows); assert_eq!(left_header.num_rows as usize, num_rows); - let left_flags = $left_flagset.read_flags().unwrap().into_raw_vec(); - let right_flags = $right_flagset.read_flags().unwrap().into_raw_vec(); + let (left_flags, _) = $left_flagset.read_flags().unwrap().into_raw_vec_and_offset(); + let (right_flags, _) = $right_flagset.read_flags().unwrap().into_raw_vec_and_offset(); assert_eq!(left_flags.len(), right_flags.len()); assert_eq!( left_flags.len(),