disentangle the progressbar from the backend; test all combinations

Author: mkolopanis

pyuvsim/tests/test_profiler.py

@@ -24,10 +24,11 @@ def profdata_dir_setup(tmpdir):
     return outpath
 
 
-@pytest.mark.parametrize("backend", ["progsteps", "tqdm", "send_recv"])
+@pytest.mark.parametrize("backend", ["rma", "messaging", "send_recv"])
+@pytest.mark.parametrize("progbar", ["progsteps", "tqdm"])
 @pytest.mark.parallel(2)
-def test_profiler(tmpdir, backend):
-    if backend != "progsteps":
+def test_profiler(tmpdir, backend, progbar):
+    if progbar == "tqdm":
         pytest.importorskip("tqdm")
     line_profiler = pytest.importorskip('line_profiler')
     outpath = profdata_dir_setup(tmpdir)
@@ -37,7 +38,9 @@ def test_profiler(tmpdir, backend):
     with uvtest.check_warnings(UserWarning, match='Profiler already set'):
         pyuvsim.profiling.set_profiler(outfile_prefix=testprof_fname[:-4], dump_raw=True)
     param_filename = os.path.join(SIM_DATA_PATH, 'test_config', 'param_1time_1src_testcat.yaml')
-    pyuvsim.uvsim.run_uvsim(param_filename, return_uv=True, backend=backend)
+    pyuvsim.uvsim.run_uvsim(
+        param_filename, return_uv=True, backend=backend, progbar=progbar
+    )
     if pyuvsim.mpi.rank == 0:
         time_profiler = pyuvsim.profiling.get_profiler()
         time_profiler.disable_by_count()

pyuvsim/tests/test_run.py

@@ -77,15 +77,16 @@ def test_run_paramfile_uvsim(goto_tempdir, paramfile):
 
 @pytest.mark.filterwarnings("ignore:Input ra and dec parameters are being used instead")
 @pytest.mark.parametrize('model', ['monopole', 'cosza', 'quaddome', 'monopole-nonflat'])
-@pytest.mark.parametrize("backend", ["progsteps", "tqdm", "send_recv"])
+@pytest.mark.parametrize("backend", ["rma", "messaging", "send_recv"])
+@pytest.mark.parametrize("progbar", ["progsteps", "tqdm"])
 @pytest.mark.parallel(2)
-def test_analytic_diffuse(model, tmpdir, backend):
+def test_analytic_diffuse(model, tmpdir, backend, progbar):
     # Generate the given model and simulate for a few baselines.
     # Import from analytic_diffuse  (consider moving to rasg_affiliates?)
     pytest.importorskip('analytic_diffuse')
     pytest.importorskip('astropy_healpix')
     import analytic_diffuse
-    if backend != "progsteps":
+    if progbar == "tqdm":
         pytest.importorskip("tqdm")
 
     modname = model
@@ -134,7 +135,9 @@ def test_analytic_diffuse(model, tmpdir, backend):
     with open(obspar_path, 'w') as ofile:
         yaml.dump(obspar, ofile, default_flow_style=False)
 
-    uv_out = pyuvsim.run_uvsim(obspar_path, return_uv=True, backend=backend)
+    uv_out = pyuvsim.run_uvsim(
+        obspar_path, return_uv=True, backend=backend, progbar=progbar
+    )
     if pyuvsim.mpi.rank == 0:
         # Convert from Jy to K sr
         dat = uv_out.data_array[:, 0, 0, 0] * jy_to_ksr(uv_out.freq_array[0, 0]).value
@@ -201,12 +204,13 @@ def test_run_gleam_uvsim(spectral_type):
 @pytest.mark.parametrize(
     "spectral_type",
     ["subband", "spectral_index"])
-@pytest.mark.parametrize("backend", ["progsteps", "tqdm", "send_recv"])
+@pytest.mark.parametrize("backend", ["rma", "messaging", "send_recv"])
+@pytest.mark.parametrize("progbar", ["progsteps", "tqdm"])
 @pytest.mark.parallel(2)
-def test_zenith_spectral_sim(spectral_type, tmpdir, backend):
+def test_zenith_spectral_sim(spectral_type, tmpdir, backend, progbar):
     # Make a power law source at zenith in three ways.
     # Confirm that simulated visibilities match expectation.
-    if backend in ["tqdm", "send_recv"]:
+    if progbar == "tqdm":
         pytest.importorskip("tqdm")
 
     params = pyuvsim.simsetup._config_str_to_dict(
@@ -242,7 +246,7 @@ def test_zenith_spectral_sim(spectral_type, tmpdir, backend):
     params['time']['start_time'] = kwds['time']
     params['select'] = {'antenna_nums' : [1, 2]}
 
-    uv_out = pyuvsim.run_uvsim(params, return_uv=True, backend=backend)
+    uv_out = pyuvsim.run_uvsim(params, return_uv=True, backend=backend, progbar=progbar)
     if pyuvsim.mpi.rank == 0:
         for ii in range(uv_out.Nbls):
             assert np.allclose(uv_out.data_array[ii, 0, :, 0], spectrum / 2)
@@ -287,8 +291,8 @@ def test_sim_on_moon():
         assert uv_out.extra_keywords['world'] == 'moon'
 
 
-@pytest.mark.parametrize("backend", ["tqdm", "send_recv"])
-def test_npu_error_tqdm(backend):
+@pytest.mark.parametrize("backend", ["messaging", "send_recv"])
+def test_npu_error_backends(backend):
     pytest.importorskip("tqdm")
     params = pyuvsim.simsetup._config_str_to_dict(
         os.path.join(SIM_DATA_PATH, 'test_config', 'param_1time_1src_testcat.yaml')

pyuvsim/tests/test_uvsim.py

@@ -904,21 +904,27 @@ def test_tqdm_import_error():
         return
     except ImportError:
         with pytest.raises(ImportError, match="The tqdm module must be"):
-            pyuvsim.uvsim._run_uvsim_tqdm(
-                None, None, None, None, None, None, None, None, None,
-            )
+            pyuvsim.uvsim._get_pbar("tqdm", None, None)
 
 
-def test_send_recv_import_error():
+def test_progbar_error_get_pbar():
     pytest.importorskip('mpi4py')
-    try:
-        import tqdm  # noqa
-        return
-    except ImportError:
-        with pytest.raises(ImportError, match="The tqdm module must be"):
-            pyuvsim.uvsim._run_uvsim_send_recv(
-                None, None, None, None, None, None, None, None, None, None, None,
-            )
+    with pytest.raises(ValueError, match="The progbar keyword must be one of "):
+        pyuvsim.uvsim._get_pbar("foo", None, None)
+
+
+def test_progbar_error_uvdata_uvsim():
+    pytest.importorskip('mpi4py')
+    with pytest.raises(ValueError, match="The progbar keyword must be one of "):
+        pyuvsim.run_uvdata_uvsim(
+            None, None, None, None, False, backend="rma", progbar="Foo"
+        )
+
+
+def test_progbar_error_run_uvsim():
+    pytest.importorskip('mpi4py')
+    with pytest.raises(ValueError, match="The progbar keyword must be one of "):
+        pyuvsim.run_uvsim(None, False, None, backend="rma", progbar="Foo")
 
 
 def test_backend_error_uvdata_uvsim():