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

fix: better monitoring #738

Merged
merged 4 commits into from
Jun 1, 2022
Merged

fix: better monitoring #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e88b7d
fix: turnoff monitor in default yaml config
numb3r3 Jun 1, 2022
696a80a
fix: monitor encoding perf
numb3r3 Jun 1, 2022
3dce99d
fix: better monitor name
numb3r3 Jun 1, 2022
ef11565
fix: address comments
numb3r3 Jun 1, 2022
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
17 changes: 13 additions & 4 deletions server/clip_server/executors/clip_onnx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,24 @@ def __init__(

self._model.start_sessions(sess_options=sess_options, providers=providers)

@monitor()
@monitor(name='preprocess_images_seconds')
def _preproc_images(self, docs: 'DocumentArray'):
return preproc_image(
docs, preprocess_fn=self._preprocess_tensor, return_np=True
)

@monitor()
@monitor(name='preprocess_texts_seconds')
def _preproc_texts(self, docs: 'DocumentArray'):
return preproc_text(docs, return_np=True)

@monitor(name='encode_images_seconds')
def _encode_images(self, docs: 'DocumentArray'):
docs.embeddings = self._model.encode_image(docs.tensors)

@monitor(name='encode_texts_seconds')
def _encode_texts(self, docs: 'DocumentArray'):
docs.embeddings = self._model.encode_text(docs.tensors)

@requests(on='/rank')
async def rank(self, docs: 'DocumentArray', parameters: Dict, **kwargs):
await self.encode(docs['@r,m'])
Expand All @@ -108,7 +116,8 @@ async def encode(self, docs: 'DocumentArray', **kwargs):
batch_size=self._minibatch_size,
pool=self._pool,
):
minibatch.embeddings = self._model.encode_image(minibatch.tensors)
self._encode_images(minibatch)

# recover original content
try:
_ = iter(_contents)
Expand All @@ -124,7 +133,7 @@ async def encode(self, docs: 'DocumentArray', **kwargs):
batch_size=self._minibatch_size,
pool=self._pool,
):
minibatch.embeddings = self._model.encode_text(minibatch.tensors)
self._encode_texts(minibatch)
# recover original content
try:
_ = iter(_contents)
Expand Down
42 changes: 26 additions & 16 deletions server/clip_server/executors/clip_tensorrt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def __init__(

self._model.start_engines()

@monitor()
@monitor(name='preprocess_images_seconds')
def _preproc_images(self, docs: 'DocumentArray'):
return preproc_image(
docs,
Expand All @@ -55,10 +55,30 @@ def _preproc_images(self, docs: 'DocumentArray'):
return_np=False,
)

@monitor()
@monitor(name='preprocess_texts_seconds')
def _preproc_texts(self, docs: 'DocumentArray'):
return preproc_text(docs, device=self._device, return_np=False)

@monitor(name='encode_images_seconds')
def _encode_images(self, docs: 'DocumentArray'):
docs.embeddings = (
self._model.encode_image(docs.tensors)
.detach()
.cpu()
.numpy()
.astype(np.float32)
)

@monitor(name='encode_texts_seconds')
def _encode_texts(self, docs: 'DocumentArray'):
docs.embeddings = (
self._model.encode_text(docs.tensors)
.detach()
.cpu()
.numpy()
.astype(np.float32)
)

@requests(on='/rank')
async def rank(self, docs: 'DocumentArray', parameters: Dict, **kwargs):
await self.encode(docs['@r,m'])
Expand All @@ -79,13 +99,8 @@ async def encode(self, docs: 'DocumentArray', **kwargs):
batch_size=self._minibatch_size,
pool=self._pool,
):
minibatch.embeddings = (
self._model.encode_image(minibatch.tensors)
.detach()
.cpu()
.numpy()
.astype(np.float32)
)
self._encode_images(minibatch)

# recover original content
try:
_ = iter(_contents)
Expand All @@ -101,13 +116,8 @@ async def encode(self, docs: 'DocumentArray', **kwargs):
batch_size=self._minibatch_size,
pool=self._pool,
):
minibatch.embeddings = (
self._model.encode_text(minibatch.tensors)
.detach()
.cpu()
.numpy()
.astype(np.float32)
)
self._encode_texts(minibatch)

# recover original content
try:
_ = iter(_contents)
Expand Down
31 changes: 17 additions & 14 deletions server/clip_server/executors/clip_torch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def __init__(

self._pool = ThreadPool(processes=num_worker_preprocess)

@monitor()
@monitor(name='preprocess_images_seconds')
def _preproc_images(self, docs: 'DocumentArray'):
return preproc_image(
docs,
Expand All @@ -68,10 +68,22 @@ def _preproc_images(self, docs: 'DocumentArray'):
return_np=False,
)

@monitor()
@monitor(name='preprocess_texts_seconds')
def _preproc_texts(self, docs: 'DocumentArray'):
return preproc_text(docs, device=self._device, return_np=False)

@monitor(name='encode_images_seconds')
def _encode_images(self, docs: 'DocumentArray'):
docs.embeddings = (
self._model.encode_image(docs.tensors).cpu().numpy().astype(np.float32)
)

@monitor(name='encode_texts_seconds')
def _encode_texts(self, docs: 'DocumentArray'):
docs.embeddings = (
self._model.encode_text(docs.tensors).cpu().numpy().astype(np.float32)
)

@requests(on='/rank')
async def rank(self, docs: 'DocumentArray', parameters: Dict, **kwargs):
await self.encode(docs['@r,m'])
Expand All @@ -93,12 +105,8 @@ async def encode(self, docs: 'DocumentArray', **kwargs):
batch_size=self._minibatch_size,
pool=self._pool,
):
minibatch.embeddings = (
self._model.encode_image(minibatch.tensors)
.cpu()
.numpy()
.astype(np.float32)
)

self._encode_images(minibatch)

# recover original content
try:
Expand All @@ -115,12 +123,7 @@ async def encode(self, docs: 'DocumentArray', **kwargs):
batch_size=self._minibatch_size,
pool=self._pool,
):
minibatch.embeddings = (
self._model.encode_text(minibatch.tensors)
.cpu()
.numpy()
.astype(np.float32)
)
self._encode_texts(minibatch)

# recover original content
try:
Expand Down
4 changes: 0 additions & 4 deletions server/clip_server/onnx-flow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,10 @@ jtype: Flow
version: '1'
with:
port: 51000
monitoring: True
port_monitoring: 9090
executors:
- name: clip_o
uses:
jtype: CLIPEncoder
metas:
py_modules:
- executors/clip_onnx.py
monitoring: true
port_monitoring: 9091
4 changes: 0 additions & 4 deletions server/clip_server/tensorrt-flow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,10 @@ jtype: Flow
version: '1'
with:
port: 51000
monitoring: True
port_monitoring: 9090
executors:
- name: clip_r
uses:
jtype: CLIPEncoder
metas:
py_modules:
- executors/clip_tensorrt.py
monitoring: true
port_monitoring: 9091
4 changes: 0 additions & 4 deletions server/clip_server/torch-flow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,10 @@ jtype: Flow
version: '1'
with:
port: 51000
monitoring: True
port_monitoring: 9090
executors:
- name: clip_t
uses:
jtype: CLIPEncoder
metas:
py_modules:
- executors/clip_torch.py
monitoring: true
port_monitoring: 9091