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.

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

Register layers with register_keras_serializable #49

Merged
merged 4 commits into from
Nov 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file removed .ci/secret.tar.enc
Binary file not shown.
19 changes: 0 additions & 19 deletions .codecov.yml

This file was deleted.

89 changes: 89 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
name: CI testing
on:
pull_request: {}
push:
branches:
- main
- release-candidate-*
tags:
- v*
workflow_dispatch:
inputs:
debug_enabled:
description: Run the build with SSH debugging enabled
required: false
default: false

jobs:
static:
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- uses: nengo/nengo-bones/actions/setup@main
with:
python-version: "3.9"
- uses: nengo/nengo-bones/actions/generate-and-check@main
- uses: nengo/nengo-bones/actions/run-script@main
with:
name: static
test:
needs:
- static
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
matrix:
include:
- script: remote-test
tf-version: tensorflow
python-version: "3.9"
coverage-name: remote-test
- script: test
tf-version: tensorflow
python-version: "3.9"
coverage-name: test-latest
- script: test
tf-version: tensorflow==2.1.0
python-version: "3.6"
coverage-name: test-old
- script: test
tf-version: tensorflow~=2.6.0
python-version: "3.9"
coverage-name: test-2.6
- script: remote-docs
tf-version: tensorflow
python-version: "3.9"
- script: remote-examples
tf-version: tensorflow
python-version: "3.9"
fail-fast: false
env:
TF_VERSION: ${{ matrix.tf-version }}
SSH_KEY: ${{ secrets.SSH_KEY }}
SSH_CONFIG: ${{ secrets.SSH_CONFIG }}
GH_TOKEN: ${{ secrets.GH_TOKEN }}
steps:
- uses: nengo/nengo-bones/actions/setup@main
with:
python-version: ${{ matrix.python-version }}
- uses: nengo/nengo-bones/actions/generate-and-check@main
- name: Write secrets to file
run: |
mkdir -p ~/.ssh
echo '${{ secrets.AZURE_PEM }}' > ~/.ssh/azure.pem
- uses: nengo/nengo-bones/actions/run-script@main
with:
name: ${{ matrix.script }}
- uses: actions/upload-artifact@v3
if: ${{ always() && matrix.coverage-name }}
with:
name: coverage-${{ matrix.coverage-name }}
path: .coverage
coverage:
runs-on: ubuntu-latest
timeout-minutes: 10
needs:
- test
if: ${{ always() }}
steps:
- uses: nengo/nengo-bones/actions/coverage-report@main
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ keras_lmu.egg-info
*.ipynb_checkpoints
__pycache__
/.idea
/bones-scripts
/docs/_build
/secret
/tmp
/.ci
36 changes: 0 additions & 36 deletions .nengobones.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,36 +62,6 @@ docs_conf_py:
sphinx_options:
autodoc_inherit_docstrings: False

travis_yml:
python: 3.8
global_vars:
TF_VERSION: tensorflow
jobs:
- script: static
- script: remote-test
- script: test
env:
TF_VERSION: tensorflow==2.1.0
python: 3.6
- script: test
env:
TF_VERSION: tensorflow~=2.6.0
- script: remote-docs
- script: remote-examples
pypi_user: __token__
slack_notifications: "wZ7l/X7cVeetmwfup7vCeN74pqFGMC5eaJfy/aqRwVGCbY3aHQKoqJaBBrVef\
c+DsJwPPM9HIOGs7jkPY+Y1pFbklAhWCDCvmc+f3fL4/yPWK1u7r8IIHhM3O0YvYrEHfFfZn+V1nAomx1\
/wttFOr07LLffaNOn+sFzXgKP1Ebv5MrlCNGY0q3T2A38pwXus60GXaGalI/I/a/vjRdkEmq38eIMqLl0\
v94oCy67Gqb/5mlB8eT6SffLGoFCctNpC9G9jyh/eRQp+B+YwksjZz+SOQTIy/mOlk8fU1ZL4f9wPguXh\
eKznckuvX+J0o+o5kspyrQveWW2lo1VjmnFfdifCVjTj4AIcmc60Zb2dMzzBcfcA+zeVlhWkWbB65LuuX\
kfxxsN97EwP5KVH+Lw7c2ycUyHV8XvKHNzVRLIUuVeOTKLHgGpkVgz/WasT5yBOEbnAyZxxAHQpMbXQr9\
POwaq92Kwb7du0sLcsP4agdd2L0YACb4JdwQeeD1c8h6RrXua2ejBJ41e+9ZkZcZGad9P6YVmxvI+hddd\
jdzzvBWq6+B/Ubft9AqQXmn4pg0fKkZLjrzsSYGRhXzINxhVBjZD8b5BQIb/Aeix3IFhLmDdSQMhjdETA\
gL3jSd9D5t1G5QNp4AdbitqcH+yNoXzZCXye76hrwYr6yrHi3JN9yrM="
deploy_dists:
- sdist
- bdist_wheel

