From 7d67df818774e22184c51bc12a571a7cf664c96b Mon Sep 17 00:00:00 2001 From: d3v-null Date: Thu, 15 Aug 2024 17:31:46 +0800 Subject: [PATCH] use hyperbeam from marlu0.13 branch --- Cargo.lock | 35 ++++++----------------------------- Cargo.toml | 4 ++-- 2 files changed, 8 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 36de71e9..c1c94fad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -106,7 +106,7 @@ dependencies = [ "itertools", "lazy_static", "log", - "marlu 0.13.0", + "marlu", "regex", "thiserror", ] @@ -1377,27 +1377,6 @@ version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" -[[package]] -name = "marlu" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e611f77c79511e2d3f22dda0ef8ebe311b40cf6abffa4dbe10484f18a9377eb" -dependencies = [ - "built", - "cfg-if", - "erfa", - "hifitime", - "itertools", - "lazy_static", - "log", - "ndarray 0.15.6", - "num-complex", - "num-traits", - "rayon", - "tar", - "thiserror", -] - [[package]] name = "marlu" version = "0.13.0" @@ -1454,9 +1433,8 @@ dependencies = [ [[package]] name = "mwa_hyperbeam" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6381480885ab225ca5f1c6861a243848dc05951dc556b8fdd448ac82b632fb" +version = "0.10.0" +source = "git+https://github.com/MWATelescope/mwa_hyperbeam?branch=marlu0.13#06702efaf2475577ec99f15339699239007f1a59" dependencies = [ "cbindgen 0.25.0", "cc", @@ -1465,8 +1443,8 @@ dependencies = [ "hdf5", "hdf5-sys", "hip-sys", - "marlu 0.11.0", - "ndarray 0.15.6", + "marlu", + "ndarray 0.16.0", "num-complex", "panic-message", "parking_lot 0.12.3", @@ -1507,7 +1485,7 @@ dependencies = [ "itertools", "lazy_static", "log", - "marlu 0.13.0", + "marlu", "mwa_hyperbeam", "mwalib", "ndarray 0.16.0", @@ -1563,7 +1541,6 @@ dependencies = [ "num-integer", "num-traits", "rawpointer", - "rayon", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 208f97ea..2b7ed7db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -80,7 +80,7 @@ indicatif = { version = "0.17.5", features = ["rayon"] } lazy_static = "1.4.0" log = "0.4.0" marlu = { version = "0.13.0", features = ["serde"] } -mwa_hyperbeam = "0.9.3" +mwa_hyperbeam = "0.10.0" mwalib = "1.3.3" ndarray = { version = "0.16.0", features = ["rayon"] } num-complex = "0.4.1" @@ -144,4 +144,4 @@ harness = false # mwalib = { path = "../mwalib" } # mwalib = { git = "https://github.com/MWATelescope/mwalib" } # mwa_hyperbeam = { path = "../mwa_hyperbeam" } -# mwa_hyperbeam = { git = "https://github.com/MWATelescope/mwa_hyperbeam", branch = "DUT1" } +mwa_hyperbeam = { git = "https://github.com/MWATelescope/mwa_hyperbeam", branch = "marlu0.13" }