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

better bootstrapping #285

Merged
merged 34 commits into from
Feb 4, 2020
Merged

better bootstrapping #285

Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
fd68215
bootstrap.stats parallelized properly
Dec 29, 2019
9da77a2
bootstrap_compute properly parallelized
Dec 29, 2019
21f4199
CL PR_template
Dec 29, 2019
28bc13a
dask demo
Jan 1, 2020
fd29223
dask notebook macbook timings
Jan 2, 2020
9c74bea
dask nb timings mistral
Jan 2, 2020
0690392
tried to fix my_quantile
Jan 2, 2020
45db8e9
my_quantile q=list
Jan 4, 2020
71859fe
comments
Jan 4, 2020
b21bcfb
Merge branch 'master' into AS_fix_bootstrapping
aaronspring Jan 5, 2020
1daf22f
Merge branch 'master' into AS_fix_bootstrapping
bradyrx Jan 12, 2020
ad55f63
minor changes requested
Jan 14, 2020
cd89817
no .load() in bootstrap
Jan 14, 2020
840597f
Merge branch 'master' into AS_fix_bootstrapping
aaronspring Jan 14, 2020
b006b25
contrib asv added
Jan 14, 2020
62521ec
new hindcast benchmarking
Jan 14, 2020
e0cb8b6
rm commented out _load_mem
Jan 14, 2020
96fb4eb
persist smp_hind speedup?
Jan 20, 2020
95150b9
not persist, fixed benchmarks
Jan 24, 2020
c11dd69
Merge branch 'master' into AS_fix_bootstrapping
aaronspring Jan 24, 2020
c25cca2
bf ds.get_axis_num
Jan 24, 2020
d96172d
Merge branch 'master' into AS_fix_bootstrapping
aaronspring Jan 30, 2020
22fee69
PR template and contrib asv
Jan 30, 2020
ec14d50
req changes
Jan 30, 2020
0f87ff0
dask examples docs
Jan 30, 2020
fcd493f
Update test_stats.py
aaronspring Jan 30, 2020
6bcc96a
formatting requested
Feb 3, 2020
c790afa
alphabetical order
Feb 3, 2020
2f2f5a1
require pandas 0.25.3
Feb 3, 2020
0fbb8b1
lint
Feb 3, 2020
f295aaf
resolved comments
Feb 3, 2020
5a27833
benchmarks prob dim=member
Feb 3, 2020
ba85852
get_chunksize takes xr.ds
Feb 4, 2020
abc8e3a
warning caption MB added
Feb 4, 2020
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
Prev Previous commit
Next Next commit
bf ds.get_axis_num
  • Loading branch information
AS committed Jan 24, 2020
commit c25cca27b3f5598427a5db6a4bdccc7407ae1b17
8 changes: 4 additions & 4 deletions climpred/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
has_valid_lead_units,
warn_if_chunking_would_increase_performance,
)
from .constants import ALL_COMPARISONS, ALL_METRICS, METRIC_ALIASES, COMPARISON_ALIASES
from .constants import ALL_COMPARISONS, ALL_METRICS, COMPARISON_ALIASES, METRIC_ALIASES
from .prediction import compute_hindcast, compute_perfect_model, compute_persistence
from .stats import dpp, varweighted_mean_period
from .utils import (
Expand Down Expand Up @@ -62,8 +62,8 @@ def _percentile(arr, axis=0, q=95):
else:
return np.percentile(arr, axis=axis, q=q)

axis = ds.get_axis_num(dim)
assert axis == 0
# axis = ds.get_axis_num(dim)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delete this. I imagine the comment from above should go down here.

axis = 0
if not isinstance(q, list):
q = [q]
quantile = []
Expand Down Expand Up @@ -483,7 +483,7 @@ def bootstrap_compute(

# calc mean skill without any resampling
init_skill = compute(
hind, verif, metric=metric, comparison=comparison, dim=dim, **metric_kwargs
hind, verif, metric=metric, comparison=comparison, dim=dim, **metric_kwargs,
)
if 'init' in init_skill:
init_skill = init_skill.mean('init')
Expand Down