@@ -852,7 +852,7 @@ def arl_predict_function_ffi(lowconfig, vis_in, img, vis_out, blockvis_out, cind
852852
853853# print("--------------------> predict_serial Phasecentre : ", py_visin.phasecentre.ra.deg, py_visin.phasecentre.dec.deg)
854854
855- res = predict_function (py_visin , c_img , vis_slices = 51 , context = 'wstack' )
855+ res = predict_serial (py_visin , c_img , vis_slices = 51 , context = 'wstack' )
856856# print("--------------------> predict_serial sizeof(py_visin.data), sizeof(res.data)", sys.getsizeof(py_visin.data[:]), sys.getsizeof(res.data[:]))
857857# print("--------------------> predict_serial cindex", type(res.cindex), type(res.cindex[0]), len(res.cindex))
858858# print("--------------------> predict_serial sys.getsizeof(res.cindex)", sys.getsizeof(res.cindex))
@@ -895,7 +895,7 @@ def arl_predict_function_blockvis_ffi(lowconfig, vis_in, img):
895895# export_blockvisibility_to_hdf5(py_visin, '%s/py_visin.hdf'%(results_dir))
896896# export_image_to_hdf5(c_img, '%s/gleam_model_c_img.hdf'%(results_dir))
897897
898- py_blockvis = predict_function (py_visin , c_img , vis_slices = 51 , context = 'wstack' )
898+ py_blockvis = predict_serial (py_visin , c_img , vis_slices = 51 , context = 'wstack' )
899899
900900# export_blockvisibility_to_hdf5(py_blockvis, '%s/py_blockvis.hdf'%(results_dir))
901901
@@ -943,7 +943,7 @@ def arl_predict_function_ical_ffi(lowconfig, vis_inout, img, blockvis_inout, cin
943943
944944 c_img = cImage (img )
945945
946- res = predict_function (py_visinout , c_img , vis_slices = vis_slices , context = 'wstack' ,
946+ res = predict_serial (py_visinout , c_img , vis_slices = vis_slices , context = 'wstack' ,
947947 timeslice = 'auto' , algorithm = 'hogbom' , niter = 1000 , fractional_threshold = 0.1 ,
948948 threshold = 0.1 , nmajor = 5 , gain = 0.1 , first_selfcal = 1 , global_solution = False )
949949# print("####################> arl_predict_function_ical: ", type(res))
@@ -987,7 +987,7 @@ def arl_invert_function_ffi(lowconfig, vis_in, img, vis_slices, img_dirty):
987987# export_image_to_hdf5(py_img, '%s/model_invert_function.hdf'%(results_dir))
988988# print("arl_invert_function vis_slices: ", vis_slices)
989989
990- dirty , sumwt = invert_function (py_visin , py_img , vis_slices = vis_slices , dopsf = False , context = 'wstack' )
990+ dirty , sumwt = invert_serial (py_visin , py_img , vis_slices = vis_slices , dopsf = False , context = 'wstack' )
991991 nchan , npol , ny , nx = dirty .data .shape
992992
993993# dirty.wcs.wcs.crval[0] = py_visin.phasecentre.ra.deg
@@ -1025,7 +1025,7 @@ def arl_invert_function_blockvis_ffi(lowconfig, vis_in, img, vis_slices, img_dir
10251025# export_blockvisibility_to_hdf5(py_visin, '%s/py_visin_invert_function.hdf'%(results_dir))
10261026# export_image_to_hdf5(py_img, '%s/model_invert_function.hdf'%(results_dir))
10271027# print("arl_invert_function vis_slices: ", vis_slices)
1028- dirty , sumwt = invert_function (py_visin , py_img , vis_slices = vis_slices , dopsf = False , context = 'wstack' )
1028+ dirty , sumwt = invert_serial (py_visin , py_img , vis_slices = vis_slices , dopsf = False , context = 'wstack' )
10291029 nchan , npol , ny , nx = dirty .data .shape
10301030
10311031# dirty.wcs.wcs.crval[0] = py_visin.phasecentre.ra.deg
@@ -1060,7 +1060,7 @@ def arl_invert_function_ical_ffi(lowconfig, vis_in, img, vis_slices, img_dirty):
10601060 py_img = cImage (img )
10611061 py_img_dirty = cImage (img_dirty , new = True )
10621062# Calling invert_finction()
1063- dirty , sumwt = invert_function (py_visin , py_img , vis_slices = vis_slices , context = 'wstack' ,
1063+ dirty , sumwt = invert_serial (py_visin , py_img , vis_slices = vis_slices , context = 'wstack' ,
10641064 timeslice = 'auto' , algorithm = 'hogbom' , niter = 1000 , fractional_threshold = 0.1 ,
10651065 threshold = 0.1 , nmajor = 5 , gain = 0.1 , first_selfcal = 1 ,global_solution = False )
10661066
@@ -1100,7 +1100,7 @@ def arl_invert_function_psf_ffi(lowconfig, vis_in, img, vis_slices, img_psf):
11001100 py_img = cImage (img )
11011101 py_img_psf = cImage (img_psf , new = True )
11021102# Calling invert_finction()
1103- psf , sumwt = invert_function (py_visin , py_img , vis_slices = vis_slices , dopsf = True , context = 'wstack' ,
1103+ psf , sumwt = invert_serial (py_visin , py_img , vis_slices = vis_slices , dopsf = True , context = 'wstack' ,
11041104 timeslice = 'auto' , algorithm = 'hogbom' , niter = 1000 , fractional_threshold = 0.1 ,
11051105 threshold = 0.1 , nmajor = 5 , gain = 0.1 , first_selfcal = 1 ,global_solution = False )
11061106
0 commit comments