Skip to content
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

Jump to bottom

Test CI #1131

Closed
wants to merge 28 commits into from
Closed

Test CI #1131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3c83480
Use pytest 7.4.2
hsinfan1996 Oct 26, 2023
da056af
Try stricter rtol
hsinfan1996 Oct 26, 2023
52f8aa1
Use assert_allclose
hsinfan1996 Oct 26, 2023
48db0e4
test test_power.py only
hsinfan1996 Oct 26, 2023
749c711
Use pytest 7.4.3
hsinfan1996 Oct 26, 2023
a997944
pytest=7.4.2
hsinfan1996 Oct 26, 2023
9062be0
pytest==7.4.2
hsinfan1996 Oct 26, 2023
9d694f3
Revert test_power.py
hsinfan1996 Oct 26, 2023
09bb2db
Unpin pytest
hsinfan1996 Oct 26, 2023
4b11311
Try pytest=7.4.2 again
hsinfan1996 Oct 27, 2023
4823fc9
Verbose
hsinfan1996 Oct 27, 2023
1fffdd9
libgfortran5=13.2.0
hsinfan1996 Nov 6, 2023
f0a58fe
No Benchmarks for now
hsinfan1996 Nov 6, 2023
58814b1
libgfortran5=12.2.0
hsinfan1996 Nov 6, 2023
abbdd8d
libgfortran5=13.2.0
hsinfan1996 Nov 6, 2023
7689df3
Unpin libgfortran5=13.2.0
hsinfan1996 Nov 6, 2023
97689cd
Revert all changes
hsinfan1996 Nov 6, 2023
bde36d6
Revert all
hsinfan1996 Nov 6, 2023
dfc7f22
Merge branch 'master' into test_CI
hsinfan1996 Nov 6, 2023
19d8a48
Restore rtol to 1e-5
hsinfan1996 Nov 6, 2023
6078b1c
libgfortran5=13.2.0
hsinfan1996 Nov 6, 2023
bac811f
test_power.py only
hsinfan1996 Nov 7, 2023
5c72bef
pytest-7.4.2
hsinfan1996 Nov 7, 2023
181a873
pytest=7.4.2
hsinfan1996 Nov 7, 2023
778c03b
pip cython==3.0.4
hsinfan1996 Nov 7, 2023
5f61113
Update environment.yml
hsinfan1996 Nov 7, 2023
c8ad754
Relax tolerance
hsinfan1996 Nov 7, 2023
90e3476
Update environment.yml
hsinfan1996 Nov 7, 2023
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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ jobs:

- name: Unit tests
run: |
OMP_NUM_THREADS=2 pytest -vv pyccl --cov=pyccl --cov-report=lcov:lcov.info
OMP_NUM_THREADS=2 pytest -vv pyccl/tests/test_power.py --cov=pyccl --cov-report=lcov:lcov.info

- name: Benchmarks
run: |
OMP_NUM_THREADS=2 pytest -vv benchmarks --cov=pyccl --cov-report=lcov:lcov.info --cov-append
# - name: Benchmarks
# run: |
# OMP_NUM_THREADS=2 pytest -vv benchmarks --cov=pyccl --cov-report=lcov:lcov.info --cov-append

- name: Code coverage
if: matrix.label == 'linux-64'
Expand Down
8 changes: 4 additions & 4 deletions pyccl/tests/test_power.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ def test_input_nonlinear_model():

pk_CCL_input = ccl.power.nonlin_matter_power(cosmo_input, k_arr, 0.5)

assert np.allclose(pk_CCL_input, pk_CCL, atol=0., rtol=1e-4)
assert np.allclose(pk_CCL_input, pk_CCL, atol=0., rtol=1.2e-5)

# Test extra power spectrum
kl_arr = np.logspace(-4, 1, 1000)
Expand All @@ -289,12 +289,12 @@ def test_input_nonlinear_model():

pk_CCL_input = cosmo_input.get_nonlin_power('a:b')(k_arr, 0.5,
cosmo_input)
assert np.allclose(pk_CCL_input, pk_CCL, atol=0., rtol=1e-4)
assert np.allclose(pk_CCL_input, pk_CCL, atol=0., rtol=1.2e-5)

# Via `nonlin_power`
pk_CCL_input = ccl.power.nonlin_power(cosmo_input, k_arr, 0.5,
p_of_k_a='a:b')
assert np.allclose(pk_CCL_input, pk_CCL, atol=0., rtol=1e-4)
assert np.allclose(pk_CCL_input, pk_CCL, atol=0., rtol=1.2e-5)

# Use dictionary
cosmo_input = ccl.CosmologyCalculator(
Expand All @@ -309,7 +309,7 @@ def test_input_nonlinear_model():
'c:d': None})
pk_CCL_input = ccl.power.nonlin_power(cosmo_input, k_arr, 0.5,
p_of_k_a='a:b')
assert np.allclose(pk_CCL_input, pk_CCL, atol=0., rtol=1e-4)
assert np.allclose(pk_CCL_input, pk_CCL, atol=0., rtol=1.2e-5)
assert 'c:d' not in cosmo_input._pk_nl


Expand Down
Loading