Skip to content

merge upstream #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
vivianmiranda wants to merge 134 commits into
base: main
Choose a base branch
from
Draft

merge upstream #12

Changes from all commits
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
0a95d1f
fixing label
JerreYjz Aug 28, 2025
ee98cac
typo
JerreYjz Sep 4, 2025
0529189
typo
JerreYjz Sep 4, 2025
c475575
typo
JerreYjz Sep 4, 2025
5729f63
sn
JerreYjz Sep 11, 2025
fbc7ce9
Merge branch 'CosmoLike:main' into main
vivianmiranda Sep 12, 2025
edf095f
omk taka
JerreYjz Sep 15, 2025
5f1073d
omk taka
JerreYjz Sep 15, 2025
d560030
typo
JerreYjz Oct 10, 2025
838966a
Adding fastMPS
Dec 31, 2025
bf0ec5d
changed name emul_mps
vivianmiranda Jan 1, 2026
04ed1fa
changed name emulmps
vivianmiranda Jan 1, 2026
f4ddc31
Updated metadata
Jan 2, 2026
475bb73
Delete symbolic tensorflow files
vivianmiranda Jan 2, 2026
9c0f9ed
Add nonlinear corrections with symbolic halofit
Jan 2, 2026
fb68c5b
extend baosn to high z
JerreYjz Jan 2, 2026
36e21ac
extend baosn to high z
JerreYjz Jan 2, 2026
7cf55eb
Update
vivianmiranda Jan 2, 2026
6766969
Update to store lin and nl and use nonlinear flag
Jan 2, 2026
e1cbfb2
extend baosn to high z
JerreYjz Jan 3, 2026
8a2369c
extend baosn to high z
JerreYjz Jan 3, 2026
89209be
Update README.md
vivianmiranda Jan 3, 2026
68d9c82
Update README.md
vivianmiranda Jan 3, 2026
9aa0b52
Update
vivianmiranda Jan 3, 2026
02a2007
Made the default Emulator to be just EH
vivianmiranda Jan 3, 2026
856e90b
Update README.md
JerreYjz Jan 3, 2026
08e4219
Update README.md
JerreYjz Jan 3, 2026
8ab61d6
more changes in the NZ and Nk's
vivianmiranda Jan 3, 2026
a8ee19d
Merge branch 'main' of github.com:SBU-COSMOLIKE/emulators_code
vivianmiranda Jan 3, 2026
27b35b2
numpy the halofit calculation
vivianmiranda Jan 4, 2026
378bf99
small tweaks
vivianmiranda Jan 4, 2026
f4ca024
added an abs inside sqrt on C_emulated_vec to avoid NAN in some cosmo…
vivianmiranda Jan 4, 2026
7ea4fa2
complete revamp by transfer functions from linear_new to linear plus …
vivianmiranda Jan 4, 2026
9dcd01f
Deleted more unwanted stuff on syrenhalofit
vivianmiranda Jan 4, 2026
8809cfd
Deleted more unwanted stuff on syrenhalofit
vivianmiranda Jan 4, 2026
7da3322
Implement 'use_syren' flag to use approximate MPS without emulator co…
Jan 5, 2026
303ce08
Update
vivianmiranda Jan 6, 2026
3db0471
remove some old code and set use_syren: True by default
vivianmiranda Jan 6, 2026
84687e1
Update emulator models and metadata
Jan 6, 2026
b9c2c6c
Improve timing of emulator predictions
Jan 6, 2026
9fc1416
Correct for unit differences
Jan 7, 2026
ba75b59
added cnn to weak lensing emul
evansaraivanov Jan 7, 2026
1542122
Revert "Correct for unit differences"
vivianmiranda Jan 7, 2026
dd7d164
turn off jit for macos compatibility jit_compile=False
vivianmiranda Jan 7, 2026
5c0a5a6
Fixed doing inverse of matrix in the GPU - problems with mac (MPS can…
vivianmiranda Jan 7, 2026
594f8aa
Add patch for emulator unit conversion
Jan 7, 2026
13aeca8
Merge branch 'main' of github.com:SBU-COSMOLIKE/emulators_code
Jan 7, 2026
2232ec2
Add data files for new emulator update
Jan 7, 2026
ebddd82
Fix units problem on MPS emulators w/ syren=False in a way that does …
vivianmiranda Jan 8, 2026
ccdaf59
Updating mps emulator corrections
Jan 14, 2026
4edaac9
Clean up emulmps.py
Jan 14, 2026
7a1d12d
Handle positive w0 values in symbolic P(k) emulator
Feb 2, 2026
ccb4789
scripts for training
evansaraivanov Feb 9, 2026
61b696c
scripts for training
evansaraivanov Feb 9, 2026
3c4e36f
dev emul training
vivianmiranda Feb 10, 2026
162a1d2
Update
vivianmiranda Feb 10, 2026
f90581c
rename files
vivianmiranda Feb 10, 2026
dc92362
Update
vivianmiranda Feb 10, 2026
c34459c
Update dataset generator lensing
vivianmiranda Feb 11, 2026
29ab9e2
Update dataset generator lensing
vivianmiranda Feb 11, 2026
5732e8d
Update dataset generator lensing
vivianmiranda Feb 11, 2026
5effec4
Update dataset generator lensing
vivianmiranda Feb 11, 2026
fd907d7
Update dataset generator lensing
vivianmiranda Feb 11, 2026
76bad78
Update dataset generator lensing
vivianmiranda Feb 11, 2026
c4fb628
Update dataset generator lensing
vivianmiranda Feb 11, 2026
68759ba
Update dataset generator lensing
vivianmiranda Feb 11, 2026
bae6d10
Update dataset generator lensing
vivianmiranda Feb 11, 2026
08ae3ee
Update dataset generator lensing
vivianmiranda Feb 11, 2026
eaa64d8
Update dataset generator lensing
vivianmiranda Feb 11, 2026
3891f92
Update dataset generator lensing
vivianmiranda Feb 11, 2026
3ced5d3
Update dataset generator lensing
vivianmiranda Feb 11, 2026
b0016a3
Update dataset generator lensing
vivianmiranda Feb 11, 2026
78548c1
Update dataset generator lensing
vivianmiranda Feb 11, 2026
7ab26da
Update dataset generator lensing
vivianmiranda Feb 11, 2026
c90cc15
Update dataset generator lensing
vivianmiranda Feb 11, 2026
6e94535
Update dataset generator lensing
vivianmiranda Feb 11, 2026
260c614
Update dataset generator lensing
vivianmiranda Feb 11, 2026
aceb3c3
Update dataset generator lensing
vivianmiranda Feb 11, 2026
9a37efc
Update dataset generator lensing
vivianmiranda Feb 11, 2026
a9d35c8
scripts for training
evansaraivanov Feb 11, 2026
618fb76
scripts for training
evansaraivanov Feb 11, 2026
d45cdf4
small bug fix on ordering (bounds)
vivianmiranda Feb 11, 2026
2a36633
small update dataset lensing
vivianmiranda Feb 11, 2026
7b4eec2
Merge branch 'dev'
vivianmiranda Feb 11, 2026
880cbe0
Added checkpoints
vivianmiranda Feb 12, 2026
f595281
Added checkpoints
vivianmiranda Feb 12, 2026
6bfd4a8
implemented checkpoints for the MPI version
vivianmiranda Feb 12, 2026
88e60c9
implemented checkpoints for the MPI version
vivianmiranda Feb 12, 2026
1d665d8
implemented checkpoints for the MPI version
vivianmiranda Feb 12, 2026
26fe98d
implemented checkpoints for the MPI version
vivianmiranda Feb 12, 2026
dab8c49
small tweak dataset generator lensing
vivianmiranda Feb 13, 2026
93c8e15
scripts for training
evansaraivanov Feb 13, 2026
cd4b266
implement load fromchk - compute data vector lensing
vivianmiranda Feb 13, 2026
9c4d28a
implement load fromchk - compute data vector lensing
vivianmiranda Feb 13, 2026
36243a8
implement load fromchk - compute data vector lensing
vivianmiranda Feb 13, 2026
59d7ab0
compute data vector lensing can now append to chk
vivianmiranda Feb 16, 2026
17f26fd
compute data vector lensing can now append to chk
vivianmiranda Feb 16, 2026
34c1f09
compute data vector lensing can now append to chk
vivianmiranda Feb 16, 2026
b240201
compute data vector lensing can now append to chk
vivianmiranda Feb 16, 2026
abd35d2
Added some checks on RAM
vivianmiranda Feb 16, 2026
baa9eed
Added some checks on RAM
vivianmiranda Feb 16, 2026
964c7e5
deal with RAM shortage
vivianmiranda Feb 16, 2026
635f650
deal with RAM shortage
vivianmiranda Feb 16, 2026
f5a43c2
Update
vivianmiranda Feb 16, 2026
f127ab4
Update RAM usage detector
vivianmiranda Feb 16, 2026
d64853b
Update RAM usage detector
vivianmiranda Feb 16, 2026
c3f9159
Update detector of MPI worker crash (for example CAMB/CLASS crash
vivianmiranda Feb 16, 2026
0c83b73
Update detector of MPI worker crash (for example CAMB/CLASS crash
vivianmiranda Feb 16, 2026
b7d9699
Update detector of MPI worker crash (for example CAMB/CLASS crash
vivianmiranda Feb 16, 2026
0cce466
Update detector of MPI worker crash (for example CAMB/CLASS crash
vivianmiranda Feb 16, 2026
53cbaac
final touches on dataset_generator_lensing
vivianmiranda Feb 17, 2026
7a28f9a
Introduce unif sampling on datavector_lensing and started working on …
vivianmiranda Feb 17, 2026
9a03ab3
small updates on lensing - continue working on CMB
vivianmiranda Feb 18, 2026
113dcb3
bug fixes
vivianmiranda Feb 19, 2026
b91fbc7
bug fixes
vivianmiranda Feb 19, 2026
21ab6d2
Update to emulator datavector cmb
vivianmiranda Feb 19, 2026
df2ace8
Update to emulator datavector cmb
vivianmiranda Feb 20, 2026
9bbf281
Updates on generation lensing and generation CMB
vivianmiranda Feb 21, 2026
72e2d2f
Updates on generation lensing and generation CMB
vivianmiranda Feb 21, 2026
0bb26fd
Make sure training vectors are unique
vivianmiranda Mar 19, 2026
e88708f
added boundary corrections for train/test
vivianmiranda Mar 20, 2026
8955957
added boundary corrections for train/test
vivianmiranda Mar 20, 2026
0b5bb60
started rewrite of dataset_generator_baosn.py + added comments to the…
vivianmiranda Mar 24, 2026
a3f0ab4
started rewrite of dataset_generator_baosn.py + added comments to the…
vivianmiranda Mar 24, 2026
ea22d23
started rewrite of dataset_generator_baosn.py + added comments to the…
vivianmiranda Mar 24, 2026
49f0241
started rewrite of dataset_generator_baosn.py + added comments to the…
vivianmiranda Mar 24, 2026
6ab7054
fix range
JerreYjz Apr 1, 2026
b26b2a1
fix range
JerreYjz Apr 1, 2026
42c0efa
fix range
JerreYjz Apr 2, 2026
452412c
merge from main - fix bugs on dataset_generator
vivianmiranda Apr 2, 2026
131ada3
Merge pull request #11 from SBU-COSMOLIKE/dev
vivianmiranda Apr 2, 2026
a2e7956
Merge pull request #1 from CosmoLike/dev
vivianmiranda Apr 3, 2026
1640dca
Merge branch 'dev'
vivianmiranda Apr 3, 2026
b678a35
Merge pull request #2 from CosmoLike/main
vivianmiranda Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.