Skip to content
This repository was archived by the owner on Oct 16, 2024. It is now read-only.

Commit 177341c

Browse files
committed
COMPASS v5.5.0 :
- Add cuda stream in all centroiders - Replace tqdm with rich - Change C++ ProgressBar - Remove cosmic conan repository - Unzip SAXODmData.zip
1 parent 4407b31 commit 177341c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+119527
-344
lines changed

CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
# COMPASS Change logs
22

33
- [COMPASS Change logs](#compass-change-logs)
4+
- [Release v5.5.0 :](#release-v550-)
45
- [Release v5.4.4 :](#release-v544-)
56
- [Release v5.4.3 :](#release-v543-)
67
- [Release v5.4.2 :](#release-v542-)
78
- [Release v5.4.1 :](#release-v541-)
9+
- [Release v5.4.0](#release-v540)
810
- [Release v5.3.0](#release-v530)
911
- [Release v5.2.1](#release-v521)
1012
- [Release v5.2](#release-v52)
@@ -26,6 +28,14 @@
2628
- [Release v2.0](#release-v20)
2729
- [Release v1.1](#release-v11)
2830

31+
## Release v5.5.0 :
32+
33+
- Add cuda stream in all centroiders
34+
- Replace tqdm with rich
35+
- Change C++ ProgressBar
36+
- Remove cosmic conan repository
37+
- Unzip SAXODmData.zip
38+
2939
## Release v5.4.4 :
3040

3141
- Debug KL2V when DM has unseen actuators
@@ -46,6 +56,16 @@
4656
- Coronagraph hotfix
4757
- Update SHESHA LICENSE to LGPL
4858

59+
## Release v5.4.0
60+
61+
- Add new GPU-based coronagraph module providing implementation of perfect coronagraph and APLC-like
62+
- Add new parameters *p_wfs.kernconv4imat* to enable/disable the feature of using a kernel convolution on the SH spots during interaction matrix computation. Default value is True to keep the same behaviour as previous versions of COMPASS
63+
- Add new TwoStagesManager class in shesha supervisors: this class shows an example of how to handle 2 stages AO systems with COMPASS.
64+
- Add cupy interface for carmaWrap.CarmaObj object
65+
- Add support for CUDA 12
66+
- Add pySide2 support to have another library available to handle GUI
67+
- Minor fixes and improvements
68+
4969
## Release v5.3.0
5070

5171
- **New feature**: User-defined phase screens circular buffer in the telescope. Allows to put a cube of phase screens as an additional input of the telescope.

data/dm-data/Boston24x24.fits

Lines changed: 35294 additions & 0 deletions
Large diffs are not rendered by default.

data/dm-data/Boston32x32.fits

Lines changed: 34341 additions & 0 deletions
Large diffs are not rendered by default.

data/dm-data/SAXODmData.zip

-16.7 MB
Binary file not shown.

data/dm-data/SAXO_HODM.fits

Lines changed: 49573 additions & 0 deletions
Large diffs are not rendered by default.

environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
- scipy
1515
- pytables
1616
- tabulate
17-
- tqdm
17+
- rich
1818
- compass
1919
- coverage
2020
- pytest-cov

guardians/groot.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import time
1010
import sys
1111
import os
12-
from tqdm import tqdm
12+
from rich.progress import track
1313

1414
from guardians import gamora
1515
from guardians import drax, starlord
@@ -577,7 +577,7 @@ def compute_Calias(filename, slopes_space=False, modal=True, npts=3):
577577
# Ca = Ca * scale / 5
578578
Ca = np.zeros((2 * nsub, 2 * nsub))
579579
coeff = simpson_coeff(npts)
580-
# for k in tqdm(range(npts)):
580+
# for k in track(range(npts)):
581581
# weight = (coeff[k:] * coeff[:npts - k]).sum()
582582
# Ca += compute_Calias_element_XX(xx, yy, fc, d, nsub, tabx, taby, yoff=k /
583583
# (npts - 1)) * weight
@@ -592,8 +592,8 @@ def compute_Calias(filename, slopes_space=False, modal=True, npts=3):
592592
h = d / (npts - 1)
593593
else:
594594
h = 1
595-
for k in tqdm(range(npts)):
596-
for p in tqdm(range(npts)):
595+
for k in track(range(npts)):
596+
for p in track(range(npts)):
597597
Ca += (compute_Calias_element_XX(xx, yy, fc, d, nsub, tabx, taby,
598598
yoff=(k - p) * h) * coeff[k] * coeff[p])
599599
Ca += (compute_Calias_element_YY(xx, yy, fc, d, nsub, tabx, taby,

guardians/scripts/psf_error.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import matplotlib.pyplot as plt
33
from guardians import groot, gamora, drax
44
import h5py
5-
from tqdm import tqdm
5+
from rich.progress import track
66

77
filename = "/home/fferreira/Data/roket_8m_nssp40_dir135_speed10.h5"
88
spup = drax.get_pup(filename)
@@ -25,7 +25,7 @@
2525
EE10 = []
2626
EE20 = []
2727

28-
for s in tqdm(speed):
28+
for s in track(speed):
2929
Cab = groot.compute_Cerr(filename, speed=np.array([s], dtype=np.float32))
3030
otftel, otf2, psfi, gpu = gamora.psf_rec_Vii(filename, fitting=False,
3131
cov=(Cee + Cab).astype(np.float32))

report_E2E.md

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
# E2E Test Report
22

3-
*Report generated on 29-Jun-2023 13:30:31 by checkCompass.sh*
3+
*Report generated on 29-Jun-2023 14:22:12 by checkCompass.sh*
44

55
[Unit Tests report](report_unit_test.html)
66

77
## Summary
88

9-
| | Test name | Init | SR@100iter | T Init | T Loop |
10-
|---:|:-------------------------------|:-------|-------------:|---------:|----------:|
11-
| 0 | test_custom_dm.py | True | 0.702249 | 0 | 0.562334 |
12-
| 1 | test_custom_dm_diam_dm.py | True | 0.764023 | 0 | 0.508652 |
13-
| 2 | test_custom_dm_diam_dm_proj.py | True | 0.744967 | 0 | 0.514263 |
14-
| 3 | test_custom_dm_pitch.py | True | 0.76632 | 0 | 0.504912 |
15-
| 4 | test_pyr3_maskedpix.py | True | 0.753424 | 0 | 0.186905 |
16-
| 5 | test_pyr_ELTpup.py | True | 0.316631 | 0 | 0.187416 |
17-
| 6 | test_pyr_base.py | True | 0.642596 | 0 | 0.192299 |
18-
| 7 | test_sh_ELTpup.py | True | 0.585883 | 0 | 0.0531386 |
19-
| 8 | test_sh_base.py | True | 0.716687 | 0 | 0.0544886 |
20-
| 9 | test_sh_bpcog.py | True | 0.712724 | 0 | 0.0586089 |
21-
| 10 | test_sh_control_klbasis.py | True | 0.731121 | 0 | 0.0625746 |
22-
| 11 | test_sh_cured.py | True | 0.810158 | 0 | 0.101619 |
23-
| 12 | test_sh_generic.py | True | 0.139743 | 0 | 0.0572494 |
24-
| 13 | test_sh_generic_linear.py | True | 0.139743 | 0 | 0.075061 |
25-
| 14 | test_sh_geo.py | True | 0.850649 | 0 | 0.0514932 |
26-
| 15 | test_sh_influBessel.py | True | 0.305875 | 0 | 0.0580662 |
27-
| 16 | test_sh_influBlacknutt.py | True | 0.722949 | 0 | 0.0567347 |
28-
| 17 | test_sh_influGaussian.py | True | 0.720098 | 0 | 0.0566002 |
29-
| 18 | test_sh_influRadialSchwartz.py | True | 0.724838 | 0 | 0.0580891 |
30-
| 19 | test_sh_influSquareSchwartz.py | True | 0.71585 | 0 | 0.0642535 |
31-
| 20 | test_sh_kl.py | True | 0.696612 | 0 | 0.05186 |
32-
| 21 | test_sh_lgs_corr.py | True | 0.409052 | 0 | 0.0728169 |
33-
| 22 | test_sh_lgs_wcog.py | True | 0.693467 | 0 | 0.0664804 |
34-
| 23 | test_sh_modopti.py | True | 0.661028 | 0 | 0.0549769 |
35-
| 24 | test_sh_mv.py | True | 0.750676 | 0 | 0.0579832 |
36-
| 25 | test_sh_tcog.py | True | 0.716788 | 0 | 0.0563581 |
37-
| 26 | test_sh_wcog.py | True | 0.662428 | 0 | 0.0561456 |
9+
| | Test name | Init | SR@100iter | T Init | T Loop |
10+
|---:|:-------------------------------|:-------|:--------------------|---------:|----------:|
11+
| 0 | test_custom_dm.py | False | N/A | 0 | 0 |
12+
| 1 | test_custom_dm_diam_dm.py | False | N/A | 0 | 0 |
13+
| 2 | test_custom_dm_diam_dm_proj.py | False | N/A | 0 | 0 |
14+
| 3 | test_custom_dm_pitch.py | False | N/A | 0 | 0 |
15+
| 4 | test_pyr3_maskedpix.py | True | 0.7534234523773193 | 0 | 0.286265 |
16+
| 5 | test_pyr_ELTpup.py | True | 0.3166523575782776 | 0 | 0.283861 |
17+
| 6 | test_pyr_base.py | True | 0.6425950527191162 | 0 | 0.261802 |
18+
| 7 | test_sh_ELTpup.py | True | 0.5852528810501099 | 0 | 0.0957167 |
19+
| 8 | test_sh_base.py | True | 0.7167598605155945 | 0 | 0.102493 |
20+
| 9 | test_sh_bpcog.py | True | 0.7127622961997986 | 0 | 0.10753 |
21+
| 10 | test_sh_control_klbasis.py | True | 0.7312788963317871 | 0 | 0.121072 |
22+
| 11 | test_sh_cured.py | True | 0.8100955486297607 | 0 | 0.171471 |
23+
| 12 | test_sh_generic.py | True | 0.13974711298942566 | 0 | 0.104276 |
24+
| 13 | test_sh_generic_linear.py | True | 0.13974711298942566 | 0 | 0.140521 |
25+
| 14 | test_sh_geo.py | True | 0.8506491780281067 | 0 | 0.0872787 |
26+
| 15 | test_sh_influBessel.py | True | 0.30366313457489014 | 0 | 0.100523 |
27+
| 16 | test_sh_influBlacknutt.py | True | 0.7229189276695251 | 0 | 0.100631 |
28+
| 17 | test_sh_influGaussian.py | True | 0.7200560569763184 | 0 | 0.0975486 |
29+
| 18 | test_sh_influRadialSchwartz.py | True | 0.7247004508972168 | 0 | 0.0985261 |
30+
| 19 | test_sh_influSquareSchwartz.py | True | 0.7160175442695618 | 0 | 0.105418 |
31+
| 20 | test_sh_kl.py | False | N/A | 0 | 0 |
32+
| 21 | test_sh_lgs_corr.py | True | 0.40918871760368347 | 0 | 0.122623 |
33+
| 22 | test_sh_lgs_wcog.py | True | 0.6936307549476624 | 0 | 0.11184 |
34+
| 23 | test_sh_modopti.py | True | 0.6610769629478455 | 0 | 0.0949102 |
35+
| 24 | test_sh_mv.py | True | 0.7506710290908813 | 0 | 0.101989 |
36+
| 25 | test_sh_tcog.py | True | 0.7168002128601074 | 0 | 0.0941432 |
37+
| 26 | test_sh_wcog.py | True | 0.6626441478729248 | 0 | 0.201505 |

shesha/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
import subprocess, sys
88

9-
__version__ = "5.4.4"
9+
__version__ = "5.5.0"
1010

11-
__api_version__ = "5.4.4"
11+
__api_version__ = "5.5.0"
1212

1313
def check_shesha_compass_versions():
1414
compass_package = subprocess.check_output('conda list compass | tail -n1',shell=True).decode(

0 commit comments

Comments
 (0)