这是indexloc提供的服务,不要输入任何密码
Skip to content

Fix usage of Beta-KGE metric, add CITATION.cfg #82

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.

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

Merged
merged 4 commits into from
Mar 23, 2022
Merged

Fix usage of Beta-KGE metric, add CITATION.cfg #82

merged 4 commits into from
Mar 23, 2022

Conversation

kratzert
Copy link
Contributor

Fixes

  • Beta-KGE was not in the list of available metrics returned by neuralhydrology.evaluation.metrics.get_available_metrics(). Equally, it was not computed in neuralhydrology.evaluation.metrics.calculate_all_metrics() and neuralhydrology.evaluation.metrics.calculate_metrics() raised an ValueError because of an unknown metric

Other

  • Added CITATION.cff for the JOSS paper

kratzert and others added 4 commits March 8, 2022 20:07
* Update README.md

* Update README.md

Co-authored-by: Martin Gauch <15731649+gauchm@users.noreply.github.com>

* Remove joss badge

* Add CITATION.cff

* Update CITATION.cff

Co-authored-by: Martin Gauch <15731649+gauchm@users.noreply.github.com>
Add CITATION.cff, fix usage of Beta-KGE metric
@kratzert kratzert requested a review from gauchm March 22, 2022 21:52
@kratzert kratzert merged commit 1ff36ea into master Mar 23, 2022
gauchm added a commit that referenced this pull request Mar 15, 2025
Squashed commit of the following: (#243)

commit 76d0850
Author: Thomas Berends <thomasberends@hotmail.com>
Date:   Mon Jan 13 16:48:26 2025 +0100

    MacOS with Metal support (#213)

    Option to train with device "mps" on MacOS with Metal support.

commit 94fb2fa
Author: XuHuanHydro <139729390+XuHuanHydro@users.noreply.github.com>
Date:   Thu Oct 17 16:05:46 2024 +0800

    Corrected the formula in the docstring of FLV in metrics.py (#203)

commit d4b3d2d
Author: BaptisteFrancois <30347942+BaptisteFrancois@users.noreply.github.com>
Date:   Wed Sep 11 04:03:08 2024 -0400

    Allow changing the directory during evaluation.

    Fixes #195.

commit 7cd1846
Merge: e4329c3 60738fc
Author: Martin Gauch <15731649+gauchm@users.noreply.github.com>
Date:   Fri Aug 2 15:11:20 2024 +0200

    v1.11.0 update

    v1.11.0

commit 60738fc
Merge: c8e8c10 cb1def0
Author: Martin Gauch <15731649+gauchm@users.noreply.github.com>
Date:   Fri Aug 2 14:35:01 2024 +0200

    Merge pull request #236 from kratzert/master

    v1.11.0 to public

commit e4329c3
Author: Brandon Victor <Multihuntr@hotmail.com>
Date:   Fri Mar 1 09:43:23 2024 +0100

    Add AdamW to optimizers and ReLU to fc activations (#169)

    * Add AdamW to optimizers and ReLU to fc activations
    * Updating documentation

commit 5436973
Author: Tadd Bindas <tkb5476@psu.edu>
Date:   Mon Feb 19 17:40:24 2024 -0500

    Implemented the Mamba State Space model (#163)

    * added Mamba Model

    * updated the finetuning settings for mamba

    * fixed __init__.py bug

    * fixed broken config entries

    * added transpose

    * added transposes to fix dims

    * added a transition linear layer to assist with batching dim:

    * implementing code changes requested by gauchm

    * updated docs

    * verified code /config changes run

    * grammar correction in try/except block

    * removed the ModuleNotFound from the global scope. Added more docs

    * changing single freq model name

    * Update mamba.py

    * Update config.rst

    * Update neuralhydrology.modelzoo.mamba.rst

commit 0dd762b
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Feb 19 14:25:59 2024 +0100

    Fix attribute loading in Caravan dataset (#168)

    Fixes #167, we ignored the actual train/val/test basins when sanity checking the attributes.

commit 36594aa
Author: Brandon Victor <Multihuntr@hotmail.com>
Date:   Mon Feb 19 14:21:29 2024 +0100

    Replace .iteritems() with .items() for pandas 2.x compatibility

    Pandas deprecated .iteritems() on Series in version 1.5. The suggested replacement is .items() (#166)

commit 2a57873
Merge: 257970a c8e8c10
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Feb 8 09:31:11 2024 +0100

    Merge pull request #161 from neuralhydrology/staging

    v1.10.0

commit c8e8c10
Merge: 558780f 56ac0d7
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed Feb 7 22:24:00 2024 +0100

    Merge pull request #226 from kratzert/master

    v1.10.0 to public

commit 257970a
Merge: f1ac00b 558780f
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Nov 23 22:27:34 2023 +0000

    Merge pull request #150 from neuralhydrology/staging

    Fix readthedocs issues

commit 558780f
Merge: d5b9598 aebe01e
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Nov 23 22:23:21 2023 +0000

    Merge pull request #222 from kratzert/master

    Fix rtd issues

commit f1ac00b
Merge: df8c2a6 d5b9598
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Nov 23 21:13:54 2023 +0000

    Merge pull request #149 from neuralhydrology/staging

    v. 1.9.1

commit d5b9598
Merge: 57ef7d7 9d96873
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Nov 23 21:04:28 2023 +0000

    Merge pull request #220 from kratzert/master

    v 1.9.1

commit df8c2a6
Merge: 1a3c313 57ef7d7
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Fri Aug 18 11:28:12 2023 +0200

    v.1.9.0 Update #143

    v.1.9.0 Update

commit 57ef7d7
Merge: 08f2787 f798676
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Aug 17 11:01:24 2023 +0200

    Merge pull request #212 from kratzert/master

    Push v.1.9.0 to public

commit 1a3c313
Merge: 068135a 08f2787
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Jul 27 21:57:03 2023 +0200

    Merge pull request #137 from neuralhydrology/staging

    Release v.1.8.1

commit 08f2787
Merge: 4497a4e ca0bc82
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Jul 27 21:30:57 2023 +0200

    Merge pull request #206 from kratzert/master

    Release version 1.8.1

commit 068135a
Merge: b3ab73c 4497a4e
Author: Martin Gauch <15731649+gauchm@users.noreply.github.com>
Date:   Fri Jul 7 13:02:28 2023 +0200

    Merge pull request #129 from neuralhydrology/staging

    v1.8.0

commit 4497a4e
Merge: f8e96a6 881d5d9
Author: Martin Gauch <15731649+gauchm@users.noreply.github.com>
Date:   Fri Jul 7 12:11:41 2023 +0200

    Merge pull request #202 from kratzert/master

    v1.8.0 to public

commit b3ab73c
Author: Scott Hamshaw <shamshaw@uvm.edu>
Date:   Sun Jun 4 14:26:48 2023 -0400

    enable non-verbose mode in trainer and tester (#124)

    Co-authored-by: Hamshaw, Scott Douglas <shamshaw@usgs.gov>

commit e374e78
Author: Scott Hamshaw <shamshaw@uvm.edu>
Date:   Tue May 30 13:25:47 2023 -0400

    Enable predictions in basins with no observations (#121)

    * add check basedataset for missing target vars

    * only allow missing targets during validate or test

    ---------

    Co-authored-by: Hamshaw, Scott Douglas <shamshaw@usgs.gov>

commit 08d3559
Merge: 9dac113 f8e96a6
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed May 17 12:24:51 2023 +0000

    Merge pull request #119 from neuralhydrology/staging

    v.1.7.0 Update

commit f8e96a6
Merge: 9304f7c 8828524
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed May 17 12:00:48 2023 +0000

    Merge pull request #196 from kratzert/master

    * Fix typo in models doc (#190)

    * CPU environment now pulls from conda forge, which is necessary to ensure an up-to-date xarray. (#193)

    * Fix handling of weekly frequencies. (#194)

    From #111:
    pd.infer_freq will return strings like "W-SUN" for weekly data, which
    pd.Timestamp doesn't understand. We now convert these frequencies to
    their equivalent multiple of 7D.

    * Correcting the pre model hook and UMAL sampling (#195)

    * The current use of `pre_model_hook` only applied the hook in training.
    This can be useful, but UMAL requires the hook also in validation and
    test. Thus, with the old setup UMAL only worked for the training.
    My propsoed changes make the `pre_model_hook` part of the model, apply
    it everywhere, and allow UMAL validation and evaluation.

    I think in the future we should also allow for different hook behaviors
    according to the setting at which it is called. But, for now  the
    proposed changes are enough.

    * Simpler Hook and Cleaner Pipeline

    This commit comprises two things.
    (1) A pre model hook that is simpler than the one in  original PR.
    (2) An idea to avoid copying the whole dataset that just involves
    a copy of the labels. That is still suboptimal in terms of memory
    use, but make the overall code simpler. Not sure if it is the best
    version. However,  at some point we have to extend the labels for
    the loss, and we need to do so  withouth breaking the whole
    downstream procedure. So maybe this is a good middle ground.

    * Simplified UMAL Sampling Logic

    This commit implements an idea from Martin that simplifies the sampling logic of the UMAL sampling util so that the sampling automatically checks whether the data has been extended.
    Thus no extra argument is required for the function call for `sample_umal`.

    * Spell correction neuralhydrology/modelzoo/basemodel.py

    Updated comment so that additional is spelled correctly

    Co-authored-by: Martin Gauch <15731649+gauchm@users.noreply.github.com>

    * Spell correction for neuralhydrology/utils/samplingutils.py

    UMAl -> UMAL

    Co-authored-by: Martin Gauch <15731649+gauchm@users.noreply.github.com>

    * Imporvement for Comments

    Added some minor changes to the comments.

    ---------

    Co-authored-by: Martin Gauch <15731649+gauchm@users.noreply.github.com>

    * Update __about__.py

    ---------

    Co-authored-by: Martin Gauch <15731649+gauchm@users.noreply.github.com>
    Co-authored-by: Grey Nearing <grey.nearing@gmail.com>
    Co-authored-by: Daniel Klotz <klotz@ml.jku.at>

commit 9dac113
Merge: d38db98 9304f7c
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Tue Apr 4 09:49:16 2023 +0200

    Merge pull request #110 from neuralhydrology/staging

    v.1.6.0

commit 9304f7c
Merge: 8cb8aff 49fb5f0
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Tue Apr 4 09:36:02 2023 +0200

    Merge pull request #189 from kratzert/master

    v.1.6.0

commit d38db98
Merge: 8228d30 8cb8aff
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Jan 30 15:46:06 2023 +0200

    Merge pull request #106 from neuralhydrology/staging

    v.1.5.1 fix finetuning

commit 8cb8aff
Merge: 23c24c2 b197732
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Jan 30 15:33:43 2023 +0200

    Merge pull request #183 from kratzert/master

    Fix finetuning (#182)

commit 8228d30
Merge: e3b4814 23c24c2
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Fri Jan 13 14:49:14 2023 +0200

    Merge pull request #103 from neuralhydrology/staging

    v.1.5.0

commit 23c24c2
Merge: 24bec2f 90b60a6
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Jan 12 10:54:21 2023 +0200

    Merge pull request #181 from kratzert/master

    Add Caravan dataset class

commit 24bec2f
Merge: 2d22a65 372a5d2
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Tue Nov 29 09:14:19 2022 +0100

    Merge pull request #174 from kratzert/master

    Fix dataset download documentation

commit e3b4814
Merge: b95d10e 2d22a65
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Nov 14 22:30:02 2022 +0100

    Merge pull request #99 from neuralhydrology/staging

    Fix missing version bump

commit 2d22a65
Merge: 74b9e42 915e359
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Nov 14 22:23:35 2022 +0100

    Merge pull request #170 from kratzert/master

    bump version to 1.4.1

commit b95d10e
Merge: 4dc6a3e 1ef929d
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Nov 14 22:13:43 2022 +0100

    Upgrade to v.1.4.0 #98

commit 1ef929d
Merge: 74b9e42 4dc6a3e
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Nov 14 22:08:03 2022 +0100

    Merge branch 'master' into staging

commit 74b9e42
Merge: 5141399 9eeee20
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Nov 14 22:04:16 2022 +0100

    Merge pull request #169 from kratzert/master

    v.1.4.0

commit 4dc6a3e
Author: Scott Hamshaw <shamshaw@uvm.edu>
Date:   Mon Nov 14 15:13:01 2022 -0500

    minmax scaling typo fix (#97)

commit b3c3250
Author: Sebastian Drost <s.drost@52north.org>
Date:   Mon Sep 19 22:52:18 2022 +0200

    Implement peak flow bias metric (#95)

    * Implement peak flow bias metric

    * Improve failure handling for peak flow bias metric

    * Change peak flow bias implementation to calculate the mean absolute percentage error for peaks

commit a4c284b
Merge: 6d0b722 5141399
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Fri Apr 29 21:49:12 2022 +0200

    Merge pull request #87 from neuralhydrology/staging

    Version update 1.3.0

commit 5141399
Merge: ce29b8e 230e062
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Fri Apr 29 21:19:31 2022 +0200

    Merge pull request #156 from kratzert/master

    v.1.3.0 Update

commit 6d0b722
Merge: 1ff36ea ce29b8e
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Fri Apr 15 21:06:37 2022 +0200

    Merge pull request #86 from neuralhydrology/staging

    v.1.2.5

commit ce29b8e
Merge: f4bf199 f36853a
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Fri Apr 15 20:44:48 2022 +0200

    Merge pull request #151 from kratzert/master

    v.1.2.5 to public

commit 1ff36ea
Merge: 440fda7 f4bf199
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed Mar 23 09:01:08 2022 +0000

    Merge pull request #82 from neuralhydrology/staging

    Fix usage of Beta-KGE metric, add CITATION.cfg

commit f4bf199
Merge: c454075 69c0281
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Tue Mar 22 21:45:22 2022 +0000

    Merge pull request #142 from kratzert/master

    Add CITATION.cff, fix usage of Beta-KGE metric

commit 440fda7
Merge: 577aa32 c454075
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Mar 3 21:51:34 2022 +0100

    Merge pull request #78 from neuralhydrology/staging

    Update cuda envs, extend GenericDataset docs

commit c454075
Merge: 547ede2 6523693
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Mar 3 21:36:23 2022 +0100

    Merge pull request #139 from kratzert/master

    Update cuda envs, extend GenericDataset doc

commit 577aa32
Merge: b6d43b2 547ede2
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Sun Feb 13 19:44:55 2022 +0100

    Merge pull request #72 from neuralhydrology/staging

    Auto upload to PyPI, minor bugfixes, doc updates

commit 547ede2
Merge: 8606cb7 af8126b
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Sun Feb 13 19:34:40 2022 +0100

    Merge pull request #136 from kratzert/master

    automatic PyPI upload, bugfixes, doc updates

commit b6d43b2
Merge: 31bd284 8606cb7
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed Feb 9 21:40:26 2022 +0100

    Merge pull request #71 from neuralhydrology/staging

    Rework docs, add issue templates, fix minor bugs

commit 8606cb7
Merge: df9408b 8cdd0be
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed Feb 9 21:19:19 2022 +0100

    Merge pull request #130 from kratzert/master

    Rework tutorials, fix git hash logging bug

commit 31bd284
Merge: ab39c52 df9408b
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Jan 10 15:47:05 2022 +0100

    Merge pull request #57 from neuralhydrology/staging

    Update to v1.2.0

commit df9408b
Merge: 9a046d4 62ee603
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Jan 10 15:27:59 2022 +0100

    Merge pull request #121 from kratzert/master

    Update to version 1.2.0

commit ab39c52
Merge: a710d61 9a046d4
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed Dec 1 13:16:29 2021 +0100

    Merge pull request #52 from neuralhydrology/staging

    Update to 1.1.0

commit 9a046d4
Merge: 7b37d67 20c9022
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed Dec 1 13:06:01 2021 +0100

    Merge pull request #111 from kratzert/master

    Push 1.1.0 to public

commit a710d61
Merge: cd73563 7b37d67
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Sun Oct 24 22:07:14 2021 +0200

    Merge pull request #50 from neuralhydrology/staging

    Remove pickle dependencies for scaler/id_to_int dicts, v.1.0.0 Release

commit 7b37d67
Merge: 7891210 43fefdd
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Sun Oct 24 21:38:30 2021 +0200

    Merge pull request #108 from kratzert/master

    1.0.0 release to public

commit cd73563
Merge: ffbc600 7891210
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Aug 5 20:22:40 2021 +0200

    Merge pull request #47 from neuralhydrology/staging

    Update data use in tutorials

commit 7891210
Merge: 466a69c ed976fe
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Aug 5 20:07:16 2021 +0200

    Merge pull request #100 from kratzert/master

    Update data use in tutorials

commit ffbc600
Merge: 8faa264 466a69c
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed May 19 15:59:36 2021 +0200

    Merge pull request #41 from neuralhydrology/staging

    fix git requirement

commit 466a69c
Merge: d7282d6 a409c79
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed May 19 15:50:27 2021 +0200

    Merge pull request #97 from kratzert/master

    fix git requirement in logger
matvii22 pushed a commit to matvii22/neuralhydrology that referenced this pull request Apr 19, 2025
Squashed commit of the following: (neuralhydrology#243)

commit 76d0850
Author: Thomas Berends <thomasberends@hotmail.com>
Date:   Mon Jan 13 16:48:26 2025 +0100

    MacOS with Metal support (neuralhydrology#213)

    Option to train with device "mps" on MacOS with Metal support.

commit 94fb2fa
Author: XuHuanHydro <139729390+XuHuanHydro@users.noreply.github.com>
Date:   Thu Oct 17 16:05:46 2024 +0800

    Corrected the formula in the docstring of FLV in metrics.py (neuralhydrology#203)

commit d4b3d2d
Author: BaptisteFrancois <30347942+BaptisteFrancois@users.noreply.github.com>
Date:   Wed Sep 11 04:03:08 2024 -0400

    Allow changing the directory during evaluation.

    Fixes neuralhydrology#195.

commit 7cd1846
Merge: e4329c3 60738fc
Author: Martin Gauch <15731649+gauchm@users.noreply.github.com>
Date:   Fri Aug 2 15:11:20 2024 +0200

    v1.11.0 update

    v1.11.0

commit 60738fc
Merge: c8e8c10 cb1def0
Author: Martin Gauch <15731649+gauchm@users.noreply.github.com>
Date:   Fri Aug 2 14:35:01 2024 +0200

    Merge pull request neuralhydrology#236 from kratzert/master

    v1.11.0 to public

commit e4329c3
Author: Brandon Victor <Multihuntr@hotmail.com>
Date:   Fri Mar 1 09:43:23 2024 +0100

    Add AdamW to optimizers and ReLU to fc activations (neuralhydrology#169)

    * Add AdamW to optimizers and ReLU to fc activations
    * Updating documentation

commit 5436973
Author: Tadd Bindas <tkb5476@psu.edu>
Date:   Mon Feb 19 17:40:24 2024 -0500

    Implemented the Mamba State Space model (neuralhydrology#163)

    * added Mamba Model

    * updated the finetuning settings for mamba

    * fixed __init__.py bug

    * fixed broken config entries

    * added transpose

    * added transposes to fix dims

    * added a transition linear layer to assist with batching dim:

    * implementing code changes requested by gauchm

    * updated docs

    * verified code /config changes run

    * grammar correction in try/except block

    * removed the ModuleNotFound from the global scope. Added more docs

    * changing single freq model name

    * Update mamba.py

    * Update config.rst

    * Update neuralhydrology.modelzoo.mamba.rst

commit 0dd762b
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Feb 19 14:25:59 2024 +0100

    Fix attribute loading in Caravan dataset (neuralhydrology#168)

    Fixes neuralhydrology#167, we ignored the actual train/val/test basins when sanity checking the attributes.

commit 36594aa
Author: Brandon Victor <Multihuntr@hotmail.com>
Date:   Mon Feb 19 14:21:29 2024 +0100

    Replace .iteritems() with .items() for pandas 2.x compatibility

    Pandas deprecated .iteritems() on Series in version 1.5. The suggested replacement is .items() (neuralhydrology#166)

commit 2a57873
Merge: 257970a c8e8c10
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Feb 8 09:31:11 2024 +0100

    Merge pull request neuralhydrology#161 from neuralhydrology/staging

    v1.10.0

commit c8e8c10
Merge: 558780f 56ac0d7
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed Feb 7 22:24:00 2024 +0100

    Merge pull request neuralhydrology#226 from kratzert/master

    v1.10.0 to public

commit 257970a
Merge: f1ac00b 558780f
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Nov 23 22:27:34 2023 +0000

    Merge pull request neuralhydrology#150 from neuralhydrology/staging

    Fix readthedocs issues

commit 558780f
Merge: d5b9598 aebe01e
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Nov 23 22:23:21 2023 +0000

    Merge pull request neuralhydrology#222 from kratzert/master

    Fix rtd issues

commit f1ac00b
Merge: df8c2a6 d5b9598
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Nov 23 21:13:54 2023 +0000

    Merge pull request neuralhydrology#149 from neuralhydrology/staging

    v. 1.9.1

commit d5b9598
Merge: 57ef7d7 9d96873
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Nov 23 21:04:28 2023 +0000

    Merge pull request neuralhydrology#220 from kratzert/master

    v 1.9.1

commit df8c2a6
Merge: 1a3c313 57ef7d7
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Fri Aug 18 11:28:12 2023 +0200

    v.1.9.0 Update neuralhydrology#143

    v.1.9.0 Update

commit 57ef7d7
Merge: 08f2787 f798676
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Aug 17 11:01:24 2023 +0200

    Merge pull request neuralhydrology#212 from kratzert/master

    Push v.1.9.0 to public

commit 1a3c313
Merge: 068135a 08f2787
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Jul 27 21:57:03 2023 +0200

    Merge pull request neuralhydrology#137 from neuralhydrology/staging

    Release v.1.8.1

commit 08f2787
Merge: 4497a4e ca0bc82
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Jul 27 21:30:57 2023 +0200

    Merge pull request neuralhydrology#206 from kratzert/master

    Release version 1.8.1

commit 068135a
Merge: b3ab73c 4497a4e
Author: Martin Gauch <15731649+gauchm@users.noreply.github.com>
Date:   Fri Jul 7 13:02:28 2023 +0200

    Merge pull request neuralhydrology#129 from neuralhydrology/staging

    v1.8.0

commit 4497a4e
Merge: f8e96a6 881d5d9
Author: Martin Gauch <15731649+gauchm@users.noreply.github.com>
Date:   Fri Jul 7 12:11:41 2023 +0200

    Merge pull request neuralhydrology#202 from kratzert/master

    v1.8.0 to public

commit b3ab73c
Author: Scott Hamshaw <shamshaw@uvm.edu>
Date:   Sun Jun 4 14:26:48 2023 -0400

    enable non-verbose mode in trainer and tester (neuralhydrology#124)

    Co-authored-by: Hamshaw, Scott Douglas <shamshaw@usgs.gov>

commit e374e78
Author: Scott Hamshaw <shamshaw@uvm.edu>
Date:   Tue May 30 13:25:47 2023 -0400

    Enable predictions in basins with no observations (neuralhydrology#121)

    * add check basedataset for missing target vars

    * only allow missing targets during validate or test

    ---------

    Co-authored-by: Hamshaw, Scott Douglas <shamshaw@usgs.gov>

commit 08d3559
Merge: 9dac113 f8e96a6
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed May 17 12:24:51 2023 +0000

    Merge pull request neuralhydrology#119 from neuralhydrology/staging

    v.1.7.0 Update

commit f8e96a6
Merge: 9304f7c 8828524
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed May 17 12:00:48 2023 +0000

    Merge pull request neuralhydrology#196 from kratzert/master

    * Fix typo in models doc (neuralhydrology#190)

    * CPU environment now pulls from conda forge, which is necessary to ensure an up-to-date xarray. (neuralhydrology#193)

    * Fix handling of weekly frequencies. (neuralhydrology#194)

    From neuralhydrology#111:
    pd.infer_freq will return strings like "W-SUN" for weekly data, which
    pd.Timestamp doesn't understand. We now convert these frequencies to
    their equivalent multiple of 7D.

    * Correcting the pre model hook and UMAL sampling (neuralhydrology#195)

    * The current use of `pre_model_hook` only applied the hook in training.
    This can be useful, but UMAL requires the hook also in validation and
    test. Thus, with the old setup UMAL only worked for the training.
    My propsoed changes make the `pre_model_hook` part of the model, apply
    it everywhere, and allow UMAL validation and evaluation.

    I think in the future we should also allow for different hook behaviors
    according to the setting at which it is called. But, for now  the
    proposed changes are enough.

    * Simpler Hook and Cleaner Pipeline

    This commit comprises two things.
    (1) A pre model hook that is simpler than the one in  original PR.
    (2) An idea to avoid copying the whole dataset that just involves
    a copy of the labels. That is still suboptimal in terms of memory
    use, but make the overall code simpler. Not sure if it is the best
    version. However,  at some point we have to extend the labels for
    the loss, and we need to do so  withouth breaking the whole
    downstream procedure. So maybe this is a good middle ground.

    * Simplified UMAL Sampling Logic

    This commit implements an idea from Martin that simplifies the sampling logic of the UMAL sampling util so that the sampling automatically checks whether the data has been extended.
    Thus no extra argument is required for the function call for `sample_umal`.

    * Spell correction neuralhydrology/modelzoo/basemodel.py

    Updated comment so that additional is spelled correctly

    Co-authored-by: Martin Gauch <15731649+gauchm@users.noreply.github.com>

    * Spell correction for neuralhydrology/utils/samplingutils.py

    UMAl -> UMAL

    Co-authored-by: Martin Gauch <15731649+gauchm@users.noreply.github.com>

    * Imporvement for Comments

    Added some minor changes to the comments.

    ---------

    Co-authored-by: Martin Gauch <15731649+gauchm@users.noreply.github.com>

    * Update __about__.py

    ---------

    Co-authored-by: Martin Gauch <15731649+gauchm@users.noreply.github.com>
    Co-authored-by: Grey Nearing <grey.nearing@gmail.com>
    Co-authored-by: Daniel Klotz <klotz@ml.jku.at>

commit 9dac113
Merge: d38db98 9304f7c
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Tue Apr 4 09:49:16 2023 +0200

    Merge pull request neuralhydrology#110 from neuralhydrology/staging

    v.1.6.0

commit 9304f7c
Merge: 8cb8aff 49fb5f0
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Tue Apr 4 09:36:02 2023 +0200

    Merge pull request neuralhydrology#189 from kratzert/master

    v.1.6.0

commit d38db98
Merge: 8228d30 8cb8aff
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Jan 30 15:46:06 2023 +0200

    Merge pull request neuralhydrology#106 from neuralhydrology/staging

    v.1.5.1 fix finetuning

commit 8cb8aff
Merge: 23c24c2 b197732
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Jan 30 15:33:43 2023 +0200

    Merge pull request neuralhydrology#183 from kratzert/master

    Fix finetuning (neuralhydrology#182)

commit 8228d30
Merge: e3b4814 23c24c2
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Fri Jan 13 14:49:14 2023 +0200

    Merge pull request neuralhydrology#103 from neuralhydrology/staging

    v.1.5.0

commit 23c24c2
Merge: 24bec2f 90b60a6
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Jan 12 10:54:21 2023 +0200

    Merge pull request neuralhydrology#181 from kratzert/master

    Add Caravan dataset class

commit 24bec2f
Merge: 2d22a65 372a5d2
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Tue Nov 29 09:14:19 2022 +0100

    Merge pull request neuralhydrology#174 from kratzert/master

    Fix dataset download documentation

commit e3b4814
Merge: b95d10e 2d22a65
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Nov 14 22:30:02 2022 +0100

    Merge pull request neuralhydrology#99 from neuralhydrology/staging

    Fix missing version bump

commit 2d22a65
Merge: 74b9e42 915e359
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Nov 14 22:23:35 2022 +0100

    Merge pull request neuralhydrology#170 from kratzert/master

    bump version to 1.4.1

commit b95d10e
Merge: 4dc6a3e 1ef929d
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Nov 14 22:13:43 2022 +0100

    Upgrade to v.1.4.0 neuralhydrology#98

commit 1ef929d
Merge: 74b9e42 4dc6a3e
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Nov 14 22:08:03 2022 +0100

    Merge branch 'master' into staging

commit 74b9e42
Merge: 5141399 9eeee20
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Nov 14 22:04:16 2022 +0100

    Merge pull request neuralhydrology#169 from kratzert/master

    v.1.4.0

commit 4dc6a3e
Author: Scott Hamshaw <shamshaw@uvm.edu>
Date:   Mon Nov 14 15:13:01 2022 -0500

    minmax scaling typo fix (neuralhydrology#97)

commit b3c3250
Author: Sebastian Drost <s.drost@52north.org>
Date:   Mon Sep 19 22:52:18 2022 +0200

    Implement peak flow bias metric (neuralhydrology#95)

    * Implement peak flow bias metric

    * Improve failure handling for peak flow bias metric

    * Change peak flow bias implementation to calculate the mean absolute percentage error for peaks

commit a4c284b
Merge: 6d0b722 5141399
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Fri Apr 29 21:49:12 2022 +0200

    Merge pull request neuralhydrology#87 from neuralhydrology/staging

    Version update 1.3.0

commit 5141399
Merge: ce29b8e 230e062
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Fri Apr 29 21:19:31 2022 +0200

    Merge pull request neuralhydrology#156 from kratzert/master

    v.1.3.0 Update

commit 6d0b722
Merge: 1ff36ea ce29b8e
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Fri Apr 15 21:06:37 2022 +0200

    Merge pull request neuralhydrology#86 from neuralhydrology/staging

    v.1.2.5

commit ce29b8e
Merge: f4bf199 f36853a
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Fri Apr 15 20:44:48 2022 +0200

    Merge pull request neuralhydrology#151 from kratzert/master

    v.1.2.5 to public

commit 1ff36ea
Merge: 440fda7 f4bf199
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed Mar 23 09:01:08 2022 +0000

    Merge pull request neuralhydrology#82 from neuralhydrology/staging

    Fix usage of Beta-KGE metric, add CITATION.cfg

commit f4bf199
Merge: c454075 69c0281
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Tue Mar 22 21:45:22 2022 +0000

    Merge pull request neuralhydrology#142 from kratzert/master

    Add CITATION.cff, fix usage of Beta-KGE metric

commit 440fda7
Merge: 577aa32 c454075
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Mar 3 21:51:34 2022 +0100

    Merge pull request neuralhydrology#78 from neuralhydrology/staging

    Update cuda envs, extend GenericDataset docs

commit c454075
Merge: 547ede2 6523693
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Mar 3 21:36:23 2022 +0100

    Merge pull request neuralhydrology#139 from kratzert/master

    Update cuda envs, extend GenericDataset doc

commit 577aa32
Merge: b6d43b2 547ede2
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Sun Feb 13 19:44:55 2022 +0100

    Merge pull request neuralhydrology#72 from neuralhydrology/staging

    Auto upload to PyPI, minor bugfixes, doc updates

commit 547ede2
Merge: 8606cb7 af8126b
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Sun Feb 13 19:34:40 2022 +0100

    Merge pull request neuralhydrology#136 from kratzert/master

    automatic PyPI upload, bugfixes, doc updates

commit b6d43b2
Merge: 31bd284 8606cb7
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed Feb 9 21:40:26 2022 +0100

    Merge pull request neuralhydrology#71 from neuralhydrology/staging

    Rework docs, add issue templates, fix minor bugs

commit 8606cb7
Merge: df9408b 8cdd0be
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed Feb 9 21:19:19 2022 +0100

    Merge pull request neuralhydrology#130 from kratzert/master

    Rework tutorials, fix git hash logging bug

commit 31bd284
Merge: ab39c52 df9408b
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Jan 10 15:47:05 2022 +0100

    Merge pull request neuralhydrology#57 from neuralhydrology/staging

    Update to v1.2.0

commit df9408b
Merge: 9a046d4 62ee603
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Jan 10 15:27:59 2022 +0100

    Merge pull request neuralhydrology#121 from kratzert/master

    Update to version 1.2.0

commit ab39c52
Merge: a710d61 9a046d4
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed Dec 1 13:16:29 2021 +0100

    Merge pull request neuralhydrology#52 from neuralhydrology/staging

    Update to 1.1.0

commit 9a046d4
Merge: 7b37d67 20c9022
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed Dec 1 13:06:01 2021 +0100

    Merge pull request neuralhydrology#111 from kratzert/master

    Push 1.1.0 to public

commit a710d61
Merge: cd73563 7b37d67
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Sun Oct 24 22:07:14 2021 +0200

    Merge pull request neuralhydrology#50 from neuralhydrology/staging

    Remove pickle dependencies for scaler/id_to_int dicts, v.1.0.0 Release

commit 7b37d67
Merge: 7891210 43fefdd
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Sun Oct 24 21:38:30 2021 +0200

    Merge pull request neuralhydrology#108 from kratzert/master

    1.0.0 release to public

commit cd73563
Merge: ffbc600 7891210
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Aug 5 20:22:40 2021 +0200

    Merge pull request neuralhydrology#47 from neuralhydrology/staging

    Update data use in tutorials

commit 7891210
Merge: 466a69c ed976fe
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Aug 5 20:07:16 2021 +0200

    Merge pull request neuralhydrology#100 from kratzert/master

    Update data use in tutorials

commit ffbc600
Merge: 8faa264 466a69c
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed May 19 15:59:36 2021 +0200

    Merge pull request neuralhydrology#41 from neuralhydrology/staging

    fix git requirement

commit 466a69c
Merge: d7282d6 a409c79
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed May 19 15:50:27 2021 +0200

    Merge pull request neuralhydrology#97 from kratzert/master

    fix git requirement in logger
omriporat1 pushed a commit to omriporat1/neuralhydrology that referenced this pull request Jul 8, 2025
Fix usage of Beta-KGE metric, add CITATION.cfg
omriporat1 pushed a commit to omriporat1/neuralhydrology that referenced this pull request Jul 8, 2025
Squashed commit of the following: (neuralhydrology#243)

commit 910d576
Author: Thomas Berends <thomasberends@hotmail.com>
Date:   Mon Jan 13 16:48:26 2025 +0100

    MacOS with Metal support (neuralhydrology#213)

    Option to train with device "mps" on MacOS with Metal support.

commit 6e56d2f
Author: XuHuanHydro <139729390+XuHuanHydro@users.noreply.github.com>
Date:   Thu Oct 17 16:05:46 2024 +0800

    Corrected the formula in the docstring of FLV in metrics.py (neuralhydrology#203)

commit 841ff99
Author: BaptisteFrancois <30347942+BaptisteFrancois@users.noreply.github.com>
Date:   Wed Sep 11 04:03:08 2024 -0400

    Allow changing the directory during evaluation.

    Fixes neuralhydrology#195.

commit 20a4acb
Merge: b81c241 d05c559
Author: Martin Gauch <15731649+gauchm@users.noreply.github.com>
Date:   Fri Aug 2 15:11:20 2024 +0200

    v1.11.0 update

    v1.11.0

commit d05c559
Merge: 241d67c 9443f5c
Author: Martin Gauch <15731649+gauchm@users.noreply.github.com>
Date:   Fri Aug 2 14:35:01 2024 +0200

    Merge pull request neuralhydrology#236 from kratzert/master

    v1.11.0 to public

commit b81c241
Author: Brandon Victor <Multihuntr@hotmail.com>
Date:   Fri Mar 1 09:43:23 2024 +0100

    Add AdamW to optimizers and ReLU to fc activations (neuralhydrology#169)

    * Add AdamW to optimizers and ReLU to fc activations
    * Updating documentation

commit adcb587
Author: Tadd Bindas <tkb5476@psu.edu>
Date:   Mon Feb 19 17:40:24 2024 -0500

    Implemented the Mamba State Space model (neuralhydrology#163)

    * added Mamba Model

    * updated the finetuning settings for mamba

    * fixed __init__.py bug

    * fixed broken config entries

    * added transpose

    * added transposes to fix dims

    * added a transition linear layer to assist with batching dim:

    * implementing code changes requested by gauchm

    * updated docs

    * verified code /config changes run

    * grammar correction in try/except block

    * removed the ModuleNotFound from the global scope. Added more docs

    * changing single freq model name

    * Update mamba.py

    * Update config.rst

    * Update neuralhydrology.modelzoo.mamba.rst

commit be04b99
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Feb 19 14:25:59 2024 +0100

    Fix attribute loading in Caravan dataset (neuralhydrology#168)

    Fixes neuralhydrology#167, we ignored the actual train/val/test basins when sanity checking the attributes.

commit 1b2579f
Author: Brandon Victor <Multihuntr@hotmail.com>
Date:   Mon Feb 19 14:21:29 2024 +0100

    Replace .iteritems() with .items() for pandas 2.x compatibility

    Pandas deprecated .iteritems() on Series in version 1.5. The suggested replacement is .items() (neuralhydrology#166)

commit 57357bc
Merge: c34ff83 241d67c
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Feb 8 09:31:11 2024 +0100

    Merge pull request neuralhydrology#161 from neuralhydrology/staging

    v1.10.0

commit 241d67c
Merge: 288c2bb 8a78d9e
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed Feb 7 22:24:00 2024 +0100

    Merge pull request neuralhydrology#226 from kratzert/master

    v1.10.0 to public

commit c34ff83
Merge: a36479b 288c2bb
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Nov 23 22:27:34 2023 +0000

    Merge pull request neuralhydrology#150 from neuralhydrology/staging

    Fix readthedocs issues

commit 288c2bb
Merge: e5c6eee abd3ef6
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Nov 23 22:23:21 2023 +0000

    Merge pull request neuralhydrology#222 from kratzert/master

    Fix rtd issues

commit a36479b
Merge: fd0a141 e5c6eee
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Nov 23 21:13:54 2023 +0000

    Merge pull request neuralhydrology#149 from neuralhydrology/staging

    v. 1.9.1

commit e5c6eee
Merge: eef0a00 7cf197f
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Nov 23 21:04:28 2023 +0000

    Merge pull request neuralhydrology#220 from kratzert/master

    v 1.9.1

commit fd0a141
Merge: 246ee58 eef0a00
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Fri Aug 18 11:28:12 2023 +0200

    v.1.9.0 Update neuralhydrology#143

    v.1.9.0 Update

commit eef0a00
Merge: a185cbb fbf50fc
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Aug 17 11:01:24 2023 +0200

    Merge pull request neuralhydrology#212 from kratzert/master

    Push v.1.9.0 to public

commit 246ee58
Merge: 734e839 a185cbb
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Jul 27 21:57:03 2023 +0200

    Merge pull request neuralhydrology#137 from neuralhydrology/staging

    Release v.1.8.1

commit a185cbb
Merge: c2898fc ba2da7d
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Jul 27 21:30:57 2023 +0200

    Merge pull request neuralhydrology#206 from kratzert/master

    Release version 1.8.1

commit 734e839
Merge: c98ec53 c2898fc
Author: Martin Gauch <15731649+gauchm@users.noreply.github.com>
Date:   Fri Jul 7 13:02:28 2023 +0200

    Merge pull request neuralhydrology#129 from neuralhydrology/staging

    v1.8.0

commit c2898fc
Merge: 87a6b56 8971654
Author: Martin Gauch <15731649+gauchm@users.noreply.github.com>
Date:   Fri Jul 7 12:11:41 2023 +0200

    Merge pull request neuralhydrology#202 from kratzert/master

    v1.8.0 to public

commit c98ec53
Author: Scott Hamshaw <shamshaw@uvm.edu>
Date:   Sun Jun 4 14:26:48 2023 -0400

    enable non-verbose mode in trainer and tester (neuralhydrology#124)

    Co-authored-by: Hamshaw, Scott Douglas <shamshaw@usgs.gov>

commit f3c6b3e
Author: Scott Hamshaw <shamshaw@uvm.edu>
Date:   Tue May 30 13:25:47 2023 -0400

    Enable predictions in basins with no observations (neuralhydrology#121)

    * add check basedataset for missing target vars

    * only allow missing targets during validate or test

    ---------

    Co-authored-by: Hamshaw, Scott Douglas <shamshaw@usgs.gov>

commit 17f12e5
Merge: 886f6ca 87a6b56
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed May 17 12:24:51 2023 +0000

    Merge pull request neuralhydrology#119 from neuralhydrology/staging

    v.1.7.0 Update

commit 87a6b56
Merge: 59ae464 dbb8a44
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed May 17 12:00:48 2023 +0000

    Merge pull request neuralhydrology#196 from kratzert/master

    * Fix typo in models doc (neuralhydrology#190)

    * CPU environment now pulls from conda forge, which is necessary to ensure an up-to-date xarray. (neuralhydrology#193)

    * Fix handling of weekly frequencies. (neuralhydrology#194)

    From neuralhydrology#111:
    pd.infer_freq will return strings like "W-SUN" for weekly data, which
    pd.Timestamp doesn't understand. We now convert these frequencies to
    their equivalent multiple of 7D.

    * Correcting the pre model hook and UMAL sampling (neuralhydrology#195)

    * The current use of `pre_model_hook` only applied the hook in training.
    This can be useful, but UMAL requires the hook also in validation and
    test. Thus, with the old setup UMAL only worked for the training.
    My propsoed changes make the `pre_model_hook` part of the model, apply
    it everywhere, and allow UMAL validation and evaluation.

    I think in the future we should also allow for different hook behaviors
    according to the setting at which it is called. But, for now  the
    proposed changes are enough.

    * Simpler Hook and Cleaner Pipeline

    This commit comprises two things.
    (1) A pre model hook that is simpler than the one in  original PR.
    (2) An idea to avoid copying the whole dataset that just involves
    a copy of the labels. That is still suboptimal in terms of memory
    use, but make the overall code simpler. Not sure if it is the best
    version. However,  at some point we have to extend the labels for
    the loss, and we need to do so  withouth breaking the whole
    downstream procedure. So maybe this is a good middle ground.

    * Simplified UMAL Sampling Logic

    This commit implements an idea from Martin that simplifies the sampling logic of the UMAL sampling util so that the sampling automatically checks whether the data has been extended.
    Thus no extra argument is required for the function call for `sample_umal`.

    * Spell correction neuralhydrology/modelzoo/basemodel.py

    Updated comment so that additional is spelled correctly

    Co-authored-by: Martin Gauch <15731649+gauchm@users.noreply.github.com>

    * Spell correction for neuralhydrology/utils/samplingutils.py

    UMAl -> UMAL

    Co-authored-by: Martin Gauch <15731649+gauchm@users.noreply.github.com>

    * Imporvement for Comments

    Added some minor changes to the comments.

    ---------

    Co-authored-by: Martin Gauch <15731649+gauchm@users.noreply.github.com>

    * Update __about__.py

    ---------

    Co-authored-by: Martin Gauch <15731649+gauchm@users.noreply.github.com>
    Co-authored-by: Grey Nearing <grey.nearing@gmail.com>
    Co-authored-by: Daniel Klotz <klotz@ml.jku.at>

commit 886f6ca
Merge: e343607 59ae464
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Tue Apr 4 09:49:16 2023 +0200

    Merge pull request neuralhydrology#110 from neuralhydrology/staging

    v.1.6.0

commit 59ae464
Merge: b3902bb 7d1a193
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Tue Apr 4 09:36:02 2023 +0200

    Merge pull request neuralhydrology#189 from kratzert/master

    v.1.6.0

commit e343607
Merge: 5870166 b3902bb
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Jan 30 15:46:06 2023 +0200

    Merge pull request neuralhydrology#106 from neuralhydrology/staging

    v.1.5.1 fix finetuning

commit b3902bb
Merge: 9fb269f 3ca67bf
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Jan 30 15:33:43 2023 +0200

    Merge pull request neuralhydrology#183 from kratzert/master

    Fix finetuning (neuralhydrology#182)

commit 5870166
Merge: 20269b5 9fb269f
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Fri Jan 13 14:49:14 2023 +0200

    Merge pull request neuralhydrology#103 from neuralhydrology/staging

    v.1.5.0

commit 9fb269f
Merge: e447e5e 5aa9afe
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Jan 12 10:54:21 2023 +0200

    Merge pull request neuralhydrology#181 from kratzert/master

    Add Caravan dataset class

commit e447e5e
Merge: 280ead5 e9522f1
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Tue Nov 29 09:14:19 2022 +0100

    Merge pull request neuralhydrology#174 from kratzert/master

    Fix dataset download documentation

commit 20269b5
Merge: 6bfcd67 280ead5
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Nov 14 22:30:02 2022 +0100

    Merge pull request neuralhydrology#99 from neuralhydrology/staging

    Fix missing version bump

commit 280ead5
Merge: d7cbbd3 01dff62
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Nov 14 22:23:35 2022 +0100

    Merge pull request neuralhydrology#170 from kratzert/master

    bump version to 1.4.1

commit 6bfcd67
Merge: 1e3fab9 f41e44f
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Nov 14 22:13:43 2022 +0100

    Upgrade to v.1.4.0 neuralhydrology#98

commit f41e44f
Merge: d7cbbd3 1e3fab9
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Nov 14 22:08:03 2022 +0100

    Merge branch 'master' into staging

commit d7cbbd3
Merge: 9d01a96 875c2e3
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Nov 14 22:04:16 2022 +0100

    Merge pull request neuralhydrology#169 from kratzert/master

    v.1.4.0

commit 1e3fab9
Author: Scott Hamshaw <shamshaw@uvm.edu>
Date:   Mon Nov 14 15:13:01 2022 -0500

    minmax scaling typo fix (neuralhydrology#97)

commit e4b140b
Author: Sebastian Drost <s.drost@52north.org>
Date:   Mon Sep 19 22:52:18 2022 +0200

    Implement peak flow bias metric (neuralhydrology#95)

    * Implement peak flow bias metric

    * Improve failure handling for peak flow bias metric

    * Change peak flow bias implementation to calculate the mean absolute percentage error for peaks

commit 3a1db9c
Merge: b9419c9 9d01a96
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Fri Apr 29 21:49:12 2022 +0200

    Merge pull request neuralhydrology#87 from neuralhydrology/staging

    Version update 1.3.0

commit 9d01a96
Merge: 3dbc8fd 3db6947
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Fri Apr 29 21:19:31 2022 +0200

    Merge pull request neuralhydrology#156 from kratzert/master

    v.1.3.0 Update

commit b9419c9
Merge: a340e7b 3dbc8fd
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Fri Apr 15 21:06:37 2022 +0200

    Merge pull request neuralhydrology#86 from neuralhydrology/staging

    v.1.2.5

commit 3dbc8fd
Merge: 95c1deb 76390df
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Fri Apr 15 20:44:48 2022 +0200

    Merge pull request neuralhydrology#151 from kratzert/master

    v.1.2.5 to public

commit a340e7b
Merge: d2be843 95c1deb
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed Mar 23 09:01:08 2022 +0000

    Merge pull request neuralhydrology#82 from neuralhydrology/staging

    Fix usage of Beta-KGE metric, add CITATION.cfg

commit 95c1deb
Merge: 84b3676 471bd14
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Tue Mar 22 21:45:22 2022 +0000

    Merge pull request neuralhydrology#142 from kratzert/master

    Add CITATION.cff, fix usage of Beta-KGE metric

commit d2be843
Merge: 236e31c 84b3676
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Mar 3 21:51:34 2022 +0100

    Merge pull request neuralhydrology#78 from neuralhydrology/staging

    Update cuda envs, extend GenericDataset docs

commit 84b3676
Merge: b27ebe7 441c1eb
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Mar 3 21:36:23 2022 +0100

    Merge pull request neuralhydrology#139 from kratzert/master

    Update cuda envs, extend GenericDataset doc

commit 236e31c
Merge: 0db41fb b27ebe7
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Sun Feb 13 19:44:55 2022 +0100

    Merge pull request neuralhydrology#72 from neuralhydrology/staging

    Auto upload to PyPI, minor bugfixes, doc updates

commit b27ebe7
Merge: dd9922c 3701271
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Sun Feb 13 19:34:40 2022 +0100

    Merge pull request neuralhydrology#136 from kratzert/master

    automatic PyPI upload, bugfixes, doc updates

commit 0db41fb
Merge: 9870d9d dd9922c
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed Feb 9 21:40:26 2022 +0100

    Merge pull request neuralhydrology#71 from neuralhydrology/staging

    Rework docs, add issue templates, fix minor bugs

commit dd9922c
Merge: 4877e2c 778b26c
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed Feb 9 21:19:19 2022 +0100

    Merge pull request neuralhydrology#130 from kratzert/master

    Rework tutorials, fix git hash logging bug

commit 9870d9d
Merge: 6ac3d53 4877e2c
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Jan 10 15:47:05 2022 +0100

    Merge pull request neuralhydrology#57 from neuralhydrology/staging

    Update to v1.2.0

commit 4877e2c
Merge: 82da2bd f8ccfa8
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Mon Jan 10 15:27:59 2022 +0100

    Merge pull request neuralhydrology#121 from kratzert/master

    Update to version 1.2.0

commit 6ac3d53
Merge: d7ef31e 82da2bd
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed Dec 1 13:16:29 2021 +0100

    Merge pull request neuralhydrology#52 from neuralhydrology/staging

    Update to 1.1.0

commit 82da2bd
Merge: a83cc1a b268c84
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed Dec 1 13:06:01 2021 +0100

    Merge pull request neuralhydrology#111 from kratzert/master

    Push 1.1.0 to public

commit d7ef31e
Merge: 6fbd324 a83cc1a
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Sun Oct 24 22:07:14 2021 +0200

    Merge pull request neuralhydrology#50 from neuralhydrology/staging

    Remove pickle dependencies for scaler/id_to_int dicts, v.1.0.0 Release

commit a83cc1a
Merge: 09566b8 71a3bbb
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Sun Oct 24 21:38:30 2021 +0200

    Merge pull request neuralhydrology#108 from kratzert/master

    1.0.0 release to public

commit 6fbd324
Merge: 4a894d9 09566b8
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Aug 5 20:22:40 2021 +0200

    Merge pull request neuralhydrology#47 from neuralhydrology/staging

    Update data use in tutorials

commit 09566b8
Merge: 4c04c8c ae2a74d
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Thu Aug 5 20:07:16 2021 +0200

    Merge pull request neuralhydrology#100 from kratzert/master

    Update data use in tutorials

commit 4a894d9
Merge: b2b8faf 4c04c8c
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed May 19 15:59:36 2021 +0200

    Merge pull request neuralhydrology#41 from neuralhydrology/staging

    fix git requirement

commit 4c04c8c
Merge: df2f27f b4c9602
Author: Frederik Kratzert <kratzert@users.noreply.github.com>
Date:   Wed May 19 15:50:27 2021 +0200

    Merge pull request neuralhydrology#97 from kratzert/master

    fix git requirement in logger
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants