Merge pull request #13 from wiremind/update-tf

Update to TF 2.3.0

Author: cp2587

Dockerfile

@@ -3,10 +3,10 @@ WORKDIR /app
 
 RUN apt update && apt install -y libgomp1 && rm -rf /var/lib/apt/lists/*
 
-COPY requirements.txt .
-RUN pip install -r requirements.txt
+COPY pythie-serving-requirements.txt .
+RUN pip install -r pythie-serving-requirements.txt
 
 COPY . .
-RUN pip install .
+RUN pip install .[serving]
 
 ENTRYPOINT [ "pythie-serving" ]

VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

pythie-serving-requirements.txt

@@ -0,0 +1,18 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile --no-index --output-file=pythie-serving.txt -
+#
+grpcio==1.33.1            # via pythie-serving
+joblib==0.17.0            # via scikit-learn
+lightgbm==2.3.1           # via pythie-serving
+numpy==1.19.2             # via lightgbm, pythie-serving, scikit-learn, scipy, xgboost
+protobuf==3.13.0          # via pythie-serving
+scikit-learn==0.23.2      # via lightgbm
+scipy==1.5.3              # via lightgbm, scikit-learn, xgboost
+six==1.15.0               # via grpcio, protobuf
+threadpoolctl==2.1.0      # via scikit-learn
+xgboost==0.90             # via pythie-serving
+
+# setuptools

requirements.txt

@@ -4,16 +4,10 @@
 #
 #    pip-compile --no-index setup.py
 #
-grpcio==1.30.0
-joblib==0.16.0            # via scikit-learn
-lightgbm==2.3.1
-numpy==1.19.0
-protobuf==3.12.2
-scikit-learn==0.23.1      # via lightgbm
-scipy==1.5.1              # via lightgbm, scikit-learn, xgboost
+grpcio==1.33.1            # via pythie-serving (setup.py)
+numpy==1.19.2             # via pythie-serving (setup.py)
+protobuf==3.13.0          # via pythie-serving (setup.py)
 six==1.15.0               # via grpcio, protobuf
-threadpoolctl==2.1.0      # via scikit-learn
-xgboost==0.90
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

setup.py

@@ -19,10 +19,15 @@
         "numpy~=1.17",
         "grpcio~=1.30",
         "protobuf~=3.12",
-        "xgboost~=0.90",
-        "lightgbm~=2.3"
     ],
+    # pip-compile setup.py --no-index --upgrade --rebuild --verbose
+    # echo ".[serving]" | pip-compile - --no-index --upgrade --rebuild --verbose -o pythie-serving-requirements.txt \
+    # && sed -i '/file:/d' pythie-serving-requirements.txt
     extras_require={
+        'serving': [
+            "lightgbm~=2.3",
+            "xgboost~=0.90"
+        ],
         'dev': [
             'coverage',
             'flake8',

src/pythie_serving/lightgbm_wrapper.py

@@ -3,6 +3,8 @@
 
 import grpc
 
+from lightgbm import Booster
+
 from .tensorflow_proto.tensorflow_serving.config import model_server_config_pb2
 from .tensorflow_proto.tensorflow_serving.apis import predict_pb2, prediction_service_pb2_grpc
 from .utils import make_ndarray_from_tensor
@@ -12,8 +14,6 @@
 class LightGBMPredictionServiceServicer(prediction_service_pb2_grpc.PredictionServiceServicer):
 
     def __init__(self, *, logger: logging.Logger, model_server_config: model_server_config_pb2.ModelServerConfig):
-        from lightgbm import Booster
-
         self.logger = logger
         self.model_map = {}
         for model_config in model_server_config.model_config_list.config: