Merge code from branch refactor/xg-boost-model to refactor/major_change_with_k1st #186

phamhoangtuan · 2023-02-22T08:43:56Z

Pull Request Checklist

Before sending your pull requests, make sure you followed this list.

Read contributing guidelines.
Check if my changes are consistent with the guidelines.
Changes are consistent with the Coding Style.
Run Unit Tests.

Checklist for Pull Request

Describe what this PR purpose. For example, for new features describe what problem this PR solves. If there is JIRA task, please include JIRA link.
When there are more than one tasks in the PR, use to do list in github mark down.
Include unit tests. If small test files are needed for your unit tests, please include them as well. Be conservative in adding test files, try to make them small and local instead of putting it on S3 or external database.
Assign reviewer.

Running unit tests

Using tools and libraries installed directly on your system.
For example, to run all tests under graphengine, do:

nose2

…dels and modelers files

…ction to more smaller functions to be clearer and easier to read

… of OracleModel, add func to gen train data for ensembler

…e, update test case for fuzzy model

* feat: create multi_model wrapper and kCollaborator * fix: type annotations * fix: debug collaborator & multi model * feat: add compelete user code for collaborator and multi model

… for xgboost modeler (#178)

…me from list of series in MultiModel

* feat: add some useful ensemble model/modelers * feat: fix xgboost regression building and create classifier * feat: abstract data_key and output_key for all predicitive models * feat: allow collaborator ensemble modeling with explicit labelled_data field * feat: allow passed hyperparams to override grid search in xgboost

… result to int

…zzy model

…r fuzzy model

…s result_key

…es stats, deal with None ensemble in Oracle

…egression and RandomForest models predict

phamhoangtuan and others added 30 commits October 5, 2022 10:52

feat: add user code to user Oracle

11ac728

refactor: create OracleModel class, split students and ensemble to mo…

515dbca

…dels and modelers files

fix: add condition to build_model func in modeler

632adf5

fix: update modeler build_model function and model predict function

f8ee2c0

fix: update persist and load function of OracleModel

cd5be61

fix: fix bug version is overlapped, remove unused Oracle class

95fe02a

refactor: change param name to be clearer, split persist and load fun…

33b7966

…ction to more smaller functions to be clearer and easier to read

fix: rename ensemble to ensembler, add Oracle as backward compability…

28f05c4

… of OracleModel, add func to gen train data for ensembler

fix: fix FuzzyModel process rules function

299aea1

fix: update modeler build_model func comment, update test_oracle UT file

ff540fb

feat: add evaluation func to modeler

a823b36

fix: use logger from loguru, not logging; comment out UT for ts oracl…

2a4f5d8

…e, update test case for fuzzy model

feat: add ipython notebook to run Oracle with iris data

337cccf

feat: add ipython notebook to run oracle with azure iot data

f4501b8

fix: update tutorial to use new Oracle code

91c600d

fix: remove unused lib in TimeSeriesOracle

e1880fc

Merge branch 'main' into feat/oracle_with_fuzzy_refactor

e1650c7

feat: add loguru to pyproject

a0fc3ec

feat: create multi_model wrapper and kCollaborator (#173)

4c6b508

* feat: create multi_model wrapper and kCollaborator * fix: type annotations * fix: debug collaborator & multi model * feat: add compelete user code for collaborator and multi model

fix: change OracleModel to Oracle

070ecb4

feat: add xgboost model wrapper

4b59262

fix: remove tensorflow lib

b6b8e11

fix: change TimeSeriesOracleModel to TimeSeriesOracle

dbb16bf

fix: update Model and Modeler code for XGBoost based on Roshan code

54fa9eb

fix: change x to X in k-collaborator, reformat python code

ae8533c

feat: add Logical OR Ensemble model and modeler

54d851f

feat: create oracle similar to collaborator, add hyperparam ingestion…

948597d

… for xgboost modeler (#178)

fix: update var type in xgboost modeler

77012cf

fix: add name attribute to XGBoost model

f39cb45

fix: add name attribute to FuzzyModel, fix approach to create datafra…

dfca63a

…me from list of series in MultiModel

nubs01 and others added 26 commits January 12, 2023 12:01

fix: fix typo, add name to Model classes, change xgboost xgrid search…

f327074

… result to int

fix: add name property to Model, not Modeler

f81d869

fix: get student train data

7d43a6f

fix: k-colab can deal with prepared_data is None then only produce fu…

4c1e712

…zzy model

fix: deal with K-Oracle without prepared data then return only teache…

e116bdc

…r fuzzy model

fix: return empty df if no df to concat

e24d466

fix: add teacher model to Oracle

75d7be5

fix: XGBoost if no result key then get first column of y_train data a…

99d4339

…s result_key

fix: remove xgb grid search for hyperparam

c859704

fix: add input_features to stats when building model

768fd6e

fix: add input_features as columns of prepared_data X_train

2948493

fix: deal with None prepared_data in k-colab when saving input_featur…

4483a84

…es stats, deal with None ensemble in Oracle

fix: order input_features when persist multimodel

18b29af

fix: revert student_models.py

77f1703

fix: fix NA value when concat list of Series

6324f6b

fix: convert numpy.ndarray to pandas.DataFrame when running LogisticR…

37a5e9b

…egression and RandomForest models predict

fix: set default value for xgb

755391b

fix: add support parallel running when building k-colab and k-oracle

0cc1557

feat: Refactor XGB Model

047a4f8

fix: log

8453e91

fix: evaluate func

185dae0

refactor: Random forest model

1311283

feat: update random forest student model

047c22a

refactor: Logistic regression model

916b939

fix(multi-model): fix logic to append pred result

6ad1d13

phamhoangtuan self-assigned this Feb 22, 2023

merge: fix conflict when merging code

33e8a35

phamhoangtuan requested a review from hiro-v February 22, 2023 09:30

hiro-v merged commit 19de9c4 into refactor/major_change_with_k1st Feb 23, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge code from branch refactor/xg-boost-model to refactor/major_change_with_k1st #186

Merge code from branch refactor/xg-boost-model to refactor/major_change_with_k1st #186

phamhoangtuan commented Feb 22, 2023

Merge code from branch refactor/xg-boost-model to refactor/major_change_with_k1st #186

Merge code from branch refactor/xg-boost-model to refactor/major_change_with_k1st #186

Conversation

phamhoangtuan commented Feb 22, 2023

Pull Request Checklist

Running unit tests