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

Save models and RandomForestRegressor #349

Merged
merged 51 commits into from
Aug 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
7430eef
Added saving and loading utils
gcasadesus Jul 16, 2021
f68c847
Format and doc changes
gcasadesus Jul 19, 2021
2b4e097
cbor2 not always required
gcasadesus Jul 19, 2021
d2b036d
Install dislib requirements
gcasadesus Jul 21, 2021
30da467
Added directory to save models during testing.
gcasadesus Jul 21, 2021
86e9492
Install requirements using pip3.
gcasadesus Jul 21, 2021
4e8ad6e
Changed environment language.
gcasadesus Jul 21, 2021
7760772
Changed Jenkins timeout from 2h to 3h
gcasadesus Jul 21, 2021
3cb436d
Merge branch 'master' into save-models
gcasadesus Jul 23, 2021
55385a7
Changed names of constant variables
gcasadesus Jul 23, 2021
bad4ca1
Merge branch 'save-models' of github.com:gcasadesus/dislib into save-…
gcasadesus Jul 23, 2021
ee43f76
Merge branch 'master' into save-models
gcasadesus Jul 26, 2021
8b22122
Add RF Classifier and started modifying _data.py
gcasadesus Jul 21, 2021
5487ab0
Added DecisionTreeRegressor with MSE criterion
gcasadesus Jul 22, 2021
606de7c
Added RandomForestRegressor
gcasadesus Jul 23, 2021
c9250a3
Added RF to a new 'commons' module
gcasadesus Jul 26, 2021
8c738dc
Removed RF from 'classification' and 'regression'
gcasadesus Jul 26, 2021
79981db
Edited tests.
gcasadesus Jul 26, 2021
6eaac6c
Changed tests and file names in commons/rf
gcasadesus Jul 27, 2021
676530b
Modified test_saving.py to raise ModuleNotFound
gcasadesus Jul 27, 2021
3476dbe
Reduced saving tests and added tests for RFRegr
gcasadesus Jul 28, 2021
4b3126f
Merge branch 'master' into save-models
gcasadesus Jul 29, 2021
efcfa1f
Added tests for RF dataset
gcasadesus Jul 30, 2021
95538b6
Added setup and teardown for saving tests.
gcasadesus Jul 30, 2021
1c8f7ef
Updated user guide with RF Regressor
gcasadesus Aug 2, 2021
89b6db3
Added saving and loading utils
gcasadesus Jul 16, 2021
2b9f8f3
Format and doc changes
gcasadesus Jul 19, 2021
6dbd625
cbor2 not always required
gcasadesus Jul 19, 2021
004e713
Install dislib requirements
gcasadesus Jul 21, 2021
456e783
Added directory to save models during testing.
gcasadesus Jul 21, 2021
e67cfa1
Install requirements using pip3.
gcasadesus Jul 21, 2021
addf6d5
Changed environment language.
gcasadesus Jul 21, 2021
8e40e41
Changed Jenkins timeout from 2h to 3h
gcasadesus Jul 21, 2021
eb852e6
Changed names of constant variables
gcasadesus Jul 23, 2021
db0db92
Add RF Classifier and started modifying _data.py
gcasadesus Jul 21, 2021
ff62b9b
Added DecisionTreeRegressor with MSE criterion
gcasadesus Jul 22, 2021
9969964
Added RandomForestRegressor
gcasadesus Jul 23, 2021
85d481b
Added RF to a new 'commons' module
gcasadesus Jul 26, 2021
b3c909e
Removed RF from 'classification' and 'regression'
gcasadesus Jul 26, 2021
f99f61b
Edited tests.
gcasadesus Jul 26, 2021
d5fae27
Changed tests and file names in commons/rf
gcasadesus Jul 27, 2021
25f68b3
Modified test_saving.py to raise ModuleNotFound
gcasadesus Jul 27, 2021
bab5e7c
Reduced saving tests and added tests for RFRegr
gcasadesus Jul 28, 2021
7ae3b9d
Added tests for RF dataset
gcasadesus Jul 30, 2021
fe86b92
Added setup and teardown for saving tests.
gcasadesus Jul 30, 2021
da90427
Updated user guide with RF Regressor
gcasadesus Aug 2, 2021
b79756f
Resolved conflicts with RF score
gcasadesus Aug 2, 2021
42893b7
Merge branch 'save-models' of github.com:gcasadesus/dislib into save-…
gcasadesus Aug 2, 2021
0445030
Added creation of features file
gcasadesus Aug 6, 2021
579f993
Added tests for decision tree
gcasadesus Aug 6, 2021
4a44cd3
Style changes
gcasadesus Aug 9, 2021
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ target/
*compss*.out
*compss*.err


# ========== C & C++ ignores =================
# Prerequisites
*.d
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ MAINTAINER COMPSs Support <support-compss@bsc.es>
COPY . dislib/

ENV PYTHONPATH=$PYTHONPATH:/dislib
ENV LC_ALL=C.UTF-8
RUN pip3 install -r /dislib/requirements.txt

# Expose SSH port and run SSHD
EXPOSE 22
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def setGithubCommitStatus(state, description) {

pipeline {
options {
timeout(time: 4, unit: 'HOURS')
timeout(time: 3, unit: 'HOURS')
}
agent {
node {
Expand Down
4 changes: 2 additions & 2 deletions dislib/classification/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from dislib.classification.csvm.base import CascadeSVM
from dislib.classification.rf.forest import RandomForestClassifier
from dislib.commons.rf.forest import RandomForestClassifier

__all__ = ['CascadeSVM', 'RandomForestClassifier']
__all__ = ["CascadeSVM", "RandomForestClassifier"]
2 changes: 1 addition & 1 deletion dislib/classification/csvm/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ def score(self, x, y, collect=False):
Test samples.
y : ds-array, shape=(n_samples, 1)
True labels for x.
collect : bool
collect : bool, optional (default=False)
When True, a synchronized result is returned.

Returns
Expand Down
304 changes: 0 additions & 304 deletions dislib/classification/rf/_data.py

This file was deleted.

Loading