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

UOL's DiRAC apps minor update... #234

Merged
merged 2 commits into from
Nov 20, 2023
Merged
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
6 changes: 3 additions & 3 deletions benchmarks/apps/ramses/ramses.py
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ class RamsesMPI(SpackTest):

reference = {
'*': {
'Total elapsed time': (500, None, None, 'seconds'),
'elapsed_time': (500, None, None, 'seconds'),
},
}

@@ -56,9 +56,9 @@ def extract_input_data(self):
def validate_successful_run(self):
return sn.assert_found(r'Run completed', self.stdout)

@performance_function('seconds', perf_key='Total elapsed time')
@performance_function('seconds', perf_key='elapsed_time')
def extract_elapsed_time(self):
return sn.extractsingle(r'Total elapsed time:\s+(\S+)\s', self.stdout, 1, float)
return sn.extractsingle(r'elapsed_time:\s+(\S+)\s', self.stdout, 1, float)


@rfm.simple_test
4 changes: 2 additions & 2 deletions benchmarks/apps/sphng/sphng.py
Original file line number Diff line number Diff line change
@@ -61,15 +61,15 @@ class SphngBase_evolution(SphngBase):

reference = {
'dial:slurm-local': {
'Total elapsed time': (10, None, None, 'minutes'),
'elapsed_time': (10, None, None, 'minutes'),
},
}

@sanity_function
def validate_successful_run(self):
return sn.assert_found(r'ended on', self.stdout)

@performance_function('minutes', perf_key='Total elapsed time')
@performance_function('minutes', perf_key='elapsed_time')
def extract_elapsed_time(self):
return sn.extractsingle(r'cpu time used for this run :\s+(\S+)\s', self.stdout, 1, float)

4 changes: 2 additions & 2 deletions benchmarks/apps/trove-pdsyev/pdsyev.py
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ class PdsyevBase(SpackTest):

reference = {
'*': {
'diagonlization': (200, None, None, 'seconds'),
'elapsed_time': (200, None, None, 'seconds'),
},
}

@@ -68,7 +68,7 @@ def setup_build_system(self):
def validate_successful_run(self):
return sn.assert_found(r'Diagonalization finished successfully', self.stdout)

@performance_function('seconds', perf_key='diagonlization')
@performance_function('seconds', perf_key='elapsed_time')
def extract_elapsed_time(self):
return sn.extractsingle(r'Time to diagonalize matrix is \s+(\S+)\s', self.stdout, 1, float)

4 changes: 2 additions & 2 deletions benchmarks/apps/trove/trove.py
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ class TroveBase(SpackTest):

reference = {
'dial:slurm-local': {
'Total elapsed time': (500, None, None, 'seconds'),
'elapsed_time': (500, None, None, 'seconds'),
},
}

@@ -42,7 +42,7 @@ def setup_build_system(self):
def validate_successful_run(self):
return sn.assert_found(r'End of TROVE', self.stdout)

@performance_function('seconds', perf_key='Total elapsed time')
@performance_function('seconds', perf_key='elapsed_time')
def extract_elapsed_time(self):
return sn.extractsingle(r'TROVE\s{30}\s+(\S+)\s+(\S+)', self.stdout, 2, float)