Merge pull request #349 from antmicro/refactor-results-page

Refactor results page

Author: tmichalak

Makefile

@@ -73,12 +73,12 @@ install_quicklogic:
 	tar -xf ${QUICKLOGIC_ARCHIVE} -C env/quicklogic
 	rm ${QUICKLOGIC_ARCHIVE}
 
-PYTHON_SRCS=$(shell find . -name "*py" -not -path "./third_party/*" -not -path "./env/*" -not -path "./conf/*")
+PYTHON_SRCS=$(shell find . -name "*py" -not -path "./third_party/*" -not -path "./env/*" -not -path "./conf/*" -not -path "./results/env/*")
 
 format: ${PYTHON_SRCS}
 	yapf -i $?
 
 clean::
-	rm -rf build/
+	$(IN_CONDA_ENV_BASE) rm -rf build/
 
 .PHONY: all env build-tools format run-all clean

__init__.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2021  The SymbiFlow Authors.
+#
+# Use of this source code is governed by a ISC-style
+# license that can be found in the LICENSE file or at
+# https://opensource.org/licenses/ISC
+#
+# SPDX-License-Identifier: ISC

conf/common/requirements.txt

@@ -5,9 +5,10 @@ lxml
 pandas
 pytest
 python-constraint
+requests
 simplejson
 termcolor
 terminaltables
 tqdm
-yapf
+yapf==0.31.0
 git+https://github.com/SymbiFlow/edalize.git@symbiflow_update#egg=edalize

infrastructure/__init__.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2021  The SymbiFlow Authors.
+#
+# Use of this source code is governed by a ISC-style
+# license that can be found in the LICENSE file or at
+# https://opensource.org/licenses/ISC
+#
+# SPDX-License-Identifier: ISC

infrastructure/tasks.py

@@ -23,7 +23,7 @@ def __init__(self, root_dir):
         self.src_dir = os.path.join(root_dir, 'src')
         self.tasks = self.iter_options()
 
