Build: #103 failed Changes by Srikrishna Sekhar
Code commits
casa6
-
Srikrishna Sekhar ddccf24a7b02382b59f049424eb67a77f0794840
Pull request #898: CAS-13901
Merge in CASA/casa6 from CAS-13901 to master
* commit '11d23f30ace690f7459f16e7fcfb288a8e5998ca':
CAS-13901: Remove asp warnings from XML
CAS-13901 : Skip asp tests on Mac darwin
CAS-13901 : Remove asp niter check in test_deconvolve
Enabled previously skipped tests 5, 53, 68, 71 87, and 90 because they are passing again. Added skip to tests 72 and 91 as both of them crash on macOS and seem to cause interferences on other tests as mentioned in comments in the script. Note that test_onefield_asp still fails with a numerical difference when run on macOS ARM hardware. Increased the timeout to run tests deconvolve and sdintimaging, needed by Bamboo on old RHEL7 cvpost nodes.
CAS-13901 : Change gain to 0.1 in asp test
CAS-13901 : Fix asp tests in deconvolve tests
CAS-13901: Fix bool definition
CAS-13901 : Fix asp behavior in deconvolve
CAS-13901 : Enable asp plumbing in deconvolve -
Srikrishna Sekhar 11d23f30ace690f7459f16e7fcfb288a8e5998ca m
Merge remote-tracking branch 'origin/master' into CAS-13901
Resolved minor merge conflict in tclean.xml -
Srikrishna Sekhar 6f4c2498c76c1f351c528cd0013a0e349f08e540 m
Merge remote-tracking branch 'origin/master' into CAS-13901
-
Srikrishna Sekhar e39af231f362cae3b96da88cc6496340cca55fa8 m
CAS-13901: Remove asp warnings from XML
Removed warnings about ASP not working in deconvolve.xml, and references
to it being an experimental algorithm in tclean.xml -
Srikrishna Sekhar 611cdec05641c68939d271ecd59f66c76053747d m
CAS-13901 : Skip asp tests on Mac darwin
Given the difficulty in nailing down the niter criterion on Mac M1, it
was decided to continue skipping the tests on Mac and add a disclaimer
to the documentation about running asp on Mac.
The long term solution is to find a more stable minimizer than LBFGS
that yields the same numbers on different platforms. -
Srikrishna Sekhar a391bb82f4fab88cb83d6f09719b13099045d5a9 m
Merge remote-tracking branch 'origin/master' into CAS-13901
-
Srikrishna Sekhar 5bc4a3a7b58b6bd8d06f556cd4ef93e7a32665e7 m
CAS-13901 : Remove asp niter check in test_deconvolve
The niter passing criterion has been removed from the asp test within
test_task_deconvolve. This brings it in line with the same test within
test_task_tclean as well.
The issue is that the LBFGS minimizer within the asp code is known to
follow different paths on different system platforms, which can
potentially explain the discrepancy in the niter accumulated on Linux vs
Mac.
Removing this test allows it to be run on a Mac (rather than skipped),
and given that the final image values are within tolerance on all
systems it indicates that the images are scientifically equivalent
despite the niter being different. -
smcastro <smcastro@users.noreply.github.com> bc1d06d17a821857c727f8e235ccbbd6110842de m
Enabled previously skipped tests 5, 53, 68, 71 87, and 90 because they are passing again. Added skip to tests 72 and 91 as both of them crash on macOS and seem to cause interferences on other tests as mentioned in comments in the script. Note that test_onefield_asp still fails with a numerical difference when run on macOS ARM hardware. Increased the timeout to run tests deconvolve and sdintimaging, needed by Bamboo on old RHEL7 cvpost nodes.
-
Srikrishna Sekhar 545f519b3313db5ac2f97f0052ec6134890088cc m
Merge remote-tracking branch 'origin/master' into CAS-13901
-
Srikrishna Sekhar f871f24268c442f19f5e59109635e603574030dc m
CAS-13901 : Change gain to 0.1 in asp test
Reduced gain even further to 0.1 (from 0.2) in the test_onefield_asp
test to fix the issue with the test failing on Intel Macs. The test
passing criteria have been appropriately updated.
Preliminary tests from Sandra indicate that this has worked. -
Srikrishna Sekhar ae625d22220b3c2a25598dbdb8bc3d58a23ef548 m
CAS-13901 : Fix asp tests in deconvolve tests
Edited the passing thresholds for the asp tests in test_task_deconvolve.
Used a smalled gain value (gain=0.2) similar to test_task_tclean, and
the passing criterion are based on the values for a single major cycle
in test_task_tclean.
Also enabled asp testing on Darwin - with a lower gain it is expected to
be more stable across different systems. -
Srikrishna Sekhar d14660ac320b46fd926d35a61760b96de5cd08ff m
Merge remote-tracking branch 'origin/master' into CAS-13901
-
Srikrishna Sekhar 104806777c670bc7eede1d42e7b11423a0f8efca m
CAS-13901: Fix bool definition
Fixed definition of isSingle in SynthesisDeconvolver.cc. The previous
commit erroneously commented out the initial definition. -
Srikrishna Sekhar 8177cfc4e4e449db2d755965fe7324edec0f8603 m
CAS-13901 : Fix asp behavior in deconvolve
This change forces asp to always generate per-plane scales, regardless
of the input specmode. When running asp on a cube from within
deconvolve, specmode defaults to "mfs" which would cause asp to generate
scales for the first plane, and re-use it for all subsequent planes of
the cube.
This is not right, and also diverges from the behavior in tclean. This
change fixes that.
There is also a minor fix in an output log message of AspMatrixCleaner. -
Srikrishna Sekhar 523dab0dc513193170af0212eac910ba73c97151 m
CAS-13901 : Enable asp plumbing in deconvolve
The asp deconvolver was disabled in task_deconvolve. This set of changes
just uncomments the relevant lines to re-enable it.