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.

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 Dependabot alerts and bump up version to V1.1.9 #29

Merged
merged 3 commits into from
Mar 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![Github release][release-img]][release]
[![lic][license-img]][license]

> 🔥 HiQ(v1.1.8) supports GPU tracing, and supports DNN libraries like pyTorch, `transformers`, LAVIS, and LLM like T5 and GPT2 in addition to Onnxruntime, FastAPI and Flask.
> 🔥 HiQ now supports GPU tracing, and supports DNN libraries like pyTorch, `transformers`, LAVIS, and LLM like T5 and GPT2 in addition to Onnxruntime, FastAPI and Flask.

HiQ is a `declarative`, `non-intrusive`, `dynamic` and `transparent` tracking system for both **monolithic** application and **distributed** system. It brings the runtime information tracking and optimization to a new level without compromising with speed and system performance, or hiding any tracking overhead information. HiQ applies for both I/O bound and CPU bound applications.

Expand Down Expand Up @@ -164,7 +164,7 @@ Copyright (c) 2022 Oracle and/or its affiliates. Released under the Universal Pe
[cov-img]: https://codecov.io/gh/uber/athenadriver/branch/master/graph/badge.svg
[cov]: https://hiq.readthedocs.io/en/latest/index.html

[release-img]: https://img.shields.io/badge/release-v1.1.8-red
[release-img]: https://img.shields.io/badge/release-v1.1.9-red
[release]: https://github.com/oracle-samples/hiq

[license-img]: https://img.shields.io/badge/License-UPL--1.0-red
Expand Down
2 changes: 1 addition & 1 deletion hiq/docs/medium/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ HiQ was originally developed to help our high-performance deep learning model se

## Install HiQ

You can use the following command to install HiQ. At the time of this writing, the latest version is `1.1.8`.
You can use the following command to install HiQ. At the time of this writing, the latest version is `1.1.9`.

