Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix kserve storage optional package #2537

Merged
merged 3 commits into from
Aug 24, 2023
Merged

fix kserve storage optional package #2537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b568ec
fix kserve storage optional package
Aug 24, 2023
4fdd7b2
upgrade kserve at Docker dev
Aug 24, 2023
dfa9646
Merge branch 'master' into kserve-patch
agunapal Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions kubernetes/kserve/Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ FROM ${BASE_IMAGE} AS compile-image
ARG BASE_IMAGE
ARG BRANCH_NAME=master
ARG MACHINE_TYPE=cpu
ARG BRANCH_NAME_KF=master
ENV PYTHONUNBUFFERED TRUE

RUN --mount=type=cache,id=apt-dev,target=/var/cache/apt \
Expand Down Expand Up @@ -46,7 +45,7 @@ RUN --mount=type=cache,id=apt-dev,target=/var/cache/apt \
&& rm -rf /var/lib/apt/lists/* \
&& cd /tmp \

RUN update-alternatives --remove python /usr/bin/python \
RUN update-alternatives --remove python /usr/bin/python \
&& update-alternatives --install /usr/bin/python python /usr/bin/python3.8 1

#ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache
Expand All @@ -62,7 +61,7 @@ RUN if [ "$MACHINE_TYPE" = "gpu" ]; then export USE_CUDA=1; fi \
&& git checkout ${BRANCH_NAME} \
&& if [ -z "$CUDA_VERSION" ]; then python ts_scripts/install_dependencies.py --environment=dev; else python ts_scripts/install_dependencies.py --environment=dev --cuda $CUDA_VERSION; fi \
&& python ts_scripts/install_from_src.py \
&& python -m pip install captum transformers kserve \
&& python -m pip install captum transformers kserve[storage]>=0.11.0 \
&& python -m pip install . \
&& useradd -m model-server \
&& mkdir -p /home/model-server/tmp \
Expand Down
3 changes: 2 additions & 1 deletion kubernetes/kserve/kserve_wrapper/TorchserveModel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import kserve
from kserve.errors import ModelMissingError
from kserve.model import Model as Model
from kserve.storage import Storage

logging.basicConfig(level=kserve.constants.KSERVE_LOGLEVEL)

Expand Down Expand Up @@ -53,7 +54,7 @@ def load(self) -> bool:
"""This method validates model availabilty in the model directory
and sets ready flag to true.
"""
model_path = pathlib.Path(kserve.Storage.download(self.model_dir))
model_path = pathlib.Path(Storage.download(self.model_dir))
paths = list(pathlib.Path(model_path).glob("*.mar"))
existing_paths = [path for path in paths if path.exists()]
if len(existing_paths) == 0:
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/kserve/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
kserve>=0.9.0
kserve[storage]>=0.11.0
transformers
captum
Loading