From 3336172b6ac0e7556f516cf13af0500bf6f2b400 Mon Sep 17 00:00:00 2001 From: Alejandro Saucedo Date: Tue, 8 Sep 2020 13:46:35 +0100 Subject: [PATCH 1/6] Updated pinned versions --- doc/source/servers/sklearn.md | 7 +++++-- doc/source/servers/xgboost.md | 5 ++++- servers/sklearnserver/sklearnserver/requirements.txt | 4 ++-- servers/xgboostserver/xgboostserver/requirements.txt | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/doc/source/servers/sklearn.md b/doc/source/servers/sklearn.md index 5d1d558ba3..f651a3498d 100644 --- a/doc/source/servers/sklearn.md +++ b/doc/source/servers/sklearn.md @@ -5,7 +5,10 @@ If you have a trained SKLearn model saved as a pickle you can deploy it simply u Pre-requisites: * The model pickle must be saved using joblib and presently be named `model.joblib` - * We presently use sklearn version 0.23.2. Your pickled model must be compatible with this version + * Installed dependencies (may not work if versions don't match): + + sklearn == 0.23.2 + + joblib == 0.16.0 + + numpy == 1.13.3 An example for a saved Iris prediction model: @@ -105,4 +108,4 @@ If you wish the server image for the sklearn server to be globally changed you c rest: defaultImageVersion: "1.2.3" image: seldonio/sklearnserver_rest -``` \ No newline at end of file +``` diff --git a/doc/source/servers/xgboost.md b/doc/source/servers/xgboost.md index ad7b05fd74..58d32bad09 100644 --- a/doc/source/servers/xgboost.md +++ b/doc/source/servers/xgboost.md @@ -4,10 +4,13 @@ If you have a trained XGBoost model saved you can deploy it simply using Seldon' Prequisites: - * Use xgboost v0.82 * The model must be named `model.bst` * You must save your model using `bst.save_model(file_path)` * The model is loaded with `xgb.Booster(model_file=model_file)` + * Dependencies (otherwise it may not work): + + scikit-learn == 0.20.3 + + numpy == 1.15.4 + + xgboost == 1.0.1 An example for a saved Iris prediction model: diff --git a/servers/sklearnserver/sklearnserver/requirements.txt b/servers/sklearnserver/sklearnserver/requirements.txt index cca3f88dab..4534bfb6af 100644 --- a/servers/sklearnserver/sklearnserver/requirements.txt +++ b/servers/sklearnserver/sklearnserver/requirements.txt @@ -1,5 +1,5 @@ seldon_core scikit-learn == 0.23.2 -numpy >= 1.8.2 -joblib >= 0.13.0 +numpy == 1.13.3 +joblib == 0.16.0 diff --git a/servers/xgboostserver/xgboostserver/requirements.txt b/servers/xgboostserver/xgboostserver/requirements.txt index c765418a39..47956c7650 100644 --- a/servers/xgboostserver/xgboostserver/requirements.txt +++ b/servers/xgboostserver/xgboostserver/requirements.txt @@ -1,3 +1,3 @@ scikit-learn == 0.20.3 -numpy >= 1.8.2 +numpy == 1.15.4 xgboost == 1.0.1 From 0aad072b44142d536fa6fde5eb8569ad5ec6bc93 Mon Sep 17 00:00:00 2001 From: Alejandro Saucedo Date: Tue, 8 Sep 2020 16:28:35 +0100 Subject: [PATCH 2/6] Pinned back xgboost lib --- servers/xgboostserver/xgboostserver/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/xgboostserver/xgboostserver/requirements.txt b/servers/xgboostserver/xgboostserver/requirements.txt index 47956c7650..c765418a39 100644 --- a/servers/xgboostserver/xgboostserver/requirements.txt +++ b/servers/xgboostserver/xgboostserver/requirements.txt @@ -1,3 +1,3 @@ scikit-learn == 0.20.3 -numpy == 1.15.4 +numpy >= 1.8.2 xgboost == 1.0.1 From 9fa30e8201ac647ad3f7221371e2752e4c0a2531 Mon Sep 17 00:00:00 2001 From: Alejandro Saucedo Date: Tue, 8 Sep 2020 22:00:56 +0100 Subject: [PATCH 3/6] Reverted numpy to be gt --- doc/source/servers/sklearn.md | 2 +- servers/sklearnserver/sklearnserver/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/servers/sklearn.md b/doc/source/servers/sklearn.md index f651a3498d..c54f9469c2 100644 --- a/doc/source/servers/sklearn.md +++ b/doc/source/servers/sklearn.md @@ -8,7 +8,7 @@ Pre-requisites: * Installed dependencies (may not work if versions don't match): + sklearn == 0.23.2 + joblib == 0.16.0 - + numpy == 1.13.3 + + numpy >= 1.8.2 An example for a saved Iris prediction model: diff --git a/servers/sklearnserver/sklearnserver/requirements.txt b/servers/sklearnserver/sklearnserver/requirements.txt index 4534bfb6af..1f470687c3 100644 --- a/servers/sklearnserver/sklearnserver/requirements.txt +++ b/servers/sklearnserver/sklearnserver/requirements.txt @@ -1,5 +1,5 @@ seldon_core scikit-learn == 0.23.2 -numpy == 1.13.3 +numpy >= 1.8.2 joblib == 0.16.0 From 59a07486f496867024c63520903f05ec797ef8de Mon Sep 17 00:00:00 2001 From: Alejandro Saucedo Date: Thu, 10 Sep 2020 16:04:47 +0100 Subject: [PATCH 4/6] Updated xgboost to 1.2.0 --- .../routers/case_study/models/xgb_model/requirements.txt | 6 ++---- doc/source/servers/xgboost.md | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/components/routers/case_study/models/xgb_model/requirements.txt b/components/routers/case_study/models/xgb_model/requirements.txt index c9636a75ed..7569ac3948 100644 --- a/components/routers/case_study/models/xgb_model/requirements.txt +++ b/components/routers/case_study/models/xgb_model/requirements.txt @@ -1,4 +1,2 @@ -scikit-learn==0.20.1 -numpy==1.15.1 -scipy==1.1.0 -xgboost==0.81 +numpy >= 1.8.2 +xgboost==1.2.0 diff --git a/doc/source/servers/xgboost.md b/doc/source/servers/xgboost.md index 58d32bad09..913aaef628 100644 --- a/doc/source/servers/xgboost.md +++ b/doc/source/servers/xgboost.md @@ -10,7 +10,7 @@ Prequisites: * Dependencies (otherwise it may not work): + scikit-learn == 0.20.3 + numpy == 1.15.4 - + xgboost == 1.0.1 + + xgboost == 1.2.0 An example for a saved Iris prediction model: From c12689a35dc1f405f4a1de083471d619095b4523 Mon Sep 17 00:00:00 2001 From: Alejandro Saucedo Date: Fri, 11 Sep 2020 16:47:57 +0100 Subject: [PATCH 5/6] Update sklearn.md --- doc/source/servers/sklearn.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/servers/sklearn.md b/doc/source/servers/sklearn.md index c54f9469c2..1f71aaad56 100644 --- a/doc/source/servers/sklearn.md +++ b/doc/source/servers/sklearn.md @@ -6,7 +6,7 @@ Pre-requisites: * The model pickle must be saved using joblib and presently be named `model.joblib` * Installed dependencies (may not work if versions don't match): - + sklearn == 0.23.2 + + scikit-learn == 0.23.2 + joblib == 0.16.0 + numpy >= 1.8.2 From c90ece23b92b6b563a80d7daedf0c445c57a2525 Mon Sep 17 00:00:00 2001 From: Alejandro Saucedo Date: Thu, 17 Sep 2020 10:23:50 +0100 Subject: [PATCH 6/6] Update xgboost.md --- doc/source/servers/xgboost.md | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/source/servers/xgboost.md b/doc/source/servers/xgboost.md index 913aaef628..a4eb1eee57 100644 --- a/doc/source/servers/xgboost.md +++ b/doc/source/servers/xgboost.md @@ -8,7 +8,6 @@ Prequisites: * You must save your model using `bst.save_model(file_path)` * The model is loaded with `xgb.Booster(model_file=model_file)` * Dependencies (otherwise it may not work): - + scikit-learn == 0.20.3 + numpy == 1.15.4 + xgboost == 1.2.0