ci_scripts:
- template: static
- template: docs
Expand All @@ -104,7 +74,6 @@ ci_scripts:
remote_script: test
output_name: remote-test
host: azure
travis_var_key: 2895d60e3414
azure_name: nengo-dl
azure_group: nengo-ci
coverage: true
Expand All @@ -118,7 +87,6 @@ ci_scripts:
remote_script: docs
output_name: remote-docs
host: azure-docs
travis_var_key: 2895d60e3414
azure_name: nengo-dl-docs
azure_group: nengo-ci
remote_setup:
Expand All @@ -128,15 +96,11 @@ ci_scripts:
remote_script: examples
output_name: remote-examples
host: azure-examples
travis_var_key: 2895d60e3414
azure_name: nengo-dl-examples
azure_group: nengo-ci
remote_setup:
- conda install -y -c conda-forge cudatoolkit=11.3 cudnn=8.2
- export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:\$CONDA_PREFIX/lib
- template: deploy

codecov_yml: {}

pre_commit_config_yaml: {}

Expand Down
120 changes: 0 additions & 120 deletions .travis.yml

This file was deleted.

9 changes: 9 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,15 @@ Release history
0.4.3 (unreleased)
==================

*Compatible with TensorFlow 2.1 - 2.10*

**Added**

- Layers are registered with the Keras serialization system (no longer need to
be passed as ``custom_objects``). (`#49`_)

.. _#49: https://github.com/nengo/keras-lmu/pull/49

0.4.2 (May 17, 2022)
====================

Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ prune .github
prune .tox
prune .eggs
prune .ci
prune bones-scripts

# Exclude auto-generated files
recursive-exclude docs *.py
Expand Down
31 changes: 30 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,36 @@
html_theme_options = {
"nengo_logo": "general-full-light.svg",
"nengo_logo_color": "#a8acaf",
"tagmanager_id": "GTM-KWCR2HN",
"analytics": """
<!-- Google tag (gtag.js) -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-GT8XEDLTMJ"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'G-GT8XEDLTMJ');
</script>
<!-- End Google tag (gtag.js) -->
<!-- Matomo -->
<script>
var _paq = window._paq = window._paq || [];
_paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
_paq.push(["setCookieDomain", "*.appliedbrainresearch.com"]);
_paq.push(["setDomains", ["*.appliedbrainresearch.com","*.edge.nengo.ai","*.forum.nengo.ai","*.labs.nengo.ai","*.nengo.ai"]]);
_paq.push(["enableCrossDomainLinking"]);
_paq.push(["setDoNotTrack", true]);
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="https://appliedbrainresearch.matomo.cloud/";
_paq.push(['setTrackerUrl', u+'matomo.php']);
_paq.push(['setSiteId', '3']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.async=true; g.src='//cdn.matomo.cloud/appliedbrainresearch.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<!-- End Matomo Code -->
""",
}
html_redirects = [
("getting_started.html", "getting-started.html"),
Expand Down
Loading