```bash
pip install hiq-python
Expand Down
4 changes: 2 additions & 2 deletions hiq/examples/paddle/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
paddlepaddle~=2.2.2
paddleocr~=2.4.0.4
paddlepaddle~=2.4.2
paddleocr~=2.6.1.3
3 changes: 1 addition & 2 deletions hiq/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
HAS_CUDA = os.system("nvidia-smi > /dev/null 2>&1") == 0

VERSION = (
"1.1.8"
"1.1.9"
if "PKG_VERSION" not in os.environ or not os.environ["PKG_VERSION"]
else os.environ["PKG_VERSION"]
)
Expand Down Expand Up @@ -56,7 +56,6 @@ def package_files(ds):
"hiq",
],
classifiers=[
"Development Status :: 3 - Alpha",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
Expand Down
2 changes: 1 addition & 1 deletion hiq/src/hiq/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
__author__ = "Fuheng Wu<fuheng.wu@oralce.com>"
__date__ = "2023-02-01"
__doc__ = "HiQ is a declarative, non-intrusive, dynamic and transparent tracking and optimization system"
__version__ = "1.1.8"
__version__ = "1.1.9"
__credits__ = "Henry Wu, Ivan Davchev, Jun Qian"

import sys
Expand Down
3 changes: 2 additions & 1 deletion hiq/src/hiq/framework/fastapi/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,8 @@ async def hiq_report():
import cpuinfo

if not g_cpu_info:
g_cpu_info = cpuinfo.get_cpu_info()["brand_raw"]
cio = cpuinfo.get_cpu_info()
g_cpu_info = cio["brand_raw"] if 'brand_raw' in cio else cio['arch']
if not driver:
return ""
r = driver.get_k0s_summary()
Expand Down
6 changes: 3 additions & 3 deletions hiq/tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -349,11 +349,11 @@ def fib(n):

def test_gantt_chart():
# test gantt_chart for tau
tau1 = """t1^time,,0,42,3,1,1e-07,954#{'overhead_start': 0, 'overhead': 7007, 'img_path': '/opt/airflow/workspace/web/dataset/golden/vision_service_document_classification/DIC_Golden_test_set/Invoice/Image_from_iOS.jpg', 'result': '{"pages": [{"detectedDocumentTypes": [{"documentType": "Invoice", "confidence": 0.9984438419342041}, {"documentType": "Payslip", "confidence": 0.0008064216235652566}, {"documentType": "Taxform", "confidence": 0.0005774341407231987}, {"documentType": "Bank_Statement", "confidence": 7.192217890406027e-05}, {"documentType": "Receipt", "confidence": 6.365847366396338e-05}, {"documentType": "Resume", "confidence": 2.9998378522577696e-05}, {"documentType": "Others", "confidence": 6.4818650571396574e-06}, {"documentType": "Passport", "confidence": 1.5685918697272427e-07}, {"documentType": "Driver_license", "confidence": 9.681562573859992e-08}, {"documentType": "Check", "confidence": 5.857019047539325e-08}]}], "documentClassificationModelVersion": "1.1.8"}'}%n1*[None,inf,inf,0$0#[_ort_sess,1639356985.5702672,1639356985.5965557,0$0#][_ort_sess,1639356985.5970273,1639356985.6713126,0$0#][_ort_sess,1639356985.6717696,1639356985.7470868,0$0#][_ort_sess,1639356985.7472188,1639356985.7536354,0$0#][_ort_sess,1639356985.753862,1639356985.8217947,0$0#][_ort_sess,1639356985.8222127,1639356985.9028614,0$0#][_ort_sess,1639356985.9089844,1639356985.995218,0$0#][_ort_sess,1639356986.0040185,1639356986.7499647,0$0#][_ort_sess,1639356986.7505062,1639356986.8649836,0$0#][_ort_sess,1639356986.865604,1639356986.9432395,0$0#][_ort_sess,1639356986.9437199,1639356987.0212493,0$0#][_ort_sess,1639356987.0217955,1639356987.0993128,0$0#][_ort_sess,1639356987.0998278,1639356987.1781304,0$0#][_ort_sess,1639356987.1825173,1639356987.2641575,0$0#][_ort_sess,1639356987.2647128,1639356987.3802774,0$0#][_ort_sess,1639356987.3808477,1639356987.426587,0$0#][__predict,1639356987.4268615,1639356989.9975772,0$0#[__ort,1639356987.7654493,1639356987.7666342,0$0#][__ort,1639356987.8104374,1639356987.9363396,0$0#][__ort,1639356988.2967083,1639356988.350306,0$0#][__ort,1639356988.3552182,1639356988.4045203,0$0#][__ort,1639356988.408631,1639356988.4571812,0$0#][__ort,1639356988.462387,1639356988.5149536,0$0#][__ort,1639356988.5198474,1639356988.5765593,0$0#][__ort,1639356988.5820549,1639356988.638427,0$0#][__ort,1639356988.6412456,1639356988.6699426,0$0#][__ort,1639356988.6857312,1639356988.6975634,0$0#][__ort,1639356988.7001257,1639356988.7089791,0$0#][__ort,1639356988.7114773,1639356988.720178,0$0#][__ort,1639356988.7223713,1639356988.7311468,0$0#][__ort,1639356988.7333758,1639356988.7421322,0$0#][__ort,1639356988.744172,1639356988.7529004,0$0#][__ort,1639356988.7541926,1639356988.7587526,0$0#][__ort,1639356988.7608337,1639356988.8234704,0$0#][__ort,1639356988.828087,1639356988.9046693,0$0#][__ort,1639356988.9085746,1639356988.9971511,0$0#][__ort,1639356989.001419,1639356989.1028724,0$0#][__ort,1639356989.107679,1639356989.2238061,0$0#][__ort,1639356989.229096,1639356989.3884287,0$0#][__ort,1639356989.3936489,1639356989.5329273,0$0#][__pdf,1639356989.559708,1639356989.5597482,0$0#][__ort,1639356989.9790342,1639356989.9967883,0$0#]]]"""
tau2 = """t1^time,,0,8,3,1,1e-07,949#{'img_path': '/opt/airflow/workspace/web/dataset/golden/vision_service_document_classification/DIC_Golden_test_set/Others/IMG_1181.jpg', 'overhead_start': 32090, 'overhead': 1360, 'result': '{"pages": [{"detectedDocumentTypes": [{"documentType": "Check", "confidence": 0.9386022686958313}, {"documentType": "Others", "confidence": 0.061126116663217545}, {"documentType": "Taxform", "confidence": 0.00010855369328055531}, {"documentType": "Driver_license", "confidence": 8.459840319119394e-05}, {"documentType": "Passport", "confidence": 7.095218461472541e-05}, {"documentType": "Payslip", "confidence": 3.796189503191272e-06}, {"documentType": "Bank_Statement", "confidence": 2.4644766654091654e-06}, {"documentType": "Receipt", "confidence": 9.99203962237516e-07}, {"documentType": "Resume", "confidence": 1.980021693270828e-07}, {"documentType": "Invoice", "confidence": 1.5690649890487407e-09}]}], "documentClassificationModelVersion": "1.1.8"}'}%n1*[None,inf,inf,0$0#[__predict,1639357002.9975746,1639357004.5263612,0$0#[__ort,1639357003.3147278,1639357003.3159313,0$0#][__ort,1639357003.3573987,1639357003.4807863,0$0#][__ort,1639357003.7179441,1639357003.7609673,0$0#][__ort,1639357003.9064968,1639357003.9187474,0$0#][__ort,1639357003.9219973,1639357004.0949833,0$0#][__pdf,1639357004.1060643,1639357004.106106,0$0#][__ort,1639357004.523819,1639357004.5257595,0$0#]]]"""
tau1 = """t1^time,,0,42,3,1,1e-07,954#{'overhead_start': 0, 'overhead': 7007, 'img_path': '/opt/airflow/workspace/web/dataset/golden/vision_service_document_classification/DIC_Golden_test_set/Invoice/Image_from_iOS.jpg', 'result': '{"pages": [{"detectedDocumentTypes": [{"documentType": "Invoice", "confidence": 0.9984438419342041}, {"documentType": "Payslip", "confidence": 0.0008064216235652566}, {"documentType": "Taxform", "confidence": 0.0005774341407231987}, {"documentType": "Bank_Statement", "confidence": 7.192217890406027e-05}, {"documentType": "Receipt", "confidence": 6.365847366396338e-05}, {"documentType": "Resume", "confidence": 2.9998378522577696e-05}, {"documentType": "Others", "confidence": 6.4818650571396574e-06}, {"documentType": "Passport", "confidence": 1.5685918697272427e-07}, {"documentType": "Driver_license", "confidence": 9.681562573859992e-08}, {"documentType": "Check", "confidence": 5.857019047539325e-08}]}], "documentClassificationModelVersion": "1.1.9"}'}%n1*[None,inf,inf,0$0#[_ort_sess,1639356985.5702672,1639356985.5965557,0$0#][_ort_sess,1639356985.5970273,1639356985.6713126,0$0#][_ort_sess,1639356985.6717696,1639356985.7470868,0$0#][_ort_sess,1639356985.7472188,1639356985.7536354,0$0#][_ort_sess,1639356985.753862,1639356985.8217947,0$0#][_ort_sess,1639356985.8222127,1639356985.9028614,0$0#][_ort_sess,1639356985.9089844,1639356985.995218,0$0#][_ort_sess,1639356986.0040185,1639356986.7499647,0$0#][_ort_sess,1639356986.7505062,1639356986.8649836,0$0#][_ort_sess,1639356986.865604,1639356986.9432395,0$0#][_ort_sess,1639356986.9437199,1639356987.0212493,0$0#][_ort_sess,1639356987.0217955,1639356987.0993128,0$0#][_ort_sess,1639356987.0998278,1639356987.1781304,0$0#][_ort_sess,1639356987.1825173,1639356987.2641575,0$0#][_ort_sess,1639356987.2647128,1639356987.3802774,0$0#][_ort_sess,1639356987.3808477,1639356987.426587,0$0#][__predict,1639356987.4268615,1639356989.9975772,0$0#[__ort,1639356987.7654493,1639356987.7666342,0$0#][__ort,1639356987.8104374,1639356987.9363396,0$0#][__ort,1639356988.2967083,1639356988.350306,0$0#][__ort,1639356988.3552182,1639356988.4045203,0$0#][__ort,1639356988.408631,1639356988.4571812,0$0#][__ort,1639356988.462387,1639356988.5149536,0$0#][__ort,1639356988.5198474,1639356988.5765593,0$0#][__ort,1639356988.5820549,1639356988.638427,0$0#][__ort,1639356988.6412456,1639356988.6699426,0$0#][__ort,1639356988.6857312,1639356988.6975634,0$0#][__ort,1639356988.7001257,1639356988.7089791,0$0#][__ort,1639356988.7114773,1639356988.720178,0$0#][__ort,1639356988.7223713,1639356988.7311468,0$0#][__ort,1639356988.7333758,1639356988.7421322,0$0#][__ort,1639356988.744172,1639356988.7529004,0$0#][__ort,1639356988.7541926,1639356988.7587526,0$0#][__ort,1639356988.7608337,1639356988.8234704,0$0#][__ort,1639356988.828087,1639356988.9046693,0$0#][__ort,1639356988.9085746,1639356988.9971511,0$0#][__ort,1639356989.001419,1639356989.1028724,0$0#][__ort,1639356989.107679,1639356989.2238061,0$0#][__ort,1639356989.229096,1639356989.3884287,0$0#][__ort,1639356989.3936489,1639356989.5329273,0$0#][__pdf,1639356989.559708,1639356989.5597482,0$0#][__ort,1639356989.9790342,1639356989.9967883,0$0#]]]"""
tau2 = """t1^time,,0,8,3,1,1e-07,949#{'img_path': '/opt/airflow/workspace/web/dataset/golden/vision_service_document_classification/DIC_Golden_test_set/Others/IMG_1181.jpg', 'overhead_start': 32090, 'overhead': 1360, 'result': '{"pages": [{"detectedDocumentTypes": [{"documentType": "Check", "confidence": 0.9386022686958313}, {"documentType": "Others", "confidence": 0.061126116663217545}, {"documentType": "Taxform", "confidence": 0.00010855369328055531}, {"documentType": "Driver_license", "confidence": 8.459840319119394e-05}, {"documentType": "Passport", "confidence": 7.095218461472541e-05}, {"documentType": "Payslip", "confidence": 3.796189503191272e-06}, {"documentType": "Bank_Statement", "confidence": 2.4644766654091654e-06}, {"documentType": "Receipt", "confidence": 9.99203962237516e-07}, {"documentType": "Resume", "confidence": 1.980021693270828e-07}, {"documentType": "Invoice", "confidence": 1.5690649890487407e-09}]}], "documentClassificationModelVersion": "1.1.9"}'}%n1*[None,inf,inf,0$0#[__predict,1639357002.9975746,1639357004.5263612,0$0#[__ort,1639357003.3147278,1639357003.3159313,0$0#][__ort,1639357003.3573987,1639357003.4807863,0$0#][__ort,1639357003.7179441,1639357003.7609673,0$0#][__ort,1639357003.9064968,1639357003.9187474,0$0#][__ort,1639357003.9219973,1639357004.0949833,0$0#][__pdf,1639357004.1060643,1639357004.106106,0$0#][__ort,1639357004.523819,1639357004.5257595,0$0#]]]"""
create_gantt_chart_time([tau1, tau2], os.path.join(cur_dir, "data", "tau.png"))

# test gantt_chart for mem
mem1 = """t1^get_memory_mb,,0,108,5,0,1e-07,0#%n1*[None,inf,inf,0$0#[__predict,15761.84765625,16704.3671875,0$56#{'start': 1643482387.1305232, 'end': 1643482398.5414443}[__txt,15761.84765625,16704.1015625,0$56#{'start': 1643482387.1662457, 'end': 1643482394.5387013}[__det,15761.84765625,16066.8359375,0$56#{'start': 1643482387.1850543, 'end': 1643482389.8272672}[__ort,15837.8671875,16143.015625,0$56#{'start': 1643482387.2713203, 'end': 1643482389.7219777}]][__rec,16066.8359375,16704.1015625,0$56#{'start': 1643482390.3251693, 'end': 1643482393.7394197}[__ort,16066.8359375,16704.1015625,0$56#{'start': 1643482391.0169199, 'end': 1643482393.1471622}]]][_ort_sess,16704.3515625,16858.96875,0$55#{'start': 1643482395.819777, 'end': 1643482396.1520529}][__tbl,16858.96875,16912.30859375,0$54#{'start': 1643482396.152427, 'end': 1643482396.355825}[__ort,16858.96875,16912.08203125,0$56#{'start': 1643482396.1526206, 'end': 1643482396.3510108}]]]]"""
mem2 = """t1^get_memory_mb,,0,21,5,0,1e-07,0#%n1*[None,inf,inf,0$0#[__predict,2125.7578125,2125.71875,0$56#{'start': 1643653821.8613808, 'end': 1643653829.5537405}[__txt,2125.7578125,2125.71875,0$55#{'start': 1643653821.9280963, 'end': 1643653827.714213}[__det,2125.7578125,2125.71875,0$55#{'start': 1643653821.963362, 'end': 1643653827.1258452}[__ort,2125.7578125,2125.71875,0$53#{'start': 1643653822.33894, 'end': 1643653827.056082}]]][_ort_sess,2125.71875,2125.7578125,0$56#{'start': 1643653828.9966629, 'end': 1643653829.2985094}]]]"""
create_gantt_chart_memory([mem1, mem2], os.path.join(cur_dir, "data", "mem.png"))
create_gantt_chart_memory([mem1, mem2], os.path.join(cur_dir, "data", "mem.png"))