From 3f2ecafbe60b3664ab7b18ecfe8e4acb46a3cd3b Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Tue, 14 Apr 2020 15:57:57 +0200 Subject: [PATCH] PAL: Integrate new comp tables 2 Change-Id: Id7267f5ab13a362894c5fe5a2ae40d51d4b5a36d Signed-off-by: Tibor Frank --- .../comparisons/2n-skx_vs_2n-clx_testbeds.rst | 23 +- .../comparisons/3n-skx_vs_2n-skx_testbeds.rst | 23 +- .../comparisons/3n-skx_vs_3n-hsw_testbeds.rst | 23 +- .../comparisons/current_vs_previous_release.rst | 138 ++-- resources/tools/presentation/generator_tables.py | 192 +++--- resources/tools/presentation/pal_utils.py | 8 +- ...2t1c-pdr.yaml => rca-2n-skx-2t1c-ndr-rca1.yaml} | 2 +- .../presentation/rca/rca-2n-skx-2t1c-ndr-rca2.yaml | 30 + .../presentation/rca/rca-2n-skx-2t1c-pdr-rca1.yaml | 30 + .../presentation/rca/rca-2n-skx-2t1c-pdr-rca2.yaml | 30 + ...2t1c-pdr.yaml => rca-3n-skx-2t1c-ndr-rca1.yaml} | 2 +- .../presentation/rca/rca-3n-skx-2t1c-ndr-rca2.yaml | 39 ++ .../presentation/rca/rca-3n-skx-2t1c-pdr-rca1.yaml | 39 ++ .../presentation/rca/rca-3n-skx-2t1c-pdr-rca2.yaml | 39 ++ resources/tools/presentation/specification.yaml | 735 +++++++++++++++------ 15 files changed, 954 insertions(+), 399 deletions(-) rename resources/tools/presentation/rca/{rca-2n-skx-2t1c-pdr.yaml => rca-2n-skx-2t1c-ndr-rca1.yaml} (75%) create mode 100644 resources/tools/presentation/rca/rca-2n-skx-2t1c-ndr-rca2.yaml create mode 100644 resources/tools/presentation/rca/rca-2n-skx-2t1c-pdr-rca1.yaml create mode 100644 resources/tools/presentation/rca/rca-2n-skx-2t1c-pdr-rca2.yaml rename resources/tools/presentation/rca/{rca-3n-skx-2t1c-pdr.yaml => rca-3n-skx-2t1c-ndr-rca1.yaml} (81%) create mode 100644 resources/tools/presentation/rca/rca-3n-skx-2t1c-ndr-rca2.yaml create mode 100644 resources/tools/presentation/rca/rca-3n-skx-2t1c-pdr-rca1.yaml create mode 100644 resources/tools/presentation/rca/rca-3n-skx-2t1c-pdr-rca2.yaml diff --git a/docs/report/vpp_performance_tests/comparisons/2n-skx_vs_2n-clx_testbeds.rst b/docs/report/vpp_performance_tests/comparisons/2n-skx_vs_2n-clx_testbeds.rst index 0db0abb849..96e3af9cfa 100644 --- a/docs/report/vpp_performance_tests/comparisons/2n-skx_vs_2n-clx_testbeds.rst +++ b/docs/report/vpp_performance_tests/comparisons/2n-skx_vs_2n-clx_testbeds.rst @@ -14,18 +14,17 @@ skx) and 2-Node Cascade Lake (2n-clx) physical testbed types, in 1-core, with RF result files csit-vpp-perf-|srelease|-\*.zip `archived here <../../_static/archive/>`_. -.. - NDR Comparison - ~~~~~~~~~~~~~~ - - Comparison tables in HTML, ASCII and CSV formats: - - - `HTML 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-2t1c-ndr.html>`_ - - `HTML 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-4t2c-ndr.html>`_ - - `ASCII 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-2t1c-ndr.txt>`_ - - `ASCII 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-4t2c-ndr.txt>`_ - - `CSV 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-2t1c-ndr.csv>`_ - - `CSV 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-4t2c-ndr.csv>`_ +NDR Comparison +~~~~~~~~~~~~~~ + +Comparison tables in HTML, ASCII and CSV formats: + + - `HTML 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-2t1c-ndr.html>`_ + - `HTML 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-4t2c-ndr.html>`_ + - `ASCII 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-2t1c-ndr.txt>`_ + - `ASCII 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-4t2c-ndr.txt>`_ + - `CSV 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-2t1c-ndr.csv>`_ + - `CSV 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-2n-skx-2n-clx-4t2c-ndr.csv>`_ PDR Comparison ~~~~~~~~~~~~~~ diff --git a/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_2n-skx_testbeds.rst b/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_2n-skx_testbeds.rst index 1642bc1ff4..bb00f8663d 100644 --- a/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_2n-skx_testbeds.rst +++ b/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_2n-skx_testbeds.rst @@ -18,18 +18,17 @@ skx) and 2-Node Skylake (2n-skx) physical testbed types, in 1-core, files csit-vpp-perf-|srelease|-\*.zip `archived here <../../_static/archive/>`_. -.. - NDR Comparison - ~~~~~~~~~~~~~~ - - Comparison tables in HTML, ASCII and CSV formats: - - - `HTML 1c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-1c-ndr.html>`_ - - `HTML 2c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-2c-ndr.html>`_ - - `ASCII 1c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-1c-ndr.txt>`_ - - `ASCII 2c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-2c-ndr.txt>`_ - - `CSV 1c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-1c-ndr.csv>`_ - - `CSV 2c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-2c-ndr.csv>`_ +NDR Comparison +~~~~~~~~~~~~~~ + +Comparison tables in HTML, ASCII and CSV formats: + + - `HTML 1c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-1c-ndr.html>`_ + - `HTML 2c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-2c-ndr.html>`_ + - `ASCII 1c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-1c-ndr.txt>`_ + - `ASCII 2c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-2c-ndr.txt>`_ + - `CSV 1c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-1c-ndr.csv>`_ + - `CSV 2c NDR comparison <../../_static/vpp/performance-compare-topologies-3n-skx-2n-skx-2c-ndr.csv>`_ PDR Comparison ~~~~~~~~~~~~~~ diff --git a/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_3n-hsw_testbeds.rst b/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_3n-hsw_testbeds.rst index da5d8931d9..a0fedc076d 100644 --- a/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_3n-hsw_testbeds.rst +++ b/docs/report/vpp_performance_tests/comparisons/3n-skx_vs_3n-hsw_testbeds.rst @@ -15,18 +15,17 @@ skx) and 3-Node Haswell (3n-hsw) physical testbed types, in 1-core, files csit-vpp-perf-|srelease|-\*.zip `archived here <../../_static/archive/>`_. -.. - NDR Comparison - ~~~~~~~~~~~~~~ - - Comparison tables in HTML, ASCII and CSV formats: - - - `HTML 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-3n-skx-1c-ndr.html>`_ - - `HTML 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-3n-skx-2c-ndr.html>`_ - - `ASCII 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-3n-skx-1c-ndr.txt>`_ - - `ASCII 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-3n-skx-2c-ndr.txt>`_ - - `CSV 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-3n-skx-1c-ndr.csv>`_ - - `CSV 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-3n-skx-2c-ndr.csv>`_ +NDR Comparison +~~~~~~~~~~~~~~ + +Comparison tables in HTML, ASCII and CSV formats: + + - `HTML 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-3n-skx-1c-ndr.html>`_ + - `HTML 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-3n-skx-2c-ndr.html>`_ + - `ASCII 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-3n-skx-1c-ndr.txt>`_ + - `ASCII 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-3n-skx-2c-ndr.txt>`_ + - `CSV 1c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-3n-skx-1c-ndr.csv>`_ + - `CSV 2c NDR comparison <../../_static/vpp/performance-compare-testbeds-3n-hsw-3n-skx-2c-ndr.csv>`_ PDR Comparison ~~~~~~~~~~~~~~ diff --git a/docs/report/vpp_performance_tests/comparisons/current_vs_previous_release.rst b/docs/report/vpp_performance_tests/comparisons/current_vs_previous_release.rst index 7283186a6d..d9ce804bce 100644 --- a/docs/report/vpp_performance_tests/comparisons/current_vs_previous_release.rst +++ b/docs/report/vpp_performance_tests/comparisons/current_vs_previous_release.rst @@ -38,6 +38,20 @@ results repeatability vary between the test cases. 2n-skx ~~~~~~ +NDR Root Cause Analysis +``````````````````````` + + - `HTML 2t1c NDR RCA `_ + - `ASCII 2t1c NDR RCA <../../_static/vpp/performance-rca-2n-skx-2t1c-ndr.txt>`_ + - `CSV 2t1c NDR RCA <../../_static/vpp/performance-rca-2n-skx-2t1c-ndr-csv.csv>`_ + +PDR Root Cause Analysis +``````````````````````` + + - `HTML 2t1c PDR RCA `_ + - `ASCII 2t1c PDR RCA <../../_static/vpp/performance-rca-2n-skx-2t1c-pdr.txt>`_ + - `CSV 2t1c PDR RCA <../../_static/vpp/performance-rca-2n-skx-2t1c-pdr-csv.csv>`_ + .. NDR Comparison `````````````` @@ -61,46 +75,44 @@ results repeatability vary between the test cases. - `CSV 4t2c NFV Service Density NDR comparison <../../_static/vpp/performance-changes-nfv-2n-skx-4t2c-ndr.csv>`_ - `CSV 8t4c NFV Service Density NDR comparison <../../_static/vpp/performance-changes-nfv-2n-skx-8t4c-ndr.csv>`_ -PDR Comparison -`````````````` - -Comparison tables in HTML, ASCII and CSV formats: - - - `HTML 2t1c PDR comparison `_ - - `HTML 4t2c PDR comparison `_ - - `ASCII 2t1c PDR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-pdr.txt>`_ - - `ASCII 4t2c PDR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-pdr.txt>`_ - - `CSV 2t1c PDR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-pdr.csv>`_ - - `CSV 4t2c PDR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-pdr.csv>`_ - -.. - - `HTML 2t1c NFV Service Density PDR comparison `_ - - `HTML 4t2c NFV Service Density PDR comparison `_ - - `HTML 8t4c NFV Service Density PDR comparison `_ - - `ASCII 2t1c NFV Service Density PDR comparison <../../_static/vpp/performance-changes-nfv-2n-skx-2t1c-pdr.txt>`_ - - `ASCII 4t2c NFV Service Density PDR comparison <../../_static/vpp/performance-changes-nfv-2n-skx-4t2c-pdr.txt>`_ - - `ASCII 8t4c NFV Service Density PDR comparison <../../_static/vpp/performance-changes-nfv-2n-skx-8t4c-pdr.txt>`_ - - `CSV 2t1c NFV Service Density PDR comparison <../../_static/vpp/performance-changes-nfv-2n-skx-2t1c-pdr.csv>`_ - - `CSV 4t2c NFV Service Density PDR comparison <../../_static/vpp/performance-changes-nfv-2n-skx-4t2c-pdr.csv>`_ - - `CSV 8t4c NFV Service Density PDR comparison <../../_static/vpp/performance-changes-nfv-2n-skx-8t4c-pdr.csv>`_ + PDR Comparison + `````````````` + Comparison tables in HTML, ASCII and CSV formats: -MRR Comparison -`````````````` + - `HTML 2t1c PDR comparison `_ + - `HTML 4t2c PDR comparison `_ + - `ASCII 2t1c PDR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-pdr.txt>`_ + - `ASCII 4t2c PDR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-pdr.txt>`_ + - `CSV 2t1c PDR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-pdr.csv>`_ + - `CSV 4t2c PDR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-pdr.csv>`_ + + + - `HTML 2t1c NFV Service Density PDR comparison `_ + - `HTML 4t2c NFV Service Density PDR comparison `_ + - `HTML 8t4c NFV Service Density PDR comparison `_ + - `ASCII 2t1c NFV Service Density PDR comparison <../../_static/vpp/performance-changes-nfv-2n-skx-2t1c-pdr.txt>`_ + - `ASCII 4t2c NFV Service Density PDR comparison <../../_static/vpp/performance-changes-nfv-2n-skx-4t2c-pdr.txt>`_ + - `ASCII 8t4c NFV Service Density PDR comparison <../../_static/vpp/performance-changes-nfv-2n-skx-8t4c-pdr.txt>`_ + - `CSV 2t1c NFV Service Density PDR comparison <../../_static/vpp/performance-changes-nfv-2n-skx-2t1c-pdr.csv>`_ + - `CSV 4t2c NFV Service Density PDR comparison <../../_static/vpp/performance-changes-nfv-2n-skx-4t2c-pdr.csv>`_ + - `CSV 8t4c NFV Service Density PDR comparison <../../_static/vpp/performance-changes-nfv-2n-skx-8t4c-pdr.csv>`_ + + MRR Comparison + `````````````` -Comparison tables in HTML, ASCII and CSV formats: + Comparison tables in HTML, ASCII and CSV formats: - - `HTML 2t1c MRR comparison `_ - - `HTML 4t2c MRR comparison `_ - - `HTML 8t4c MRR comparison `_ - - `ASCII 2t1c MRR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-mrr.txt>`_ - - `ASCII 4t2c MRR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-mrr.txt>`_ - - `ASCII 8t4c MRR comparison <../../_static/vpp/performance-changes-2n-skx-8t4c-mrr.txt>`_ - - `CSV 2t1c MRR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-mrr.csv>`_ - - `CSV 4t2c MRR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-mrr.csv>`_ - - `CSV 8t4c MRR comparison <../../_static/vpp/performance-changes-2n-skx-8t4c-mrr.csv>`_ + - `HTML 2t1c MRR comparison `_ + - `HTML 4t2c MRR comparison `_ + - `HTML 8t4c MRR comparison `_ + - `ASCII 2t1c MRR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-mrr.txt>`_ + - `ASCII 4t2c MRR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-mrr.txt>`_ + - `ASCII 8t4c MRR comparison <../../_static/vpp/performance-changes-2n-skx-8t4c-mrr.txt>`_ + - `CSV 2t1c MRR comparison <../../_static/vpp/performance-changes-2n-skx-2t1c-mrr.csv>`_ + - `CSV 4t2c MRR comparison <../../_static/vpp/performance-changes-2n-skx-4t2c-mrr.csv>`_ + - `CSV 8t4c MRR comparison <../../_static/vpp/performance-changes-2n-skx-8t4c-mrr.csv>`_ -.. - `HTML 2t1c NFV Service Density MRR comparison `_ - `HTML 4t2c NFV Service Density MRR comparison `_ - `HTML 8t4c NFV Service Density MRR comparison `_ @@ -114,6 +126,20 @@ Comparison tables in HTML, ASCII and CSV formats: 3n-skx ~~~~~~ +NDR Root Cause Analysis +``````````````````````` + + - `HTML 2t1c NDR RCA `_ + - `ASCII 2t1c NDR RCA <../../_static/vpp/performance-rca-3n-skx-2t1c-ndr.txt>`_ + - `CSV 2t1c NDR RCA <../../_static/vpp/performance-rca-3n-skx-2t1c-ndr-csv.csv>`_ + +PDR Root Cause Analysis +``````````````````````` + + - `HTML 2t1c PDR RCA `_ + - `ASCII 2t1c PDR RCA <../../_static/vpp/performance-rca-3n-skx-2t1c-pdr.txt>`_ + - `CSV 2t1c PDR RCA <../../_static/vpp/performance-rca-3n-skx-2t1c-pdr-csv.csv>`_ + .. NDR Comparison `````````````` @@ -127,32 +153,32 @@ Comparison tables in HTML, ASCII and CSV formats: - `CSV 2t1c NDR comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-ndr.csv>`_ - `CSV 4t2c NDR comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-ndr.csv>`_ -PDR Comparison -`````````````` + PDR Comparison + `````````````` -Comparison tables in HTML, ASCII and CSV formats: + Comparison tables in HTML, ASCII and CSV formats: - - `HTML 2t1c PDR comparison `_ - - `HTML 4t2c PDR comparison `_ - - `ASCII 2t1c PDR comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-pdr.txt>`_ - - `ASCII 4t2c PDR comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-pdr.txt>`_ - - `CSV 2t1c PDR comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-pdr.csv>`_ - - `CSV 4t2c PDR comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-pdr.csv>`_ + - `HTML 2t1c PDR comparison `_ + - `HTML 4t2c PDR comparison `_ + - `ASCII 2t1c PDR comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-pdr.txt>`_ + - `ASCII 4t2c PDR comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-pdr.txt>`_ + - `CSV 2t1c PDR comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-pdr.csv>`_ + - `CSV 4t2c PDR comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-pdr.csv>`_ -MRR Comparison -`````````````` + MRR Comparison + `````````````` -Comparison tables in HTML, ASCII and CSV formats: + Comparison tables in HTML, ASCII and CSV formats: - - `HTML 2t1c MRR comparison `_ - - `HTML 4t2c MRR comparison `_ - - `HTML 8t4c MRR comparison `_ - - `ASCII 2t1c MRR comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-mrr.txt>`_ - - `ASCII 4t2c MRR comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-mrr.txt>`_ - - `ASCII 8t4c MRR comparison <../../_static/vpp/performance-changes-3n-skx-8t4c-mrr.txt>`_ - - `CSV 2t1c MRR comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-mrr.csv>`_ - - `CSV 4t2c MRR comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-mrr.csv>`_ - - `CSV 8t4c MRR comparison <../../_static/vpp/performance-changes-3n-skx-8t4c-mrr.csv>`_ + - `HTML 2t1c MRR comparison `_ + - `HTML 4t2c MRR comparison `_ + - `HTML 8t4c MRR comparison `_ + - `ASCII 2t1c MRR comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-mrr.txt>`_ + - `ASCII 4t2c MRR comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-mrr.txt>`_ + - `ASCII 8t4c MRR comparison <../../_static/vpp/performance-changes-3n-skx-8t4c-mrr.txt>`_ + - `CSV 2t1c MRR comparison <../../_static/vpp/performance-changes-3n-skx-2t1c-mrr.csv>`_ + - `CSV 4t2c MRR comparison <../../_static/vpp/performance-changes-3n-skx-4t2c-mrr.csv>`_ + - `CSV 8t4c MRR comparison <../../_static/vpp/performance-changes-3n-skx-8t4c-mrr.csv>`_ 3n-hsw ~~~~~~ diff --git a/resources/tools/presentation/generator_tables.py b/resources/tools/presentation/generator_tables.py index c9205642c6..8ebeadd13a 100644 --- a/resources/tools/presentation/generator_tables.py +++ b/resources/tools/presentation/generator_tables.py @@ -490,7 +490,7 @@ def _tpc_sort_table(table): def _tpc_generate_html_table(header, data, out_file_name, legend=u"", - footnote=u"", sort_data=True): + footnote=u"", sort_data=True, title=u""): """Generate html table from input data with simple sorting possibility. :param header: Table header. @@ -503,12 +503,14 @@ def _tpc_generate_html_table(header, data, out_file_name, legend=u"", :param legend: The legend to display below the table. :param footnote: The footnote to display below the table (and legend). :param sort_data: If True the data sorting is enabled. + :param title: The table (and file) title. :type header: list :type data: list of lists :type out_file_name: str :type legend: str :type footnote: str :type sort_data: bool + :type title: str """ try: @@ -517,9 +519,9 @@ def _tpc_generate_html_table(header, data, out_file_name, legend=u"", idx = 0 params = { u"align-hdr": ( - [u"left", u"center"], - [u"left", u"left", u"center"], - [u"left", u"left", u"left", u"center"] + [u"left", u"right"], + [u"left", u"left", u"right"], + [u"left", u"left", u"left", u"right"] ), u"align-itm": ( [u"left", u"right"], @@ -547,7 +549,11 @@ def _tpc_generate_html_table(header, data, out_file_name, legend=u"", table_header = dict( values=[f"{item.replace(u',', u',
')}
" for item in header], fill_color=u"#7eade7", - align=params[u"align-hdr"][idx] + align=params[u"align-hdr"][idx], + font=dict( + family=u"Courier New", + size=13 + ) ) fig = go.Figure() @@ -562,7 +568,11 @@ def _tpc_generate_html_table(header, data, out_file_name, legend=u"", cells=dict( values=columns, fill_color=fill_color, - align=params[u"align-itm"][idx] + align=params[u"align-itm"][idx], + font=dict( + family=u"Courier New", + size=13 + ) ) ) ) @@ -604,7 +614,11 @@ def _tpc_generate_html_table(header, data, out_file_name, legend=u"", cells=dict( values=[df_sorted.get(col) for col in header], fill_color=fill_color, - align=params[u"align-itm"][idx] + align=params[u"align-itm"][idx], + font=dict( + family=u"Courier New", + size=13 + ) ) ) ) @@ -628,6 +642,9 @@ def _tpc_generate_html_table(header, data, out_file_name, legend=u"", u".. |prein| raw:: html\n\n
\n\n\n"
             u".. |preout| raw:: html\n\n    
\n\n" ) + if title: + rst_file.write(f"{title}\n") + rst_file.write(f"{u'~' * len(title)}\n\n") rst_file.write( u".. raw:: html\n\n" f'