From ac1305d188ed8bbec31b16f503d6d317f4294943 Mon Sep 17 00:00:00 2001 From: Adrian Gonzalez-Martin Date: Tue, 7 Dec 2021 17:24:05 +0000 Subject: [PATCH 1/3] Tweak pipeline to generate MLflow artifact --- servers/mlflowserver/models/elasticnet_wine/Makefile | 6 +++++- .../mlflowserver/models/elasticnet_wine/output/.gitignore | 2 ++ servers/mlflowserver/models/elasticnet_wine/output/.keep | 0 .../mlflowserver/models/elasticnet_wine/requirements.txt | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 servers/mlflowserver/models/elasticnet_wine/output/.gitignore delete mode 100644 servers/mlflowserver/models/elasticnet_wine/output/.keep diff --git a/servers/mlflowserver/models/elasticnet_wine/Makefile b/servers/mlflowserver/models/elasticnet_wine/Makefile index a859823dd8..c197c20fcd 100644 --- a/servers/mlflowserver/models/elasticnet_wine/Makefile +++ b/servers/mlflowserver/models/elasticnet_wine/Makefile @@ -14,12 +14,16 @@ train: collect: cp metadata.yaml output/ - cp conda.yaml output/ cd mlruns && find . -name "MLmodel" -type f -exec cp {} ../output \; + cd mlruns && find . -name "conda.yaml" -type f -exec cp {} ../output \; cd mlruns && find . -name "model.pkl" -type f -exec cp {} ../output \; + cd output && \ + conda env create --force -n elasticnet-wine-env -f conda.yaml && \ + conda-pack -n elasticnet-wine-env -f -o environment.tar.gz upload: gsutil -m cp output/conda.yaml gs://seldon-models/v${VERSION}/mlflow/elasticnet_wine/ gsutil -m cp output/metadata.yaml gs://seldon-models/v${VERSION}/mlflow/elasticnet_wine/ gsutil -m cp output/MLmodel gs://seldon-models/v${VERSION}/mlflow/elasticnet_wine/ gsutil -m cp output/model.pkl gs://seldon-models/v${VERSION}/mlflow/elasticnet_wine/ + gsutil -m cp output/environment.tar.gz gs://seldon-models/v${VERSION}/mlflow/elasticnet_wine/ diff --git a/servers/mlflowserver/models/elasticnet_wine/output/.gitignore b/servers/mlflowserver/models/elasticnet_wine/output/.gitignore new file mode 100644 index 0000000000..d6b7ef32c8 --- /dev/null +++ b/servers/mlflowserver/models/elasticnet_wine/output/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/servers/mlflowserver/models/elasticnet_wine/output/.keep b/servers/mlflowserver/models/elasticnet_wine/output/.keep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/servers/mlflowserver/models/elasticnet_wine/requirements.txt b/servers/mlflowserver/models/elasticnet_wine/requirements.txt index 8aff0fc28b..f97e60cc68 100644 --- a/servers/mlflowserver/models/elasticnet_wine/requirements.txt +++ b/servers/mlflowserver/models/elasticnet_wine/requirements.txt @@ -1 +1,2 @@ mlflow==1.19.0 +conda-pack==0.6.0 From 39c05d9aea7998029d43266723b58f936b4022c3 Mon Sep 17 00:00:00 2001 From: Adrian Gonzalez-Martin Date: Tue, 7 Dec 2021 17:53:52 +0000 Subject: [PATCH 2/3] Add MLServer to the tarball --- .../models/elasticnet_wine/.inference-env/.gitignore | 2 ++ servers/mlflowserver/models/elasticnet_wine/Makefile | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 servers/mlflowserver/models/elasticnet_wine/.inference-env/.gitignore diff --git a/servers/mlflowserver/models/elasticnet_wine/.inference-env/.gitignore b/servers/mlflowserver/models/elasticnet_wine/.inference-env/.gitignore new file mode 100644 index 0000000000..d6b7ef32c8 --- /dev/null +++ b/servers/mlflowserver/models/elasticnet_wine/.inference-env/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/servers/mlflowserver/models/elasticnet_wine/Makefile b/servers/mlflowserver/models/elasticnet_wine/Makefile index c197c20fcd..aa4375c599 100644 --- a/servers/mlflowserver/models/elasticnet_wine/Makefile +++ b/servers/mlflowserver/models/elasticnet_wine/Makefile @@ -14,12 +14,12 @@ train: collect: cp metadata.yaml output/ - cd mlruns && find . -name "MLmodel" -type f -exec cp {} ../output \; - cd mlruns && find . -name "conda.yaml" -type f -exec cp {} ../output \; - cd mlruns && find . -name "model.pkl" -type f -exec cp {} ../output \; - cd output && \ - conda env create --force -n elasticnet-wine-env -f conda.yaml && \ - conda-pack -n elasticnet-wine-env -f -o environment.tar.gz + find ./mlruns -name "MLmodel" -type f -exec cp {} ../output \; + find ./mlruns -name "conda.yaml" -type f -exec cp {} ../output \; + find ./mlruns -name "model.pkl" -type f -exec cp {} ../output \; + conda env create --force -p ./.inference-env -f ./output/conda.yaml + ./.inference-env/bin/pip install mlserver[all] mlserver-mlflow + ./.env/bin/conda-pack -p ./.inference-env -f -o output/environment.tar.gz upload: gsutil -m cp output/conda.yaml gs://seldon-models/v${VERSION}/mlflow/elasticnet_wine/ From 6c72f1f82ed3cd651674a3b041821a30b1d78687 Mon Sep 17 00:00:00 2001 From: Adrian Gonzalez-Martin Date: Tue, 7 Dec 2021 18:13:12 +0000 Subject: [PATCH 3/3] Fix relative paths --- servers/mlflowserver/models/elasticnet_wine/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/servers/mlflowserver/models/elasticnet_wine/Makefile b/servers/mlflowserver/models/elasticnet_wine/Makefile index aa4375c599..afd47a2c9e 100644 --- a/servers/mlflowserver/models/elasticnet_wine/Makefile +++ b/servers/mlflowserver/models/elasticnet_wine/Makefile @@ -14,9 +14,9 @@ train: collect: cp metadata.yaml output/ - find ./mlruns -name "MLmodel" -type f -exec cp {} ../output \; - find ./mlruns -name "conda.yaml" -type f -exec cp {} ../output \; - find ./mlruns -name "model.pkl" -type f -exec cp {} ../output \; + find ./mlruns -name "MLmodel" -type f -exec cp {} ./output \; + find ./mlruns -name "conda.yaml" -type f -exec cp {} ./output \; + find ./mlruns -name "model.pkl" -type f -exec cp {} ./output \; conda env create --force -p ./.inference-env -f ./output/conda.yaml ./.inference-env/bin/pip install mlserver[all] mlserver-mlflow ./.env/bin/conda-pack -p ./.inference-env -f -o output/environment.tar.gz