Skip to content
This repository has been archived by the owner on Jan 13, 2024. It is now read-only.

Commit

Permalink
fix asv configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
sdpython committed Oct 12, 2019
1 parent 854e1ec commit cc40922
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 5 deletions.
1 change: 0 additions & 1 deletion mlprodict/asv_benchmark/asv.conf.json
Expand Up @@ -75,7 +75,6 @@
"cython": [],
"jinja2": [],
"joblib": [],
"mlprodict": ["git+https://github.com/sdpython/mlprodict.git"],
"numpy": [],
"onnx": [],
"onnxruntime": [],
Expand Down
1 change: 0 additions & 1 deletion mlprodict/asv_benchmark/create_asv.py
Expand Up @@ -44,7 +44,6 @@
"cython": [],
"jinja2": [],
"joblib": [],
"mlprodict": ["git+https://github.com/sdpython/mlprodict.git"],
"numpy": [],
"onnx": [],
"onnxruntime": [],
Expand Down
14 changes: 13 additions & 1 deletion mlprodict/cli/asv_bench.py
Expand Up @@ -36,7 +36,8 @@ def asv_bench(location='asvsklonnx', opset_min=9, opset_max=None,
limits the test to one specific number types
:param fLOG: logging function
:param clean: clean the folder first, otherwise overwrites the content
:param conf_params: to overwrite some of the configuration parameters
:param conf_params: to overwrite some of the configuration parameters,
format ``name,value;name2,value2``
:param flat: one folder for all files or subfolders
:param build: location of the outputs (env, html, results)
:return: created files
Expand Down Expand Up @@ -98,6 +99,17 @@ def fct_filter_exp3(m, p):
else:
raise ValueError("dtype must be empty, 32, 64 not '{}'.".format(dtype))

if conf_params is not None:
res = {}
kvs = conf_params.split(';')
for kv in kvs:
spl = kv.split(',')
if len(spl) != 2:
raise ValueError("Unable to interpret '{}'.".format(kv))
k, v = spl
res[k] = v
conf_params = res

if verbose <= 1:
logger = getLogger('skl2onnx')
logger.disabled = True
Expand Down
4 changes: 2 additions & 2 deletions requirements_conda.txt
Expand Up @@ -6,8 +6,8 @@ jupyter
matplotlib
notebook>=5.0.0
numba
numpy>=1.16.0
numpy>=1.17.2
pillow
scikit-learn>=0.21
scikit-learn>=0.21.3
scipy
Sphinx

0 comments on commit cc40922

Please sign in to comment.