Skip to content

Extension of benchmark parameters and output #19

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

Merged
merged 78 commits into from
Apr 10, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
08dbca7
Add data type and order choice for sklearn benchmarks
Alexsandruss Jan 15, 2020
c4da4a5
Fix absence of dtype property in pandas.DataFrame for distance
Alexsandruss Jan 15, 2020
8b451b3
JSON output and minor additions
Alexsandruss Jan 22, 2020
982b7f5
Code cleanup
Alexsandruss Jan 22, 2020
a213581
Minor corrections
Alexsandruss Jan 24, 2020
4d41e66
Runner creation
Alexsandruss Jan 24, 2020
f906596
Code cleanup
Alexsandruss Jan 24, 2020
8c3d5c2
Additional code cleanup
Alexsandruss Jan 24, 2020
4afb467
Change data passing method and unify output code
Alexsandruss Jan 25, 2020
c8896a0
Extension for daal4py benchmarks
Alexsandruss Jan 27, 2020
c3fe4bc
Add extensions for last algorithms
Alexsandruss Jan 28, 2020
4bf809e
cuML benchmarks and Makefile correction
Alexsandruss Jan 28, 2020
07f806f
Random Init for KMeans
Alexsandruss Jan 28, 2020
9feae57
KMeans and runner fixes
Alexsandruss Jan 28, 2020
b4833c4
Quotes correction
Alexsandruss Jan 28, 2020
954bf1d
Change of benchmarks runner and config format, corrections for set of…
Alexsandruss Jan 29, 2020
d12f441
Code corrections
Alexsandruss Jan 29, 2020
a173c02
cuML corrections and alpha parameter for Ridge
Alexsandruss Jan 30, 2020
c9bdb6f
cuML KMeans and LogReg benchmarks corrections
Alexsandruss Jan 30, 2020
aa55b50
Config parsing and runner changes
Alexsandruss Jan 30, 2020
5fbe3c6
Correct train-test splitting and accuracy score in SVC
Alexsandruss Jan 30, 2020
1554c02
Code formatting
Alexsandruss Jan 30, 2020
3900492
Runner output change
Alexsandruss Jan 30, 2020
0d60062
Licenses update
Alexsandruss Feb 3, 2020
1dd4957
Add comments in benchmarks runner and utils
Alexsandruss Feb 3, 2020
652e0c2
License correction
Alexsandruss Feb 3, 2020
d66d4a7
Correct make_datasets parameters and add comments in kmeans
Alexsandruss Feb 3, 2020
f01bbb3
Benchmarks output unification
Alexsandruss Feb 4, 2020
14ab5ca
Linear regression benchmarks correction
Alexsandruss Feb 4, 2020
43e34d8
Python scripts permissions change
Alexsandruss Feb 4, 2020
b5d43aa
Licenses and other corrections
Alexsandruss Feb 11, 2020
7856bd9
Correct naming in SVM cache calculation
Alexsandruss Feb 19, 2020
b438199
Change stderr handling in runner and file permissions
Alexsandruss Feb 19, 2020
b1bfde0
Add csv reading only for benchmarks and PCA benchmarks correction
Alexsandruss Feb 20, 2020
505c388
Change of datasets generation in runner
Alexsandruss Feb 20, 2020
4da134d
Runner modification
Alexsandruss Feb 21, 2020
0af82a9
DBSCAN benchmarks extension
Alexsandruss Feb 21, 2020
a29bb04
Add example of config
Alexsandruss Feb 21, 2020
9c02e92
Change strings formatting
Alexsandruss Feb 21, 2020
a4d0dcb
Correction of config example
Alexsandruss Feb 21, 2020
84fea04
kmeans intertia output fix
Alexsandruss Feb 21, 2020
a5a8abb
cuML PCA and DBSCAN benchmarks and minor corrections
Alexsandruss Feb 25, 2020
fb87f6e
change example config to unix format and runner modification
Alexsandruss Feb 25, 2020
fee25ad
Applying code style
Alexsandruss Feb 25, 2020
a3fa393
README update
Alexsandruss Feb 25, 2020
997a3c4
Correct strings formatting in LogReg
Alexsandruss Feb 25, 2020
7e03c65
Runner fix
Alexsandruss Feb 26, 2020
c9b852c
Add GPU info in runner output
Alexsandruss Feb 28, 2020
a581bea
Scores and other minor corrections
Alexsandruss Mar 2, 2020
b1e307a
Correction for 2d labels
Alexsandruss Mar 2, 2020
3768500
Software list in output
Alexsandruss Mar 2, 2020
5a23a19
Change len(y.shape) to y.ndim
Alexsandruss Mar 3, 2020
32056c6
Add kNN prediction benchmarks for sklearn and cuml
Alexsandruss Mar 4, 2020
bbfa306
Correct classes in knn bench
Alexsandruss Mar 4, 2020
dc58dc3
Naming correction in benchs
Alexsandruss Mar 4, 2020
ea78548
Modify csv reading
Alexsandruss Mar 6, 2020
829ad10
Forest benchmarks extension
Alexsandruss Mar 10, 2020
ce2f78c
daal4py forest benchs fix
Alexsandruss Mar 11, 2020
eaeab7a
Remove cpu freq from sw info
Alexsandruss Mar 11, 2020
d8c2a73
Fix for json generation fail on cuml<0.12
Alexsandruss Mar 12, 2020
1a80fcf
Add Gradient Boosted Trees from XGBoost
Alexsandruss Mar 13, 2020
346b6e8
Minor corrections for xgb benchs
Alexsandruss Mar 16, 2020
751249d
Extend time measurements and add box filter
Alexsandruss Mar 17, 2020
948de2d
Add OMP_NUM_THREADS for xgboost
Alexsandruss Mar 17, 2020
27e92e2
Correct runner environment
Alexsandruss Mar 17, 2020
b6be7be
Add dataset name in benchmarks
Alexsandruss Mar 18, 2020
9f08ef6
kmeans sklearn bench correction
Alexsandruss Mar 18, 2020
6e7abd3
Fix kmeans sklearn fitting
Alexsandruss Mar 18, 2020
562e47d
Fix for conda list reader
Alexsandruss Mar 20, 2020
03fd588
Fix of getFPType import for newer daal4py, distances benchs change
Alexsandruss Mar 22, 2020
a17644e
Box filter param fix
Alexsandruss Mar 22, 2020
9698e00
Runner changes (OMP env only for XGBoost and json decode error handling)
Alexsandruss Mar 23, 2020
9d28e8a
Synthetic datasets config change, OMP env. fix
Alexsandruss Mar 24, 2020
3e9be64
Remove OMP_THREADS env variable
Alexsandruss Mar 24, 2020
4dcd1ce
Add num-threads passing for xgboost benchmark
Alexsandruss Mar 27, 2020
1baf3fd
GetFPType fix
Alexsandruss Mar 27, 2020
d144bd8
Unset n_jobs for sklearn forests
Alexsandruss Apr 2, 2020
3aef98e
Modify OMP env variables setting
Alexsandruss Apr 8, 2020
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
Prev Previous commit
Next Next commit
Fix for json generation fail on cuml<0.12
  • Loading branch information
