diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50a714155367575b12ac0e8f1ae3556efc0826c0..a991863f2e9d972bf66de606567b2e6753c4ca14 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,8 +76,6 @@ stages: - python -V # Print out python version for debugging - pip install --progress-bar off -r requirements.txt - pip install . - # FIXME: we should start from a docker iamge that already has LibGL setup - - apt update && apt install libgl1-mesa-glx -y && rm -rf /var/lib/apt/lists/* script: - ./run_tests.py @@ -164,8 +162,9 @@ stages: - GLKWS=$CI_KITWARE_SECRET openssl enc -aes-256-cbc -pbkdf2 -md SHA512 -pass env:GLKWS -d -a -in dev/ci_secret_gpg_key.pgp.enc | $GPG_EXECUTABLE --import - $GPG_EXECUTABLE --list-keys || echo "first one fails for some reason" - $GPG_EXECUTABLE --list-keys + - pip install requests[security] twine # The publish script only builds wheels and does gpg signing if TAG_AND_UPLOAD is False - - MB_PYTHON_TAG=$MB_PYTHON_TAG USE_GPG=True GPG_KEYID=$GPG_KEYID TWINE_PASSWORD=$TWINE_PASSWORD TWINE_USERNAME=$TWINE_USERNAME GPG_EXECUTABLE=$GPG_EXECUTABLE DEPLOY_BRANCH=release TAG_AND_UPLOAD=False ./publish.sh + - MB_PYTHON_TAG=$MB_PYTHON_TAG DO_GPG=True GPG_KEYID=$GPG_KEYID TWINE_PASSWORD=$TWINE_PASSWORD TWINE_USERNAME=$TWINE_USERNAME GPG_EXECUTABLE=$GPG_EXECUTABLE DEPLOY_BRANCH=release DO_TAG=False DO_UPLOAD=False ./publish.sh artifacts: paths: @@ -208,7 +207,7 @@ stages: - pip install six pyopenssl ndg-httpsclient pyasn1 -U - pip install requests[security] twine # Execute the publish script for real this time - - MB_PYTHON_TAG=$MB_PYTHON_TAG USE_GPG=True GPG_KEYID=$GPG_KEYID TWINE_PASSWORD=$TWINE_PASSWORD TWINE_USERNAME=$TWINE_USERNAME GPG_EXECUTABLE=$GPG_EXECUTABLE CURRENT_BRANCH=release DEPLOY_BRANCH=release TAG_AND_UPLOAD=yes ./publish.sh + - MB_PYTHON_TAG=$MB_PYTHON_TAG DO_GPG=True GPG_KEYID=$GPG_KEYID TWINE_PASSWORD=$TWINE_PASSWORD TWINE_USERNAME=$TWINE_USERNAME GPG_EXECUTABLE=$GPG_EXECUTABLE CURRENT_BRANCH=release DEPLOY_BRANCH=release DO_TAG=True DO_UPLOAD=True ./publish.sh # Have the server git-tag the release and push the tags - VERSION=$(python -c "import setup; print(setup.VERSION)") # do sed twice to handle the case of https clone with and without a read token @@ -237,13 +236,13 @@ build/cp38-cp38-linux: <<: - *build_template image: - python:3.8 + gitlab.kitware.com:4567/computer-vision/ci-docker/gl-python:3.8 test_full/cp38-cp38-linux: <<: - *test_full_template image: - python:3.8 + gitlab.kitware.com:4567/computer-vision/ci-docker/gl-python:3.8 # for universal builds we only need to gpg sign once @@ -251,13 +250,13 @@ gpgsign/cp38-cp38-linux: <<: - *gpgsign_template image: - python:3.8 + gitlab.kitware.com:4567/computer-vision/ci-docker/gl-python:3.8 deploy/cp38-cp38-linux: <<: - *deploy_template image: - python:3.8 + gitlab.kitware.com:4567/computer-vision/ci-docker/gl-python:3.8 # --------------- @@ -267,13 +266,13 @@ build/cp37-cp37m-linux: <<: - *build_template image: - python:3.7 + gitlab.kitware.com:4567/computer-vision/ci-docker/gl-python:3.7 test_full/cp37-cp37m-linux: <<: - *test_full_template image: - python:3.7 + gitlab.kitware.com:4567/computer-vision/ci-docker/gl-python:3.7 # --------------- @@ -283,23 +282,23 @@ build/cp36-cp36m-linux: <<: - *build_template image: - python:3.6 + gitlab.kitware.com:4567/computer-vision/ci-docker/gl-python:3.6 test_full/cp36-cp36m-linux: <<: - *test_full_template image: - python:3.6 + gitlab.kitware.com:4567/computer-vision/ci-docker/gl-python:3.6 #gpgsign/cp36-cp36m-linux: # <<: # - *gpgsign_template # image: -# python:3.6 +# gitlab.kitware.com:4567/computer-vision/ci-docker/gl-python:3.6 #deploy/cp36-cp36m-linux: # <<: # - *deploy_template # image: -# python:3.6 +# gitlab.kitware.com:4567/computer-vision/ci-docker/gl-python:3.6 diff --git a/CHANGELOG.md b/CHANGELOG.md index 9473db9b93476455452b811b23ff1b2c1868c034..4a543da17211b1021752da5d058bca1e000db69c 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.5.14 - Unreleased +## Version 0.5.15 - Unreleased + + +## Version 0.5.14 - Released 2021-01-21 ### Deprecated diff --git a/netharn/__init__.py b/netharn/__init__.py index 427c4c2d50f7ef5034776631dfd4bc00be53a612..cc7c5ef59400dc0e462a2dc9aeeed07acc9c60f3 100644 --- a/netharn/__init__.py +++ b/netharn/__init__.py @@ -4,7 +4,7 @@ mkinit netharn --noattrs --dry mkinit netharn --noattrs """ -__version__ = '0.5.14' +__version__ = '0.5.15' try: # PIL 7.0.0 removed PIL_VERSION, which breaks torchvision, monkey patch it diff --git a/netharn/fit_harn.py b/netharn/fit_harn.py index 3f641a090d7b91f99aa2481ecc315b3a2b3aaa25..f30bc6e4e51cef03a64229f1b8e0619d2ac4a9a8 100644 --- a/netharn/fit_harn.py +++ b/netharn/fit_harn.py @@ -2100,8 +2100,9 @@ class CoreMixin(object): if harn.preferences['log_resources']: usage = util.resource_usage() key = 'ram' - value = usage['ram_percent'] - harn.log_value(tag + ' epoch ' + key, value, harn.epoch) + if 'ram_percent' in usage: + value = usage['ram_percent'] + harn.log_value(tag + ' epoch ' + key, value, harn.epoch) harn.debug(ub.repr2(usage, nl=1)) prog.refresh() diff --git a/super_setup.py b/super_setup.py index 77e747ad5bb770d8d23717b35c873270eb10c8ee..cd8aa644fad94f22909c66a134451a7c746f66a5 100755 --- a/super_setup.py +++ b/super_setup.py @@ -768,7 +768,7 @@ def determine_code_dpath(): DEVEL_REPOS = [ # The util libs { - 'name': 'kwarray', 'branch': 'dev/0.5.14', 'remote': 'public', + 'name': 'kwarray', 'branch': 'dev/0.5.15', 'remote': 'public', 'remotes': {'public': 'git@gitlab.kitware.com:computer-vision/kwarray.git'}, }, { @@ -804,13 +804,13 @@ DEVEL_REPOS = [ 'remotes': {'public': 'git@gitlab.kitware.com:utils/scriptconfig.git'}, }, { - 'name': 'ndsampler', 'branch': 'dev/0.5.12', 'remote': 'public', + 'name': 'ndsampler', 'branch': 'dev/0.5.14', 'remote': 'public', 'remotes': {'public': 'git@gitlab.kitware.com:computer-vision/ndsampler.git'}, }, # netharn - training harness { - 'name': 'netharn', 'branch': 'dev/0.5.14', 'remote': 'public', + 'name': 'netharn', 'branch': 'dev/0.5.15', 'remote': 'public', 'remotes': {'public': 'git@gitlab.kitware.com:computer-vision/netharn.git'}, }, ]