Skip to content

Consolidate beam calc functions with generics #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cjordan wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Consolidate beam calc functions with generics #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3947e32
Fix some examples not having different coords.
cjordan Mar 7, 2025
8fb8770
Fix some lints.
cjordan Mar 7, 2025
3af00ea
Tweaks to doc strings.
cjordan Mar 9, 2025
22b0e9f
Add some re-exports.
cjordan Mar 9, 2025
c5bd8d1
Consolidate beam calc functions with generics.
cjordan Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 20 additions & 30 deletions benches/bench.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,8 @@ fn fee(c: &mut Criterion) {
let iau_order = true;
b.iter(|| {
let beam = FEEBeam::new("mwa_full_embedded_element_pattern.h5").unwrap();
beam.calc_jones_pair(
az,
za,
beam.calc_jones(
(az, za),
freq,
&delays,
&amps,
Expand All @@ -60,9 +59,8 @@ fn fee(c: &mut Criterion) {
let iau_order = true;
let beam = FEEBeam::new("mwa_full_embedded_element_pattern.h5").unwrap();
b.iter(|| {
beam.calc_jones_pair(
az,
za,
beam.calc_jones(
(az, za),
freq,
&delays,
&amps,
Expand All @@ -86,9 +84,8 @@ fn fee(c: &mut Criterion) {
let iau_order = true;
let beam = FEEBeam::new("mwa_full_embedded_element_pattern.h5").unwrap();
// Prime the cache.
beam.calc_jones_pair(
az,
za,
beam.calc_jones(
(az, za),
freq,
&delays,
&amps,
Expand All @@ -98,9 +95,8 @@ fn fee(c: &mut Criterion) {
)
.unwrap();
b.iter(|| {
beam.calc_jones_pair(
az,
za,
beam.calc_jones(
(az, za),
freq,
&delays,
&amps,
Expand Down Expand Up @@ -128,9 +124,8 @@ fn fee(c: &mut Criterion) {
let iau_order = true;
let beam = FEEBeam::new("mwa_full_embedded_element_pattern.h5").unwrap();
// Prime the cache.
beam.calc_jones_pair(
az[0],
za[0],
beam.calc_jones(
(az[0], za[0]),
freq,
&delays,
&amps,
Expand All @@ -140,9 +135,8 @@ fn fee(c: &mut Criterion) {
)
.unwrap();
b.iter(|| {
beam.calc_jones_array_pair(
&az,
&za,
beam.calc_jones_array(
(&az, &za),
freq,
&delays,
&amps,
Expand Down Expand Up @@ -172,9 +166,8 @@ fn fee(c: &mut Criterion) {
let iau_order = true;
let beam = FEEBeam::new("mwa_full_embedded_element_pattern.h5").unwrap();
// Prime the cache.
beam.calc_jones_pair(
az[0],
za[0],
beam.calc_jones(
(az[0], za[0]),
freq,
&delays,
&amps,
Expand All @@ -187,9 +180,8 @@ fn fee(c: &mut Criterion) {
az.par_iter()
.zip(za.par_iter())
.map(|(&a, &z)| {
beam.calc_jones_pair(
a,
z,
beam.calc_jones(
(a, z),
freq,
&delays,
&amps,
Expand Down Expand Up @@ -253,9 +245,8 @@ fn fee(c: &mut Criterion) {
c.bench_function("calc_jones_array 100000 dirs", |b| {
let beam = FEEBeam::new("mwa_full_embedded_element_pattern.h5").unwrap();
// Prime the cache.
beam.calc_jones_pair(
az_double[0],
za_double[0],
beam.calc_jones(
(az_double[0], za_double[0]),
freqs[0],
delays.as_slice().unwrap(),
amps.as_slice().unwrap(),
Expand All @@ -265,9 +256,8 @@ fn fee(c: &mut Criterion) {
)
.unwrap();
b.iter(|| {
beam.calc_jones_array_pair(
&az_double,
&za_double,
beam.calc_jones_array(
(&az_double, &za_double),
freqs[0],
delays.as_slice().unwrap(),
amps.as_slice().unwrap(),
Expand Down
2 changes: 1 addition & 1 deletion build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ mod gpu {
};

for arch in arches {
hip_target.flag(&format!("--offload-arch={arch}"));
hip_target.flag(format!("--offload-arch={arch}"));
}

match env::var("DEBUG").as_deref() {
Expand Down
4 changes: 2 additions & 2 deletions examples/analytic_cuda.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// Set up the directions to test. The type depends on the GPU precision.
let mut azels = Vec::with_capacity(num_directions);
for i in 0..num_directions {
let az = 0.4 + 0.3 * PI * (i / num_directions) as f64;
let za = 0.3 + 0.4 * FRAC_PI_2 * (i / num_directions) as f64;
let az = 0.4 + 0.3 * PI * i as f64 / num_directions as f64;
let za = 0.3 + 0.4 * FRAC_PI_2 * i as f64 / num_directions as f64;
azels.push(AzEl::from_radians(az, FRAC_PI_2 - za));
}

Expand Down
5 changes: 3 additions & 2 deletions examples/analytic_hip.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// Set up the directions to test. The type depends on the GPU precision.
let mut azels = Vec::with_capacity(num_directions);
for i in 0..num_directions {
let az = 0.4 + 0.3 * PI * (i / num_directions) as f64;
let za = 0.3 + 0.4 * FRAC_PI_2 * (i / num_directions) as f64;
let az = 0.4 + 0.3 * PI * i as f64 / num_directions as f64;
let za = 0.3 + 0.4 * FRAC_PI_2 * i as f64 / num_directions as f64;
azels.push(AzEl::from_radians(az, FRAC_PI_2 - za));
}

Expand Down Expand Up @@ -89,6 +89,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
norm_to_zenith,
)?;

#[allow(clippy::useless_conversion)]
let diff = jones[(0, 0, 0)] - Jones::<GpuFloat>::from(jones_cpu);

println!("Difference between first GPU and CPU Jones matrices");
Expand Down
4 changes: 2 additions & 2 deletions examples/fee_cuda.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// Set up the directions to test. The type depends on the GPU precision.
let mut azels = Vec::with_capacity(num_directions);
for i in 0..num_directions {
let az = 0.4 + 0.3 * PI * (i / num_directions) as f64;
let za = 0.3 + 0.4 * FRAC_PI_2 * (i / num_directions) as f64;
let az = 0.4 + 0.3 * PI * i as f64 / num_directions as f64;
let za = 0.3 + 0.4 * FRAC_PI_2 * i as f64 / num_directions as f64;
azels.push(AzEl::from_radians(az, FRAC_PI_2 - za));
}

Expand Down
5 changes: 3 additions & 2 deletions examples/fee_hip.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// Set up the directions to test. The type depends on the GPU precision.
let mut azels = Vec::with_capacity(num_directions);
for i in 0..num_directions {
let az = 0.4 + 0.3 * PI * (i / num_directions) as f64;
let za = 0.3 + 0.4 * FRAC_PI_2 * (i / num_directions) as f64;
let az = 0.4 + 0.3 * PI * i as f64 / num_directions as f64;
let za = 0.3 + 0.4 * FRAC_PI_2 * i as f64 / num_directions as f64;
azels.push(AzEl::from_radians(az, FRAC_PI_2 - za));
}

Expand Down Expand Up @@ -95,6 +95,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
iau_order,
)?;

#[allow(clippy::useless_conversion)]
let diff = jones[(0, 0, 0)] - Jones::<GpuFloat>::from(jones_cpu);

println!("Difference between first GPU and CPU Jones matrices");
Expand Down
10 changes: 4 additions & 6 deletions src/analytic/ffi/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,8 @@ pub unsafe extern "C" fn analytic_calc_jones(
let amps_s = slice::from_raw_parts(amps, num_amps as usize);

// Using the passed-in beam, get the beam response (Jones matrix).
match beam.calc_jones_pair(
az_rad,
za_rad,
match beam.calc_jones(
(az_rad, za_rad),
freq_hz,
delays_s,
amps_s,
Expand Down Expand Up @@ -243,9 +242,8 @@ pub unsafe extern "C" fn analytic_calc_jones_array(
let amps_s = slice::from_raw_parts(amps, num_amps as usize);
let results_s = slice::from_raw_parts_mut(jones.cast(), num_azza as usize);

ffi_error!(beam.calc_jones_array_pair_inner(
az,
za,
ffi_error!(beam.calc_jones_array_inner(
(az, za),
freq_hz,
delays_s,
amps_s,
Expand Down
5 changes: 2 additions & 3 deletions src/analytic/ffi/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,9 +301,8 @@ fn test_calc_jones_gpu_via_ffi() {
for (mut out, freq) in out.outer_iter_mut().zip(freqs) {
unsafe {
let cpu_results = (*beam)
.calc_jones_array_pair(
&az,
&za,
.calc_jones_array(
(&az, &za),
freq,
delays.as_slice().unwrap(),
amps.as_slice().unwrap(),
Expand Down
10 changes: 4 additions & 6 deletions src/analytic/gpu/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,8 @@ fn test_analytic(
{
for (mut out, &freq) in out.outer_iter_mut().zip(freqs) {
let cpu_results = beam
.calc_jones_array_pair(
&az,
&za,
.calc_jones_array(
(&az, &za),
freq,
delays.as_slice().unwrap(),
amps.as_slice().unwrap(),
Expand Down Expand Up @@ -172,9 +171,8 @@ fn test_cram() {

// Compare with CPU.
let cpu_results = beam
.calc_jones_pair(
az_rad[0],
za_rad[0],
.calc_jones(
(az_rad[0], za_rad[0]),
freq_hz[0],
delays.as_slice().unwrap(),
amps.as_slice().unwrap(),
Expand Down
Loading