From 8fe3c73560890aa39886b53620c14956773df9f3 Mon Sep 17 00:00:00 2001 From: Simon Perkins Date: Fri, 26 Jan 2024 14:07:24 +0200 Subject: [PATCH] more flake8 fixes --- africanus/averaging/bda_avg.py | 15 +++++++------ africanus/averaging/shared.py | 1 - africanus/averaging/tests/test_bda_mapping.py | 1 - africanus/averaging/time_and_channel_avg.py | 22 +++++++++++++------ .../averaging/time_and_channel_mapping.py | 7 +++++- .../utils/compute_and_corrupt_vis.py | 5 +++-- africanus/coordinates/coordinates.py | 4 +++- africanus/dft/kernels.py | 3 ++- africanus/experimental/rime/fused/core.py | 1 - africanus/gridding/wgridder/vis2im.py | 4 ++-- africanus/rime/predict.py | 11 +++++++--- 11 files changed, 47 insertions(+), 27 deletions(-) diff --git a/africanus/averaging/bda_avg.py b/africanus/averaging/bda_avg.py index ddcc022d5..12574a161 100644 --- a/africanus/averaging/bda_avg.py +++ b/africanus/averaging/bda_avg.py @@ -27,8 +27,8 @@ def row_average(meta, ant1, ant2, flag_row=None, time_centroid=None, exposure=None, uvw=None, weight=None, sigma=None): return row_average_impl(meta, ant1, ant2, flag_row=flag_row, - time_centroid=time_centroid, exposure=exposure, uvw=uvw, - weight=weight, sigma=sigma) + time_centroid=time_centroid, exposure=exposure, + uvw=uvw, weight=weight, sigma=sigma) def row_average_impl(meta, ant1, ant2, flag_row=None, @@ -575,12 +575,13 @@ def bda(time, interval, antenna1, antenna2, min_nchan=1): return bda_impl(time, interval, antenna1, antenna2, - time_centroid=time_centroid, exposure=exposure, flag_row=flag_row, - uvw=uvw, weight=weight, sigma=sigma, + time_centroid=time_centroid, exposure=exposure, + flag_row=flag_row, uvw=uvw, weight=weight, sigma=sigma, chan_freq=chan_freq, chan_width=chan_width, effective_bw=effective_bw, resolution=resolution, visibilities=visibilities, flag=flag, - weight_spectrum=weight_spectrum, sigma_spectrum=sigma_spectrum, + weight_spectrum=weight_spectrum, + sigma_spectrum=sigma_spectrum, max_uvw_dist=max_uvw_dist, max_fov=max_fov, decorrelation=decorrelation, time_bin_secs=time_bin_secs, min_nchan=min_nchan) @@ -625,8 +626,8 @@ def nb_bda_impl(time, interval, antenna1, antenna2, min_nchan=min_nchan) row_avg = row_average(meta, antenna1, antenna2, flag_row, # noqa: F841 - time_centroid, exposure, uvw, - weight=weight, sigma=sigma) + time_centroid, exposure, uvw, + weight=weight, sigma=sigma) row_chan_avg = row_chan_average(meta, # noqa: F841 flag_row=flag_row, diff --git a/africanus/averaging/shared.py b/africanus/averaging/shared.py index d719c68cd..b53b43e9d 100644 --- a/africanus/averaging/shared.py +++ b/africanus/averaging/shared.py @@ -5,7 +5,6 @@ from africanus.util.numba import (is_numba_type_none, intrinsic, njit, - JIT_OPTIONS, overload) diff --git a/africanus/averaging/tests/test_bda_mapping.py b/africanus/averaging/tests/test_bda_mapping.py index af235e84e..fc0508695 100644 --- a/africanus/averaging/tests/test_bda_mapping.py +++ b/africanus/averaging/tests/test_bda_mapping.py @@ -5,7 +5,6 @@ import pytest from africanus.averaging.bda_mapping import bda_mapper, Binner -from africanus.util.numba import njit @pytest.fixture(scope="session", params=[4096]) diff --git a/africanus/averaging/time_and_channel_avg.py b/africanus/averaging/time_and_channel_avg.py index 7038306ee..208fd07e0 100644 --- a/africanus/averaging/time_and_channel_avg.py +++ b/africanus/averaging/time_and_channel_avg.py @@ -340,7 +340,8 @@ def row_chan_average(row_meta, chan_meta, return row_chan_average_impl(row_meta, chan_meta, flag_row=flag_row, weight=weight, visibilities=visibilities, flag=flag, - weight_spectrum=weight_spectrum, sigma_spectrum=sigma_spectrum) + weight_spectrum=weight_spectrum, + sigma_spectrum=sigma_spectrum) def row_chan_average_impl(row_meta, chan_meta, @@ -558,8 +559,10 @@ def impl(row_meta, chan_meta, flag_row=None, weight=None, @njit(**JIT_OPTIONS) def chan_average(chan_meta, chan_freq=None, chan_width=None, effective_bw=None, resolution=None): - return chan_average_impl(chan_meta, chan_freq=chan_freq, chan_width=chan_width, - effective_bw=effective_bw, resolution=resolution) + return chan_average_impl(chan_meta, chan_freq=chan_freq, + chan_width=chan_width, + effective_bw=effective_bw, + resolution=resolution) def chan_average_impl(chan_meta, chan_freq=None, chan_width=None, @@ -636,13 +639,18 @@ def time_and_channel(time, interval, antenna1, antenna2, weight_spectrum=None, sigma_spectrum=None, time_bin_secs=1.0, chan_bin_size=1): return time_and_channel_impl(time, interval, antenna1, antenna2, - time_centroid=time_centroid, exposure=exposure, flag_row=flag_row, + time_centroid=time_centroid, + exposure=exposure, + flag_row=flag_row, uvw=uvw, weight=weight, sigma=sigma, chan_freq=chan_freq, chan_width=chan_width, - effective_bw=effective_bw, resolution=resolution, + effective_bw=effective_bw, + resolution=resolution, visibilities=visibilities, flag=flag, - weight_spectrum=weight_spectrum, sigma_spectrum=sigma_spectrum, - time_bin_secs=time_bin_secs, chan_bin_size=chan_bin_size) + weight_spectrum=weight_spectrum, + sigma_spectrum=sigma_spectrum, + time_bin_secs=time_bin_secs, + chan_bin_size=chan_bin_size) def time_and_channel_impl(time, interval, antenna1, antenna2, diff --git a/africanus/averaging/time_and_channel_mapping.py b/africanus/averaging/time_and_channel_mapping.py index 7dbb6af0d..31b287b86 100644 --- a/africanus/averaging/time_and_channel_mapping.py +++ b/africanus/averaging/time_and_channel_mapping.py @@ -7,7 +7,12 @@ import numba from africanus.averaging.support import unique_time, unique_baselines -from africanus.util.numba import is_numba_type_none, njit, jit, JIT_OPTIONS, overload +from africanus.util.numba import ( + is_numba_type_none, + njit, + jit, + JIT_OPTIONS, + overload) class RowMapperError(Exception): diff --git a/africanus/calibration/utils/compute_and_corrupt_vis.py b/africanus/calibration/utils/compute_and_corrupt_vis.py index cd2b5ef8a..33ad85de0 100644 --- a/africanus/calibration/utils/compute_and_corrupt_vis.py +++ b/africanus/calibration/utils/compute_and_corrupt_vis.py @@ -76,8 +76,9 @@ def jones_mul(a1j, model, a2j, uvw, freq, lm, out): @njit(**JIT_OPTIONS) def compute_and_corrupt_vis(time_bin_indices, time_bin_counts, antenna1, antenna2, jones, model, uvw, freq, lm): - return compute_and_corrupt_vis_impl(time_bin_indices, time_bin_counts, antenna1, - antenna2, jones, model, uvw, freq, lm) + return compute_and_corrupt_vis_impl(time_bin_indices, time_bin_counts, + antenna1, antenna2, jones, model, + uvw, freq, lm) def compute_and_corrupt_vis_impl(time_bin_indices, time_bin_counts, antenna1, diff --git a/africanus/coordinates/coordinates.py b/africanus/coordinates/coordinates.py index 047f5b9ca..475691d36 100644 --- a/africanus/coordinates/coordinates.py +++ b/africanus/coordinates/coordinates.py @@ -4,7 +4,9 @@ import numpy as np from africanus.util.docs import DocstringTemplate -from africanus.util.numba import is_numba_type_none, jit, JIT_OPTIONS, njit, overload +from africanus.util.numba import (is_numba_type_none, + jit, JIT_OPTIONS, + njit, overload) from africanus.util.requirements import requires_optional try: diff --git a/africanus/dft/kernels.py b/africanus/dft/kernels.py index 267cff974..000cbba1d 100644 --- a/africanus/dft/kernels.py +++ b/africanus/dft/kernels.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- -from africanus.util.numba import is_numba_type_none, njit, overload, JIT_OPTIONS +from africanus.util.numba import (is_numba_type_none, njit, + overload, JIT_OPTIONS) from africanus.util.docs import doc_tuple_to_str from collections import namedtuple diff --git a/africanus/experimental/rime/fused/core.py b/africanus/experimental/rime/fused/core.py index 042772274..5af73a10e 100644 --- a/africanus/experimental/rime/fused/core.py +++ b/africanus/experimental/rime/fused/core.py @@ -44,7 +44,6 @@ def nb_rime(*args): argstart = len(args) // 2 names = args[:argstart] - inargs = args[argstart:] if not all(isinstance(n, types.Literal) for n in names): raise TypeError(f"{names} must be a Tuple of Literal strings") diff --git a/africanus/gridding/wgridder/vis2im.py b/africanus/gridding/wgridder/vis2im.py index 30155c565..752d376b0 100644 --- a/africanus/gridding/wgridder/vis2im.py +++ b/africanus/gridding/wgridder/vis2im.py @@ -20,9 +20,9 @@ def _dirty_internal(uvw, freq, vis, freq_bin_idx, freq_bin_counts, nx, ny, # need a copy here if using multiple row chunks freq_bin_idx2 = freq_bin_idx - freq_bin_idx.min() nband = freq_bin_idx.size - if type(vis[0, 0]) == np.complex64: + if type(vis[0, 0]) is np.complex64: real_type = np.float32 - elif type(vis[0, 0]) == np.complex128: + elif type(vis[0, 0]) is np.complex128: real_type = np.float64 else: raise ValueError("Vis of incorrect type") diff --git a/africanus/rime/predict.py b/africanus/rime/predict.py index 8733acd7d..cc7e13e13 100644 --- a/africanus/rime/predict.py +++ b/africanus/rime/predict.py @@ -4,7 +4,8 @@ import numpy as np from africanus.util.docs import DocstringTemplate -from africanus.util.numba import is_numba_type_none, JIT_OPTIONS, njit, overload +from africanus.util.numba import (is_numba_type_none, JIT_OPTIONS, + njit, overload) JONES_NOT_PRESENT = 0 @@ -418,8 +419,12 @@ def predict_vis(time_index, antenna1, antenna2, dde1_jones=None, source_coh=None, dde2_jones=None, die1_jones=None, base_vis=None, die2_jones=None): return predict_vis_impl(time_index, antenna1, antenna2, - dde1_jones=dde1_jones, source_coh=source_coh, dde2_jones=dde2_jones, - die1_jones=die1_jones, base_vis=base_vis, die2_jones=die2_jones) + dde1_jones=dde1_jones, + source_coh=source_coh, + dde2_jones=dde2_jones, + die1_jones=die1_jones, + base_vis=base_vis, + die2_jones=die2_jones) def predict_vis_impl(time_index, antenna1, antenna2,