Skip to content

Commit 86f583d

Browse files
vloncarjmduarte
andauthored
New config_from_keras_model (#690)
* Don't set duplicate attributes * Expand the use of backend-specific attributes * Reorganize attributes a bit to remove duplicates * Move string conversion utilities to new module * Remove unnecessary init for activation attributes * New config_from_keras_model function * Remove config from parsers (no converters use it) * Save activation's quantizer config in the parser * Use keras parsing fn to build the initial config * Lowercase 'trace' attribute (removes duplicate) * Fix tests that fail due to config update * Update Jenkinsfile * Use ChoiceAttribute for convolution strategy * Try loading a different libdl.so on newer Linux boxes * Fix test output dirs * To future self: I'm sorry for this, but it was necessary * black + isort compatability Co-authored-by: Javier Duarte <[email protected]>
1 parent 1d282f7 commit 86f583d

35 files changed

+2779
-2099
lines changed

.pre-commit-config.yaml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ exclude: ^hls4ml\/templates\/(vivado|quartus)\/(ap_types|ac_types)\/
22

33
repos:
44
- repo: https://github.com/psf/black
5-
rev: 22.10.0
5+
rev: 22.12.0
66
hooks:
77
- id: black
88
language_version: python3
99
args: ['--line-length=125',
1010
'--skip-string-normalization']
1111

1212
- repo: https://github.com/pre-commit/pre-commit-hooks
13-
rev: v4.3.0
13+
rev: v4.4.0
1414
hooks:
1515
- id: check-added-large-files
1616
- id: check-case-conflict
@@ -24,18 +24,19 @@ repos:
2424
- id: trailing-whitespace
2525

2626
- repo: https://github.com/PyCQA/isort
27-
rev: 5.10.1
27+
rev: 5.11.4
2828
hooks:
2929
- id: isort
30+
args: ["--profile", "black", --line-length=125]
3031

3132
- repo: https://github.com/asottile/pyupgrade
32-
rev: v3.1.0
33+
rev: v3.3.1
3334
hooks:
3435
- id: pyupgrade
3536
args: ["--py36-plus"]
3637

3738
- repo: https://github.com/asottile/setup-cfg-fmt
38-
rev: v2.1.0
39+
rev: v2.2.0
3940
hooks:
4041
- id: setup-cfg-fmt
4142

@@ -46,10 +47,10 @@ repos:
4647
exclude: docs/conf.py
4748
additional_dependencies: [flake8-bugbear, flake8-print]
4849
args: ['--max-line-length=125', # github viewer width
49-
'--extend-ignore=E203'] # E203 is not PEP8 compliant
50+
'--extend-ignore=E203,T201'] # E203 is not PEP8 compliant
5051

5152
- repo: https://github.com/mgedmin/check-manifest
52-
rev: "0.48"
53+
rev: "0.49"
5354
hooks:
5455
- id: check-manifest
5556
stages: [manual]

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pipeline {
1515
dir(path: 'test') {
1616
sh '''#!/bin/bash --login
1717
conda activate hls4ml-py37
18-
pip install tensorflow
18+
pip install tensorflow pyparsing
1919
pip install -U ../ --user
2020
./convert-keras-models.sh -x -f keras-models.txt
2121
pip uninstall hls4ml -y'''

0 commit comments

Comments
 (0)