Make fix_amps_ndarray public.

CHANGELOG.md

@@ -6,8 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic
 Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## [0.7.0] - 2023-10-31
 ### Added
+- Expose Rust function `fix_amps_ndarray`
 - FFI functions
 
   See the changes below for an explanation.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mwa_hyperbeam"
-version = "0.6.1"
+version = "0.7.0"
 authors = [
     "Christopher H. Jordan <christopherjordan87@gmail.com>",
     "Jack L. B. Line <jack.line@curtin.edu.au>",

src/fee/gpu/mod.rs

@@ -29,6 +29,7 @@ use ndarray::prelude::*;
 
 use super::{FEEBeam, FEEBeamError};
 use crate::{
+    fix_amps_ndarray,
     gpu::{DevicePointer, GpuError, GpuFloat},
     types::CacheKey,
 };
@@ -681,31 +682,3 @@ impl FEEBeamGpu {
         self.num_unique_freqs
     }
 }
-
-/// Ensure that any delays of 32 have an amplitude (dipole gain) of 0. The
-/// results are bad otherwise! Also ensure that we have 32 dipole gains (amps)
-/// here. Also return a Rust array of delays for convenience.
-pub(super) fn fix_amps_ndarray(
-    amps: ArrayView1<f64>,
-    delays: ArrayView1<u32>,
-) -> ([f64; 32], [u32; 16]) {
-    let mut full_amps: [f64; 32] = [1.0; 32];
-    full_amps
-        .iter_mut()
-        .zip(amps.iter().cycle())
-        .zip(delays.iter().cycle())
-        .for_each(|((out_amp, &in_amp), &delay)| {
-            if delay == 32 {
-                *out_amp = 0.0;
-            } else {
-                *out_amp = in_amp;
-            }
-        });
-
-    // So that we don't have to do .as_slice().unwrap() on our ndarrays outside
-    // of this function, return a Rust array of delays here.
-    let mut delays_a: [u32; 16] = [0; 16];
-    delays_a.iter_mut().zip(delays).for_each(|(da, d)| *da = *d);
-
-    (full_amps, delays_a)
-}

src/lib.rs

@@ -26,3 +26,30 @@ cfg_if::cfg_if! {
 }
 
 pub use marlu::{AzEl, Jones}; // So that callers can have a different version of Marlu.
+
+use ndarray::ArrayView1;
+
+/// Ensure that any delays of 32 have an amplitude (dipole gain) of 0. The
+/// results are bad otherwise! Also ensure that we have 32 dipole gains (amps)
+/// here. Also return a Rust array of delays for convenience.
+pub fn fix_amps_ndarray(amps: ArrayView1<f64>, delays: ArrayView1<u32>) -> ([f64; 32], [u32; 16]) {
+    let mut full_amps: [f64; 32] = [1.0; 32];
+    full_amps
+        .iter_mut()
+        .zip(amps.iter().cycle())
+        .zip(delays.iter().cycle())
+        .for_each(|((out_amp, &in_amp), &delay)| {
+            if delay == 32 {
+                *out_amp = 0.0;
+            } else {
+                *out_amp = in_amp;
+            }
+        });
+
+    // So that we don't have to do .as_slice().unwrap() on our ndarrays outside
+    // of this function, return a Rust array of delays here.
+    let mut delays_a: [u32; 16] = [0; 16];
+    delays_a.iter_mut().zip(delays).for_each(|(da, d)| *da = *d);
+
+    (full_amps, delays_a)
+}