Merge pull request bsc-wdc#349 from gcasadesus/save-models

Save models and RandomForestRegressor
tirkarthi · Aug 9, 2021 · 8b34f9c · 8b34f9c
2 parents 64faec6 + 4a44cd3
commit 8b34f9c
Show file tree

Hide file tree

Showing 25 changed files with 3,147 additions and 864 deletions.
diff --git a/.gitignore b/.gitignore
@@ -112,6 +112,7 @@ target/
 *compss*.out
 *compss*.err
 
+
 # ========== C & C++ ignores =================
 # Prerequisites
 *.d

diff --git a/Dockerfile b/Dockerfile
@@ -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

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -11,7 +11,7 @@ def setGithubCommitStatus(state, description) {
 
 pipeline {
     options {
-        timeout(time: 4, unit: 'HOURS')
+        timeout(time: 3, unit: 'HOURS')
     }
     agent {
         node {

diff --git a/dislib/classification/__init__.py b/dislib/classification/__init__.py
@@ -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"]
diff --git a/dislib/classification/csvm/base.py b/dislib/classification/csvm/base.py
@@ -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

diff --git a/dislib/classification/rf/_data.py b/dislib/classification/rf/_data.py