Alexsandruss committed Mar 12, 2020
commit d8c2a736b3ec65f2b99f27e78041dc3f7edcd1fc
2 changes: 2 additions & 0 deletions cuml/bench.py
Original file line number Diff line number Diff line change
Expand Up @@ -541,5 +541,7 @@ def print_output(library, algorithm, stages, columns, params, functions,
if 'init' in result['algorithm_parameters'].keys():
if not isinstance(result['algorithm_parameters']['init'], str):
result['algorithm_parameters']['init'] = 'random'
if 'handle' in result['algorithm_parameters'].keys():
del result['algorithm_parameters']['handle']
print(json.dumps(result, indent=4),
end=',\n' if i != len(stages) - 1 else '\n')
2 changes: 2 additions & 0 deletions daal4py/bench.py
Original file line number Diff line number Diff line change
Expand Up @@ -541,5 +541,7 @@ def print_output(library, algorithm, stages, columns, params, functions,
if 'init' in result['algorithm_parameters'].keys():
if not isinstance(result['algorithm_parameters']['init'], str):
result['algorithm_parameters']['init'] = 'random'
if 'handle' in result['algorithm_parameters'].keys():
del result['algorithm_parameters']['handle']
print(json.dumps(result, indent=4),
end=',\n' if i != len(stages) - 1 else '\n')
2 changes: 2 additions & 0 deletions sklearn/bench.py
Original file line number Diff line number Diff line change
Expand Up @@ -541,5 +541,7 @@ def print_output(library, algorithm, stages, columns, params, functions,
if 'init' in result['algorithm_parameters'].keys():
if not isinstance(result['algorithm_parameters']['init'], str):
result['algorithm_parameters']['init'] = 'random'
if 'handle' in result['algorithm_parameters'].keys():
del result['algorithm_parameters']['handle']
print(json.dumps(result, indent=4),
end=',\n' if i != len(stages) - 1 else '\n')