From 2b67878e42b50b26303347137455eba3d1fd631a Mon Sep 17 00:00:00 2001 From: jgp Date: Fri, 12 Apr 2019 16:08:45 +0200 Subject: [PATCH 1/4] fix units --- cscs-checks/tools/profiling_and_debugging/gperftools_mpi_omp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscs-checks/tools/profiling_and_debugging/gperftools_mpi_omp.py b/cscs-checks/tools/profiling_and_debugging/gperftools_mpi_omp.py index c2d4c3e7c2..caae4dc073 100644 --- a/cscs-checks/tools/profiling_and_debugging/gperftools_mpi_omp.py +++ b/cscs-checks/tools/profiling_and_debugging/gperftools_mpi_omp.py @@ -62,7 +62,7 @@ def __init__(self, lang): 'chmod u+x %s' % (self.split_file), ] self.post_run = [ - 'pprof --text --lines %s %s &> %s' % + 'pprof -unit=ms -nodecount=4 --text --lines %s %s &> %s' % (self.exe, '*.0', self.rpt_file_txt), 'pprof --pdf %s %s &> %s' % (self.exe, '*.0', self.rpt_file_pdf), 'file %s &> %s' % (self.rpt_file_pdf, self.rpt_file_doc) From cece9c5106b743b0325318327e54d01de320473f Mon Sep 17 00:00:00 2001 From: jgp Date: Fri, 12 Apr 2019 16:29:10 +0200 Subject: [PATCH 2/4] fix pdf --- .../tools/profiling_and_debugging/gperftools_mpi_omp.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cscs-checks/tools/profiling_and_debugging/gperftools_mpi_omp.py b/cscs-checks/tools/profiling_and_debugging/gperftools_mpi_omp.py index caae4dc073..19501fa013 100644 --- a/cscs-checks/tools/profiling_and_debugging/gperftools_mpi_omp.py +++ b/cscs-checks/tools/profiling_and_debugging/gperftools_mpi_omp.py @@ -62,10 +62,10 @@ def __init__(self, lang): 'chmod u+x %s' % (self.split_file), ] self.post_run = [ - 'pprof -unit=ms -nodecount=4 --text --lines %s %s &> %s' % + 'pprof --unit=ms --text --lines %s %s &> %s' % (self.exe, '*.0', self.rpt_file_txt), 'pprof --pdf %s %s &> %s' % (self.exe, '*.0', self.rpt_file_pdf), - 'file %s &> %s' % (self.rpt_file_pdf, self.rpt_file_doc) + 'head -3 %s &> %s' % (self.rpt_file_pdf, self.rpt_file_doc) ] self.sanity_patterns = sn.all([ # check job status: @@ -75,7 +75,7 @@ def __init__(self, lang): sn.assert_found( r'^\s+\d+ms\s+\d+.\d+%.*_jacobi.\w+:\d+', self.rpt_file_txt), # check pdf report: - sn.assert_found('PDF document', self.rpt_file_doc), + sn.assert_found('%PDF', self.rpt_file_doc), ]) self.maintainers = ['JG'] self.tags = {'production'} From ce5052835ba707d2921ce7b16db48f7d642d2b84 Mon Sep 17 00:00:00 2001 From: jgp Date: Sat, 13 Apr 2019 20:28:19 +0200 Subject: [PATCH 3/4] fix for 226118698 --- .../tools/profiling_and_debugging/gperftools_mpi_omp.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cscs-checks/tools/profiling_and_debugging/gperftools_mpi_omp.py b/cscs-checks/tools/profiling_and_debugging/gperftools_mpi_omp.py index 19501fa013..09412c3767 100644 --- a/cscs-checks/tools/profiling_and_debugging/gperftools_mpi_omp.py +++ b/cscs-checks/tools/profiling_and_debugging/gperftools_mpi_omp.py @@ -62,9 +62,10 @@ def __init__(self, lang): 'chmod u+x %s' % (self.split_file), ] self.post_run = [ - 'pprof --unit=ms --text --lines %s %s &> %s' % + '$EBROOTPPROF/bin/pprof --unit=ms --text --lines %s %s &> %s' % (self.exe, '*.0', self.rpt_file_txt), - 'pprof --pdf %s %s &> %s' % (self.exe, '*.0', self.rpt_file_pdf), + '$EBROOTPPROF/bin/pprof --pdf %s %s &> %s' % + (self.exe, '*.0', self.rpt_file_pdf), 'head -3 %s &> %s' % (self.rpt_file_pdf, self.rpt_file_doc) ] self.sanity_patterns = sn.all([ From 44e7aca38f52d63792333c99acedad6ebe84d259 Mon Sep 17 00:00:00 2001 From: jgp Date: Sat, 13 Apr 2019 23:33:25 +0200 Subject: [PATCH 4/4] fix for filetype --- .../tools/profiling_and_debugging/gperftools_mpi_omp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cscs-checks/tools/profiling_and_debugging/gperftools_mpi_omp.py b/cscs-checks/tools/profiling_and_debugging/gperftools_mpi_omp.py index 09412c3767..fcad7164f7 100644 --- a/cscs-checks/tools/profiling_and_debugging/gperftools_mpi_omp.py +++ b/cscs-checks/tools/profiling_and_debugging/gperftools_mpi_omp.py @@ -66,7 +66,7 @@ def __init__(self, lang): (self.exe, '*.0', self.rpt_file_txt), '$EBROOTPPROF/bin/pprof --pdf %s %s &> %s' % (self.exe, '*.0', self.rpt_file_pdf), - 'head -3 %s &> %s' % (self.rpt_file_pdf, self.rpt_file_doc) + 'file %s &> %s' % (self.rpt_file_pdf, self.rpt_file_doc) ] self.sanity_patterns = sn.all([ # check job status: @@ -76,7 +76,7 @@ def __init__(self, lang): sn.assert_found( r'^\s+\d+ms\s+\d+.\d+%.*_jacobi.\w+:\d+', self.rpt_file_txt), # check pdf report: - sn.assert_found('%PDF', self.rpt_file_doc), + sn.assert_found('PDF document', self.rpt_file_doc), ]) self.maintainers = ['JG'] self.tags = {'production'}