-    def iter_options(self):
+    def iter_options(self, all_combinations=False):
         """Returns all the possible combination of:
             - projects,
             - toolchains,
@@ -51,12 +51,18 @@ def iter_options(self):
                     board for board in project_boards if board in vendor_boards
                 ]
 
+                if all_combinations:
+                    boards = vendor_boards
+
                 for toolchain, board in list(product(toolchains, boards)):
-                    if toolchain not in skip_toolchains:
+                    if toolchain not in skip_toolchains or all_combinations:
                         combinations.add((project, toolchain, board))
 
         return combinations
 
+    def get_all_combinations(self):
+        return self.iter_options(all_combinations=True)
+
     def get_tasks(
         self,
         args,

results/Makefile

@@ -18,11 +18,11 @@ env:
 
 fetch:
 	mkdir -p meta
-	$(IN_ENV) python fetch_meta.py nightly 1138 _ meta --pool-size $$(nproc)
+	$(IN_ENV) python3 fetch_meta.py --builds nightly --from-build 1138 --output-dir meta --pool-size $$(nproc)
 
 build:
 	mkdir -p build
-	$(IN_ENV) python gen.py meta -o build
+	$(IN_ENV) python3 generate_html.py -i meta -o build
 	touch build/.nojekyll
 
 clean:

results/__init__.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2021  The SymbiFlow Authors.
+#
+# Use of this source code is governed by a ISC-style
+# license that can be found in the LICENSE file or at
+# https://opensource.org/licenses/ISC
+#
+# SPDX-License-Identifier: ISC

results/fetch_meta.py

@@ -229,14 +229,17 @@ def download_from_specs(specs):
 def main():
     parser = ArgumentParser()
     parser.add_argument(
-        'builds', type=str, help='Builds type (e.g. `nightly`)'
+        '--builds', type=str, help='Builds type (e.g. `nightly`)'
     )
-    parser.add_argument('from_tr', type=int, help='First test run number')
+    parser.add_argument('--from-build', type=int, help='First test run number')
     parser.add_argument(
-        'to_tr', type=str, help='Last test run number (use `_` for "latest")'
+        '--to-build',
+        default="_",
+        type=str,
+        help='Last test run number (use `_` for "latest")'
     )
     parser.add_argument(
-        'output_dir', type=str, help='Output directory for downloaded data'
+        '--output-dir', type=str, help='Output directory for downloaded data'
     )
     parser.add_argument(
         '--pool-size', type=int, default=8, help='Size of thread pool'
@@ -250,7 +253,7 @@ def main():
     print(f'Using {args.pool_size} parallel threads.')
     pool = ThreadPool(args.pool_size)
     test_numbers = list(
-        get_test_run_numbers(args.from_tr, args.to_tr, args.builds)
+        get_test_run_numbers(args.from_build, args.to_build, args.builds)
     )
 
     print('Preparing downloads ...', flush=True)

results/gen.py renamed to results/generate_html.py

@@ -25,21 +25,23 @@ def main():
     parser = ArgumentParser()
 
     parser.add_argument(
-        'data_dir', type=str, help='Directory containing json data files'
+        '-i',
+        '--in-dir',
+        type=str,
+        help='Directory containing json data files'
     )
     parser.add_argument(
         '-o',
-        '--out_dir',
+        '--out-dir',
         nargs=1,
         type=str,
         help='Save outputs in a given directory'
     )
 
     args = parser.parse_args()
 
-    if not os.path.isdir(args.data_dir):
-        print('Path needs to be a path to a directory')
-        exit(-1)
+    if not os.path.isdir(args.in_dir):
+        os.makedirs(args.in_dir)
 
     graph_pages = {}
 
@@ -48,8 +50,8 @@ def main():
 
     results = []
 
-    for project_name in os.listdir(args.data_dir):
-        project_dir = os.path.join(args.data_dir, project_name)
+    for project_name in os.listdir(args.in_dir):
+        project_dir = os.path.join(args.in_dir, project_name)
         if not os.path.isdir(project_dir):
             print(f'Skipping `{project_dir}` because it' 's not a directory.')
             continue

results/generate_index_page.py

@@ -9,32 +9,66 @@
 #
 # SPDX-License-Identifier: ISC
 
+import json
+import os
 from typing import List
 
 import jinja2
 
 from project_results import ProjectResults
+from infrastructure.tasks import Tasks
 
 
 def generate_index_html(
     template: jinja2.Template, results: List[ProjectResults]
 ):
     print('Generating index page...')
 
-    projects_dict = {}
-    all_toolchains = set()
+    cur_dir = os.path.dirname(os.path.abspath(__file__))
+    root_dir = os.path.join(cur_dir, '..')
+    tasks = Tasks(root_dir)
+    combinations = sorted(
+        tasks.get_all_combinations(), key=lambda tup: (tup[2], tup[0], tup[1])
+    )
+
+    boards = dict()
+    toolchains_dict = dict()
+    projects = set()
+    for project, toolchain, board in combinations:
+        print(project, toolchain, board)
+        if board not in boards:
+            boards[board] = dict()
+
+        board_dict = boards[board]
+        if project not in board_dict:
+            board_dict[project] = dict()
+
+        proj_dict = board_dict[project]
+
+        proj_dict[toolchain] = "skip"
+
+        if board not in toolchains_dict:
+            toolchains_dict[board] = set()
+
+        toolchains_dict[board].add(toolchain)
+
+        projects.add(project)
+
     for project_results in results:
-        boards = {}
-        for board, toolchains in project_results.entries.items():
-            board_toolchains = []
-            for toolchain in toolchains.keys():
-                board_toolchains.append(toolchain)
-                all_toolchains.add(toolchain)
-            boards[board] = board_toolchains
+        entries = project_results.entries
+        project = project_results.project_name
 
-        projects_dict[project_results.project_name] = boards
+        for board, toolchains in entries.items():
+            for toolchain in toolchains.keys():
+                status = entries[board][toolchain][0].status
+                boards[board][project][toolchain] = status
 
-    projects_list = sorted(list(projects_dict.items()), key=lambda t: t[0])
-    toolchain_list = sorted(list(all_toolchains))
+    for board, tool_list in toolchains_dict.items():
+        toolchains_dict[board] = sorted(list(tool_list))
 
-    return template.render(projects=projects_list, toolchains=toolchain_list)
+    return template.render(
+        boards=boards,
+        boards_list=list(boards.keys()),
+        toolchains=toolchains_dict,
+        projects=projects
+    )