From a4e62dc54a3a7407d1955cb0ff26cf458f772bdd Mon Sep 17 00:00:00 2001 From: joncrall Date: Sat, 11 Feb 2023 20:56:54 -0500 Subject: [PATCH 1/3] Start branch for 0.6.2 --- CHANGELOG.md | 5 ++++- netharn/__init__.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d1659a..eb31a9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,10 @@ This changelog follows the specifications detailed in: [Keep a Changelog](https: This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html), although we have not yet reached a `1.0.0` release. -## Version 0.6.1 - Unreleased +## Version 0.6.2 - Unreleased + + +## Version 0.6.1 - Released 2023-02-11 ### Fixed * Hotfix so the training loop doesnt crash when `ignore_first_epochs>0` diff --git a/netharn/__init__.py b/netharn/__init__.py index eefb53d..cbcfb64 100644 --- a/netharn/__init__.py +++ b/netharn/__init__.py @@ -4,7 +4,7 @@ mkinit netharn --noattrs --dry mkinit netharn --noattrs """ -__version__ = '0.6.1' +__version__ = '0.6.2' try: # PIL 7.0.0 removed PIL_VERSION, which breaks torchvision, monkey patch it -- GitLab From 3825c54b213277acfe13683b2e394f246807830d Mon Sep 17 00:00:00 2001 From: joncrall Date: Tue, 4 Apr 2023 23:11:42 -0400 Subject: [PATCH 2/3] Bump scriptconfig version --- netharn/fit_harn.py | 2 +- requirements/runtime.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/netharn/fit_harn.py b/netharn/fit_harn.py index 24c972e..a1fcc3e 100644 --- a/netharn/fit_harn.py +++ b/netharn/fit_harn.py @@ -2884,7 +2884,7 @@ class FitHarnPreferences(scfg.Config): # minimal default and a recommended default. The safe default is # statically defined to the minimum requirements, and recommended could # be manually or hueristically constructed. - default = { + __default__ = { 'keyboard_debug': scfg.Value(True, help=( 'Catch keyboard interupt with a somewhat-interactive prompt') ), diff --git a/requirements/runtime.txt b/requirements/runtime.txt index 880f514..ab552af 100644 --- a/requirements/runtime.txt +++ b/requirements/runtime.txt @@ -42,7 +42,7 @@ imageio < 2.8.0;python_version < '3.0' # imgaug < 0.3.0;python_version < '3.0' # NOTE: in the future kwplot may become optional -scriptconfig >= 0.7.0 +scriptconfig >= 0.7.6 kwarray>=0.6.7 kwimage >= 0.9.7 # kwplot >= 0.4.12 -- GitLab From a301ab6f5c49093196ee87ec6766fa4bc9ca54bd Mon Sep 17 00:00:00 2001 From: joncrall Date: Wed, 5 Apr 2023 01:21:29 -0400 Subject: [PATCH 3/3] wip --- netharn/fit_harn.py | 9 +++++---- requirements/runtime.txt | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/netharn/fit_harn.py b/netharn/fit_harn.py index a1fcc3e..bc48d01 100644 --- a/netharn/fit_harn.py +++ b/netharn/fit_harn.py @@ -2109,11 +2109,12 @@ class CoreMixin(object): # This should be fixed in progiter. steps_taken = (bx - prog._iter_idx) + 1 if bx == 0: + prog.step(steps_taken, force=True) # HACK, after ubelt 0.9.3 we can use force=True - prog._iter_idx += steps_taken - prog._update_measurements() - prog._update_estimates() - prog.display_message() + # prog._iter_idx += steps_taken + # prog._update_measurements() + # prog._update_estimates() + # prog.display_message() harn.debug(prog.format_message().strip()) else: prog_updated = prog.update(steps_taken) diff --git a/requirements/runtime.txt b/requirements/runtime.txt index ab552af..4aa9ee8 100644 --- a/requirements/runtime.txt +++ b/requirements/runtime.txt @@ -28,7 +28,7 @@ numpy>=1.23.2 ; python_version < '4.0' and python_version >= '3.11' # Pytho numpy>=1.21.6 ; python_version < '3.11' and python_version >= '3.10' # Python 3.10 numpy>=1.19.3 ; python_version < '3.10' and python_version >= '3.6' # Python 3.6 - 3.9 -ubelt>=1.2.3 +ubelt>=1.2.4 parse >= 1.12.0 pyflakes >= 2.4.0 -- GitLab