diff --git a/dsa2000_cal/dsa2000_cal/adapter/tests/test_from_casa_ms.py b/dsa2000_cal/dsa2000_cal/adapter/tests/test_from_casa_ms.py index cc431b2d..93dd5587 100644 --- a/dsa2000_cal/dsa2000_cal/adapter/tests/test_from_casa_ms.py +++ b/dsa2000_cal/dsa2000_cal/adapter/tests/test_from_casa_ms.py @@ -6,7 +6,7 @@ from dsa2000_cal.adapter.from_casa_ms import transfer_from_casa -def test_transfer_from_casa(tmp_path): +def _test_transfer_from_casa(tmp_path): ms = transfer_from_casa(ms_folder=str(tmp_path / 'new_ms_folder'), casa_ms='visibilities.ms') print(ms) diff --git a/dsa2000_cal/dsa2000_cal/adapter/tests/test_utils.py b/dsa2000_cal/dsa2000_cal/adapter/tests/test_utils.py index a65ede92..f67564d5 100644 --- a/dsa2000_cal/dsa2000_cal/adapter/tests/test_utils.py +++ b/dsa2000_cal/dsa2000_cal/adapter/tests/test_utils.py @@ -14,7 +14,7 @@ def test_from_casa_corrs_to_linear(): INV_CASA_CORR_TYPES["YX"], INV_CASA_CORR_TYPES["YY"] ] - assert jnp.alltrue(from_casa_corrs_to_linear(casa_coherencies, corrs) == jnp.asarray([1, 2, 3, 4])) + assert jnp.all(from_casa_corrs_to_linear(casa_coherencies, corrs) == jnp.asarray([1, 2, 3, 4])) # Perm corrs = [ @@ -23,14 +23,14 @@ def test_from_casa_corrs_to_linear(): INV_CASA_CORR_TYPES["XY"], INV_CASA_CORR_TYPES["YX"] ] - assert jnp.alltrue(from_casa_corrs_to_linear(casa_coherencies, corrs) == jnp.asarray([1, 3, 4, 2])) + assert jnp.all(from_casa_corrs_to_linear(casa_coherencies, corrs) == jnp.asarray([1, 3, 4, 2])) # Partial corrs = [ INV_CASA_CORR_TYPES["XX"], INV_CASA_CORR_TYPES["XY"], ] - assert jnp.alltrue(from_casa_corrs_to_linear(casa_coherencies[:2], corrs) == jnp.asarray([1, 2, 0, 0])) + assert jnp.all(from_casa_corrs_to_linear(casa_coherencies[:2], corrs) == jnp.asarray([1, 2, 0, 0])) # Circular to Linear casa_coherencies = jnp.asarray([1, 2, 3, 4]) @@ -68,7 +68,7 @@ def test_from_linear_to_casa_corrs(): INV_CASA_CORR_TYPES["YX"], INV_CASA_CORR_TYPES["YY"] ] - assert jnp.alltrue(from_linear_to_casa_corrs(linear_coherencies, corrs) == jnp.asarray([1, 2, 3, 4])) + assert jnp.all(from_linear_to_casa_corrs(linear_coherencies, corrs) == jnp.asarray([1, 2, 3, 4])) # Perm corrs = [ @@ -77,14 +77,14 @@ def test_from_linear_to_casa_corrs(): INV_CASA_CORR_TYPES["XY"], INV_CASA_CORR_TYPES["YX"] ] - assert jnp.alltrue(from_linear_to_casa_corrs(linear_coherencies, corrs) == jnp.asarray([1, 4, 2, 3])) + assert jnp.all(from_linear_to_casa_corrs(linear_coherencies, corrs) == jnp.asarray([1, 4, 2, 3])) # Partial corrs = [ INV_CASA_CORR_TYPES["XX"], INV_CASA_CORR_TYPES["XY"], ] - assert jnp.alltrue(from_linear_to_casa_corrs(linear_coherencies, corrs) == jnp.asarray([1, 2])) + assert jnp.all(from_linear_to_casa_corrs(linear_coherencies, corrs) == jnp.asarray([1, 2])) # Circular to Linear linear_coherencies = jnp.asarray([1, 2, 3, 4]) diff --git a/dsa2000_cal/dsa2000_cal/common/tests/test_vec_utils.py b/dsa2000_cal/dsa2000_cal/common/tests/test_vec_utils.py index 26f91cf6..84c10f43 100644 --- a/dsa2000_cal/dsa2000_cal/common/tests/test_vec_utils.py +++ b/dsa2000_cal/dsa2000_cal/common/tests/test_vec_utils.py @@ -43,7 +43,7 @@ def f(a, b, c): p2 = kron_product(a, b, c) - assert np.alltrue(p2 == p1) + assert np.all(p2 == p1) a1 = jax.jit(f).lower(a, b, c).compile().cost_analysis()[0] a2 = jax.jit(kron_product).lower(a, b, c).compile().cost_analysis()[0]