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: onnx package conflict during setup #894

Merged
merged 26 commits into from
Feb 22, 2023
Merged

fix: onnx package conflict during setup #894

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
00116ce
fix: onnx package conflict during setup
ZiniuYu Feb 21, 2023
b9dcde3
fix: broken test image
ZiniuYu Feb 21, 2023
93a0aa9
fix: broken test image
ZiniuYu Feb 21, 2023
4366601
fix: broken test image
ZiniuYu Feb 21, 2023
6ab6c11
fix: broken test image
ZiniuYu Feb 21, 2023
fb05283
fix: revert
ZiniuYu Feb 21, 2023
1fff6f5
fix: re-revert
ZiniuYu Feb 21, 2023
c37403f
fix: fix onnxruntime version
ZiniuYu Feb 21, 2023
2db7a7f
fix: revert again
ZiniuYu Feb 21, 2023
704e493
fix: test
ZiniuYu Feb 21, 2023
ba3d229
fix: test
ZiniuYu Feb 21, 2023
6be9fd5
fix: trt ci
ZiniuYu Feb 21, 2023
096450d
fix: trt ci
ZiniuYu Feb 21, 2023
0cf8cc9
fix: trt ci
ZiniuYu Feb 22, 2023
a4d7e05
fix: trt ci
ZiniuYu Feb 22, 2023
54bd286
fix: trt ci
ZiniuYu Feb 22, 2023
393f17a
fix: trt ci
ZiniuYu Feb 22, 2023
169a36f
fix: trt ci
ZiniuYu Feb 22, 2023
0c60d60
fix: trt ci
ZiniuYu Feb 22, 2023
db3473b
fix: trt ci
ZiniuYu Feb 22, 2023
cf41768
fix: trt ci
ZiniuYu Feb 22, 2023
dcf4f30
fix: trt ci
ZiniuYu Feb 22, 2023
be8f83e
fix: onnx version
ZiniuYu Feb 22, 2023
ca1274a
fix: onnx version
ZiniuYu Feb 22, 2023
bcd824c
fix: onnx version
ZiniuYu Feb 22, 2023
f029cb2
docs: update docker usage
ZiniuYu Feb 22, 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
2 changes: 1 addition & 1 deletion server/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
],
extras_require={
'onnx': [
'onnxruntime',
'onnx',
'onnxmltools',
'onnxruntime',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As you mentioned, we can always install onnxruntime-gpu?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've tested on x86 machines with/without GPU, both work fine. The CI failed for unknown reasons

]
+ (['onnxruntime-gpu>=1.8.0'] if sys.platform != 'darwin' else []),
'tensorrt': ['nvidia-tensorrt'],
Expand Down
2 changes: 1 addition & 1 deletion tests/test_asyncio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ async def test_async_encode(make_flow):
DocumentArray(
[
Document(
uri='https://docarray.jina.ai/_static/favicon.png',
uri='https://clip-as-service.jina.ai/_static/favicon.png',
text='hello, world',
),
]
Expand Down
14 changes: 7 additions & 7 deletions tests/test_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ def test_numpy_softmax(shape, axis):
Document(text='goodbye, world'),
Document(
text='hello, world',
uri='https://docarray.jina.ai/_static/favicon.png',
uri='https://clip-as-service.jina.ai/_static/favicon.png',
),
Document(
uri='https://docarray.jina.ai/_static/favicon.png',
uri='https://clip-as-service.jina.ai/_static/favicon.png',
),
]
),
Expand All @@ -47,14 +47,14 @@ def test_numpy_softmax(shape, axis):
Document(text='hello, world'),
Document(tensor=np.array([0, 1, 2])),
Document(
uri='https://docarray.jina.ai/_static/favicon.png'
uri='https://clip-as-service.jina.ai/_static/favicon.png'
).load_uri_to_blob(),
Document(
tensor=np.array([0, 1, 2]),
uri='https://docarray.jina.ai/_static/favicon.png',
uri='https://clip-as-service.jina.ai/_static/favicon.png',
),
Document(
uri='https://docarray.jina.ai/_static/favicon.png',
uri='https://clip-as-service.jina.ai/_static/favicon.png',
),
]
),
Expand All @@ -64,7 +64,7 @@ def test_numpy_softmax(shape, axis):
DocumentArray(
[
Document(text='hello, world'),
Document(uri='https://docarray.jina.ai/_static/favicon.png'),
Document(uri='https://clip-as-service.jina.ai/_static/favicon.png'),
]
),
(1, 1),
Expand All @@ -86,7 +86,7 @@ def test_split_img_txt_da(inputs):
DocumentArray(
[
Document(
uri='https://docarray.jina.ai/_static/favicon.png',
uri='https://clip-as-service.jina.ai/_static/favicon.png',
).load_uri_to_blob(),
]
)
Expand Down
24 changes: 14 additions & 10 deletions tests/test_ranker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@ async def test_torch_executor_rank_text2imgs(encoder_class):
[
[
Document(
uri='https://docarray.jina.ai/_static/favicon.png',
uri='https://clip-as-service.jina.ai/_static/favicon.png',
matches=[
Document(text='hello, world'),
Document(text='goodbye, world'),
],
),
Document(
uri='https://docarray.jina.ai/_static/favicon.png',
uri='https://clip-as-service.jina.ai/_static/favicon.png',
matches=[
Document(text='hello, world'),
Document(text='goodbye, world'),
Expand All @@ -85,14 +85,14 @@ async def test_torch_executor_rank_text2imgs(encoder_class):
DocumentArray(
[
Document(
uri='https://docarray.jina.ai/_static/favicon.png',
uri='https://clip-as-service.jina.ai/_static/favicon.png',
matches=[
Document(text='hello, world'),
Document(text='goodbye, world'),
],
),
Document(
uri='https://docarray.jina.ai/_static/favicon.png',
uri='https://clip-as-service.jina.ai/_static/favicon.png',
matches=[
Document(text='hello, world'),
Document(text='goodbye, world'),
Expand All @@ -102,7 +102,7 @@ async def test_torch_executor_rank_text2imgs(encoder_class):
),
lambda: (
Document(
uri='https://docarray.jina.ai/_static/favicon.png',
uri='https://clip-as-service.jina.ai/_static/favicon.png',
matches=[
Document(text='hello, world'),
Document(text='goodbye, world'),
Expand All @@ -115,7 +115,9 @@ async def test_torch_executor_rank_text2imgs(encoder_class):
Document(
text='hello, world',
matches=[
Document(uri='https://docarray.jina.ai/_static/favicon.png'),
Document(
uri='https://clip-as-service.jina.ai/_static/favicon.png'
),
Document(
uri=f'{os.path.dirname(os.path.abspath(__file__))}/img/00000.jpg'
),
Expand Down Expand Up @@ -144,7 +146,7 @@ def test_docarray_inputs(make_flow, inputs):
[
[
Document(
uri='https://docarray.jina.ai/_static/favicon.png',
uri='https://clip-as-service.jina.ai/_static/favicon.png',
matches=[
Document(text='hello, world'),
Document(text='goodbye, world'),
Expand All @@ -154,7 +156,7 @@ def test_docarray_inputs(make_flow, inputs):
DocumentArray(
[
Document(
uri='https://docarray.jina.ai/_static/favicon.png',
uri='https://clip-as-service.jina.ai/_static/favicon.png',
matches=[
Document(text='hello, world'),
Document(text='goodbye, world'),
Expand All @@ -164,7 +166,7 @@ def test_docarray_inputs(make_flow, inputs):
),
lambda: (
Document(
uri='https://docarray.jina.ai/_static/favicon.png',
uri='https://clip-as-service.jina.ai/_static/favicon.png',
matches=[
Document(text='hello, world'),
Document(text='goodbye, world'),
Expand All @@ -177,7 +179,9 @@ def test_docarray_inputs(make_flow, inputs):
Document(
text='hello, world',
matches=[
Document(uri='https://docarray.jina.ai/_static/favicon.png'),
Document(
uri='https://clip-as-service.jina.ai/_static/favicon.png'
),
Document(
uri=f'{os.path.dirname(os.path.abspath(__file__))}/img/00000.jpg'
),
Expand Down
4 changes: 2 additions & 2 deletions tests/test_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
lambda: (Document(text='hello, world') for _ in range(10)),
DocumentArray(
[
Document(uri='https://docarray.jina.ai/_static/favicon.png'),
Document(uri='https://clip-as-service.jina.ai/_static/favicon.png'),
Document(
uri=f'{os.path.dirname(os.path.abspath(__file__))}/img/00000.jpg'
),
Expand Down Expand Up @@ -52,7 +52,7 @@ def test_index_search(make_search_flow, inputs, limit):
lambda: (Document(text='hello, world') for _ in range(10)),
DocumentArray(
[
Document(uri='https://docarray.jina.ai/_static/favicon.png'),
Document(uri='https://clip-as-service.jina.ai/_static/favicon.png'),
Document(
uri=f'{os.path.dirname(os.path.abspath(__file__))}/img/00000.jpg'
),
Expand Down
18 changes: 9 additions & 9 deletions tests/test_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

def test_server_download(tmpdir):
download_model(
url='https://docarray.jina.ai/_static/favicon.png',
url='https://clip-as-service.jina.ai/_static/favicon.png',
target_folder=tmpdir,
md5sum='66ea4817d73514888dcf6c7d2b00016d',
md5sum='43104e468ddd23c55bc662d84c87a7f8',
with_resume=False,
)
target_path = os.path.join(tmpdir, 'favicon.png')
Expand All @@ -27,28 +27,28 @@ def test_server_download(tmpdir):
os.remove(target_path)

download_model(
url='https://docarray.jina.ai/_static/favicon.png',
url='https://clip-as-service.jina.ai/_static/favicon.png',
target_folder=tmpdir,
md5sum='66ea4817d73514888dcf6c7d2b00016d',
md5sum='43104e468ddd23c55bc662d84c87a7f8',
with_resume=True,
)
assert os.path.getsize(target_path) == file_size
assert not os.path.exists(part_path)


@pytest.mark.parametrize('md5', ['ABC', None, '66ea4817d73514888dcf6c7d2b00016d'])
@pytest.mark.parametrize('md5', ['ABC', None, '43104e468ddd23c55bc662d84c87a7f8'])
def test_server_download_md5(tmpdir, md5):
if md5 != 'ABC':
download_model(
url='https://docarray.jina.ai/_static/favicon.png',
url='https://clip-as-service.jina.ai/_static/favicon.png',
target_folder=tmpdir,
md5sum=md5,
with_resume=False,
)
else:
with pytest.raises(Exception):
download_model(
url='https://docarray.jina.ai/_static/favicon.png',
url='https://clip-as-service.jina.ai/_static/favicon.png',
target_folder=tmpdir,
md5sum=md5,
with_resume=False,
Expand All @@ -58,7 +58,7 @@ def test_server_download_md5(tmpdir, md5):
def test_server_download_not_regular_file(tmpdir):
with pytest.raises(Exception):
download_model(
url='https://docarray.jina.ai/_static/favicon.png',
url='https://clip-as-service.jina.ai/_static/favicon.png',
target_folder=tmpdir,
md5sum='',
with_resume=False,
Expand Down Expand Up @@ -87,7 +87,7 @@ def test_make_onnx_flow_wrong_name_path():
'image_uri',
[
f'{os.path.dirname(os.path.abspath(__file__))}/img/00000.jpg',
'https://docarray.jina.ai/_static/favicon.png',
'https://clip-as-service.jina.ai/_static/favicon.png',
],
)
@pytest.mark.parametrize('size', [224, 288, 384, 448])
Expand Down
8 changes: 4 additions & 4 deletions tests/test_simple.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def test_protocols(port_generator, protocol, jit, pytestconfig):
('hello, world', 'goodbye, world'),
lambda: ('hello, world' for _ in range(10)),
[
'https://docarray.jina.ai/_static/favicon.png',
'https://clip-as-service.jina.ai/_static/favicon.png',
f'{os.path.dirname(os.path.abspath(__file__))}/img/00000.jpg',
'hello, world',
],
Expand All @@ -58,7 +58,7 @@ def test_plain_inputs(make_flow, inputs):
lambda: (Document(text='hello, world') for _ in range(10)),
DocumentArray(
[
Document(uri='https://docarray.jina.ai/_static/favicon.png'),
Document(uri='https://clip-as-service.jina.ai/_static/favicon.png'),
Document(
uri=f'{os.path.dirname(os.path.abspath(__file__))}/img/00000.jpg'
),
Expand Down Expand Up @@ -90,7 +90,7 @@ def test_docarray_inputs(make_flow, inputs):
DocumentArray(
[
Document(
uri='https://docarray.jina.ai/_static/favicon.png',
uri='https://clip-as-service.jina.ai/_static/favicon.png',
text='hello, world',
),
]
Expand All @@ -117,7 +117,7 @@ def test_docarray_preserve_original_inputs(make_flow, inputs):
DocumentArray(
[
Document(
uri='https://docarray.jina.ai/_static/favicon.png',
uri='https://clip-as-service.jina.ai/_static/favicon.png',
text='hello, world',
),
]
Expand Down
6 changes: 3 additions & 3 deletions tests/test_tensorrt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
lambda: (Document(text='hello, world') for _ in range(10)),
DocumentArray(
[
Document(uri='https://docarray.jina.ai/_static/favicon.png'),
Document(uri='https://clip-as-service.jina.ai/_static/favicon.png'),
Document(
uri=f'{os.path.dirname(os.path.abspath(__file__))}/img/00000.jpg'
),
Expand Down Expand Up @@ -47,13 +47,13 @@ def test_docarray_inputs(make_trt_flow, inputs):
'd',
[
Document(
uri='https://docarray.jina.ai/_static/favicon.png',
uri='https://clip-as-service.jina.ai/_static/favicon.png',
matches=[Document(text='hello, world'), Document(text='goodbye, world')],
),
Document(
text='hello, world',
matches=[
Document(uri='https://docarray.jina.ai/_static/favicon.png'),
Document(uri='https://clip-as-service.jina.ai/_static/favicon.png'),
Document(
uri=f'{os.path.dirname(os.path.abspath(__file__))}/img/00000.jpg'
),
Expand Down