Skip to content

updated time unit in report() #520

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

Merged
merged 8 commits into from
Jun 15, 2023
Merged

updated time unit in report() #520

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d7362a1
updated time unit in report()
chakravarthik27 Jun 15, 2023
9cc5ed2
updating in column name with unit
chakravarthik27 Jun 15, 2023
031401c
updating column name in report
chakravarthik27 Jun 15, 2023
d159d04
Merge pull request #522 from JohnSnowLabs/fix/runtime-compare-conflict
ArshaanNazir Jun 15, 2023
c4fff20
update multi-model report for runtime test
ArshaanNazir Jun 15, 2023
1e5ab64
update report
ArshaanNazir Jun 15, 2023
90366b6
update runtime report for cross model comparison
ArshaanNazir Jun 15, 2023
d716bf6
Merge remote-tracking branch 'origin/release/1.5.0' into feature/add-…
ArshaanNazir Jun 15, 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
6 changes: 3 additions & 3 deletions nlptest/nlptest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ def run(self) -> "Harness":

return self

def report(self, time_elapsed=False) -> pd.DataFrame:
def report(self, time_elapsed=False, unit='ms') -> pd.DataFrame:
"""
Generate a report of the test results.

Expand Down Expand Up @@ -332,7 +332,7 @@ def report(self, time_elapsed=False) -> pd.DataFrame:
self.df_report = df_report.fillna("-")
if time_elapsed:
self.df_report['time_elapsed'] = self.df_report['test_type'].apply(
lambda x: self._runtime.total_time()[x])
lambda x: self._runtime.total_time(unit)[x])

return self.df_report
else:
Expand Down Expand Up @@ -373,7 +373,7 @@ def report(self, time_elapsed=False) -> pd.DataFrame:
df_report = df_report.fillna("-")
if time_elapsed:
self.df_report['time_elapsed'] = self.df_report['test_type'].apply(
lambda x: self._runtime.total_time()[x])
lambda x: self._runtime.total_time(unit)[x])
df_final_report = pd.concat([df_final_report, df_report])

df_final_report['minimum_pass_rate'] = df_final_report['minimum_pass_rate'].str.rstrip(
Expand Down
10 changes: 8 additions & 2 deletions nlptest/utils/custom_types/sample.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,13 +590,19 @@ class RuntimeSample(BaseModel):
def __init__(self, **data):
super().__init__(**data)

def total_time(self):
def total_time(self, unit='ms'):
total = {}
if self.total:
return self.total
else:
for key in self.transform_time.keys():
total[key] = self.transform_time[key] + self.run_time[key]
total[key] = self.convert_ns_to_unit(
self.transform_time[key] + self.run_time[key],
unit=unit)
self.total = total
return total

def convert_ns_to_unit(self, time, unit='ms'):
unit_dict = {'ns': 1, 'us': 1e3, 'ms': 1e6, 's': 1e9, 'm': 6e10, 'h': 3.6e12}
return time / unit_dict[unit]