chore(formatting)[automatic]: formatting using black

Author: lukasrothenberger

discopop_profiler/__init__.py

@@ -35,10 +35,7 @@ def update_filemapping(self):
             # Do not regenerate if FileMapping.txt is still up-to-date.
             filemapping_mtime = os.stat("FileMapping.txt").st_mtime
             if os.stat(cwd).st_mtime < filemapping_mtime and all(
-                [
-                    not entry.is_dir() or entry.stat().st_mtime < filemapping_mtime
-                    for entry in recursive_scandir(cwd)
-                ]
+                [not entry.is_dir() or entry.stat().st_mtime < filemapping_mtime for entry in recursive_scandir(cwd)]
             ):
                 return
         logging.info("Generating FileMapping.txt.")

discopop_profiler/utils.py

@@ -37,9 +37,7 @@ def get_library(name: str) -> str:
 
 
 def is_compile(clang_args: List[str]) -> bool:
-    return "-c" in clang_args or any(
-        [re.match(r"^[^-].+\.(?:c|cc|cpp)$", arg) for arg in clang_args]
-    )
+    return "-c" in clang_args or any([re.match(r"^[^-].+\.(?:c|cc|cpp)$", arg) for arg in clang_args])
 
 
 def is_link(clang_args: List[str]) -> bool:

discopop_wizard/classes/CodePreview.py

@@ -98,9 +98,7 @@ def show_in(self, parent_element: tk.Text):
         for line_idx, line in enumerate(self.lines):
             # offset line_id to account for start with 1
             offset_line_id = line_idx + 1
-            cast(CodePreviewLine, line).display(
-                self.wizard, parent_element, offset_line_id, self.max_line_num
-            )
+            cast(CodePreviewLine, line).display(self.wizard, parent_element, offset_line_id, self.max_line_num)
 
     def jump_to_first_modification(self, parent_element: tk.Text):
         """Jumps to the location of the first modified source code location."""

discopop_wizard/classes/Console.py

@@ -56,9 +56,7 @@ def __show_console(self):
         y_scrollbar = ttk.Scrollbar(self.parent_frame, command=self.log_screen.yview)
         y_scrollbar.grid(row=0, column=1, sticky="nsew")
         self.log_screen["yscrollcommand"] = y_scrollbar.set
-        x_scrollbar = ttk.Scrollbar(
-            self.parent_frame, orient="horizontal", command=self.log_screen.xview
-        )
+        x_scrollbar = ttk.Scrollbar(self.parent_frame, orient="horizontal", command=self.log_screen.xview)
         x_scrollbar.grid(row=1, column=0, columnspan=2, sticky="nsew")
         self.log_screen["xscrollcommand"] = x_scrollbar.set
 

discopop_wizard/classes/ExecutionConfiguration.py

@@ -93,14 +93,10 @@ def __extract_values_from_help_string(self):
                 self.value_dict[target_name + "_" + value_name] = ""
                 # self.type_dict[target_name + "_" + value_name] = value_type
 
-    def get_as_button(
-        self, wizard, main_screen_obj, parent_frame: tk.Frame, all_buttons: List[tk.Button]
-    ) -> tk.Button:
+    def get_as_button(self, wizard, main_screen_obj, parent_frame: tk.Frame, all_buttons: List[tk.Button]) -> tk.Button:
         button = tk.Button(parent_frame, text=self.value_dict["label"])
         button.config(
-            command=lambda: self.highlight_and_update_notebook_screens(
-                wizard, main_screen_obj, button, all_buttons
-            )
+            command=lambda: self.highlight_and_update_notebook_screens(wizard, main_screen_obj, button, all_buttons)
         )
         self.button = button
         return button
@@ -129,12 +125,8 @@ def highlight_and_update_notebook_screens(
         self.show_details_screen(wizard, main_screen_obj)
 
         # update results screen of pressed configuration button and set results tab state based on result existence
-        main_screen_obj.notebook.tab(
-            main_screen_obj.results_frame, state=self.__button_state_from_result_existence()
-        )
-        main_screen_obj.notebook.tab(
-            main_screen_obj.optimizer_frame, state=self.__button_state_from_result_existence()
-        )
+        main_screen_obj.notebook.tab(main_screen_obj.results_frame, state=self.__button_state_from_result_existence())
+        main_screen_obj.notebook.tab(main_screen_obj.optimizer_frame, state=self.__button_state_from_result_existence())
 
         if self.__button_state_from_result_existence() == "normal":
             show_suggestions_overview_screen(wizard, main_screen_obj.results_frame, self)
@@ -153,69 +145,51 @@ def show_details_screen(self, wizard, main_screen_obj):
         canvas.grid(row=1)
 
         # show labels
-        tk.Label(
-            canvas, text="Label:", justify=tk.RIGHT, anchor="e", font=wizard.style_font_bold_small
-        ).grid(row=1, column=1, sticky="ew")
-        tk.Label(canvas, text="Description", justify=tk.RIGHT, anchor="e").grid(
-            row=2, column=1, sticky="ew"
+        tk.Label(canvas, text="Label:", justify=tk.RIGHT, anchor="e", font=wizard.style_font_bold_small).grid(
+            row=1, column=1, sticky="ew"
         )
+        tk.Label(canvas, text="Description", justify=tk.RIGHT, anchor="e").grid(row=2, column=1, sticky="ew")
         tk.Label(
             canvas,
             text="Executable name:",
             justify=tk.RIGHT,
             anchor="e",
             font=wizard.style_font_bold_small,
         ).grid(row=3, column=1, sticky="ew")
-        tk.Label(canvas, text="Executable arguments:", justify=tk.RIGHT, anchor="e").grid(
-            row=4, column=1, sticky="ew"
-        )
-        tk.Label(canvas, text="Make flags:", justify=tk.RIGHT, anchor="e").grid(
-            row=5, column=1, sticky="ew"
-        )
+        tk.Label(canvas, text="Executable arguments:", justify=tk.RIGHT, anchor="e").grid(row=4, column=1, sticky="ew")
+        tk.Label(canvas, text="Make flags:", justify=tk.RIGHT, anchor="e").grid(row=5, column=1, sticky="ew")
         tk.Label(
             canvas,
             text="Project path:",
             justify=tk.RIGHT,
             anchor="e",
             font=wizard.style_font_bold_small,
         ).grid(row=6, column=1, sticky="ew")
-        tk.Label(canvas, text="Project linker flags:", justify=tk.RIGHT, anchor="e").grid(
-            row=7, column=1, sticky="ew"
-        )
-        tk.Label(canvas, text="Make target:", justify=tk.RIGHT, anchor="e").grid(
-            row=8, column=1, sticky="ew"
-        )
+        tk.Label(canvas, text="Project linker flags:", justify=tk.RIGHT, anchor="e").grid(row=7, column=1, sticky="ew")
+        tk.Label(canvas, text="Make target:", justify=tk.RIGHT, anchor="e").grid(row=8, column=1, sticky="ew")
         tk.Label(
             canvas,
             text="Memory Profiling:",
             justify=tk.RIGHT,
             anchor="e",
             font=wizard.style_font_bold_small,
         ).grid(row=9, column=1, sticky="ew")
-        tk.Label(canvas, text="Skip function params:", justify=tk.RIGHT, anchor="e").grid(
-            row=10, column=1, sticky="ew"
-        )
+        tk.Label(canvas, text="Skip function params:", justify=tk.RIGHT, anchor="e").grid(row=10, column=1, sticky="ew")
         tk.Label(
             canvas,
             text="Additional:",
             justify=tk.RIGHT,
             anchor="e",
             font=wizard.style_font_bold_small,
         ).grid(row=11, column=1, sticky="ew")
-        tk.Label(canvas, text="Tags:", justify=tk.RIGHT, anchor="e").grid(
-            row=12, column=1, sticky="ew"
-        )
-        tk.Label(canvas, text="Notes:", justify=tk.RIGHT, anchor="e").grid(
-            row=13, column=1, sticky="ew"
-        )
+        tk.Label(canvas, text="Tags:", justify=tk.RIGHT, anchor="e").grid(row=12, column=1, sticky="ew")
+        tk.Label(canvas, text="Notes:", justify=tk.RIGHT, anchor="e").grid(row=13, column=1, sticky="ew")
 
         # show input fields
         label = tk.Entry(canvas)
         label.grid(row=1, column=2, sticky="ew")
         label.insert(tk.END, self.value_dict["label"])
-        create_tool_tip(
-            label, "Name of the configuration. Used to distinguish configurations in the main menu."
-        )
+        create_tool_tip(label, "Name of the configuration. Used to distinguish configurations in the main menu.")
 
         description = tk.Entry(canvas)
         description.grid(row=2, column=2, sticky="ew")
@@ -235,8 +209,7 @@ def show_details_screen(self, wizard, main_screen_obj):
         executable_args.insert(tk.END, self.value_dict["executable_arguments"])
         create_tool_tip(
             executable_args,
-            "Specify arguments which shall be forwarded to the call of the created executable for the "
-            "profiling.",
+            "Specify arguments which shall be forwarded to the call of the created executable for the " "profiling.",
         )
 
         make_flags = tk.Entry(canvas)
@@ -250,28 +223,23 @@ def show_details_screen(self, wizard, main_screen_obj):
         project_path = tk.Entry(canvas)
         project_path.grid(row=6, column=2, sticky="ew")
         project_path.insert(tk.END, self.value_dict["project_path"])
-        create_tool_tip(
-            project_path, "Path to the project which shall be analyzed for potential parallelism."
-        )
+        create_tool_tip(project_path, "Path to the project which shall be analyzed for potential parallelism.")
 
         def overwrite_with_selection(target: tk.Entry):
             prompt_result = tk.filedialog.askdirectory()
             if len(prompt_result) != 0:
                 target.delete(0, tk.END)
                 target.insert(0, prompt_result)
 
-        project_path_selector = tk.Button(
-            canvas, text="Select", command=lambda: overwrite_with_selection(project_path)
-        )
+        project_path_selector = tk.Button(canvas, text="Select", command=lambda: overwrite_with_selection(project_path))
         project_path_selector.grid(row=6, column=3)
 
         project_linker_flags = tk.Entry(canvas)
         project_linker_flags.grid(row=7, column=2, sticky="ew")
         project_linker_flags.insert(tk.END, self.value_dict["linker_flags"])
         create_tool_tip(
             project_linker_flags,
-            "Linker flags which need to be passed to the build system in order to create a valid "
-            "executable.",
+            "Linker flags which need to be passed to the build system in order to create a valid " "executable.",
         )
 
         make_target = tk.Entry(canvas)
@@ -281,9 +249,7 @@ def overwrite_with_selection(target: tk.Entry):
 
         mpsfp_var = tk.IntVar()
         mpsfp_var.set(self.value_dict["memory_profiling_skip_function_parameters"])
-        memory_profiling_skip_function_parameters = tk.Checkbutton(
-            canvas, onvalue=1, offvalue=0, variable=mpsfp_var
-        )
+        memory_profiling_skip_function_parameters = tk.Checkbutton(canvas, onvalue=1, offvalue=0, variable=mpsfp_var)
         memory_profiling_skip_function_parameters.grid(row=10, column=2, sticky="w")
         create_tool_tip(
             memory_profiling_skip_function_parameters,
@@ -415,9 +381,7 @@ def save_changes(
         self.value_dict["working_copy_path"] = self.value_dict["project_path"] + "/.discopop"
         self.value_dict["linker_flags"] = project_linker_flags.get()
         self.value_dict["make_target"] = make_target.get()
-        self.value_dict[
-            "memory_profiling_skip_function_parameters"
-        ] = memory_profiling_skip_function_parameters.get()
+        self.value_dict["memory_profiling_skip_function_parameters"] = memory_profiling_skip_function_parameters.get()
         self.value_dict["tags"] = tags.get()
         self.value_dict["notes"] = additional_notes.get("1.0", tk.END)
 
@@ -491,12 +455,8 @@ def execute_configuration(
         # create execution view and update results frame
         ExecutionView(self, wizard, main_screen_obj.results_frame)
         # set results tab state based on result existence
-        main_screen_obj.notebook.tab(
-            main_screen_obj.results_frame, state=self.__button_state_from_result_existence()
-        )
-        main_screen_obj.notebook.tab(
-            main_screen_obj.optimizer_frame, state=self.__button_state_from_result_existence()
-        )
+        main_screen_obj.notebook.tab(main_screen_obj.results_frame, state=self.__button_state_from_result_existence())
+        main_screen_obj.notebook.tab(main_screen_obj.optimizer_frame, state=self.__button_state_from_result_existence())
 
         # show results tab
         main_screen_obj.notebook.select(main_screen_obj.results_frame)

discopop_wizard/classes/ProfilingContainer.py

@@ -25,13 +25,9 @@ def start(self):
         )
         self.__execute_command("docker kill discopop_container")
         self.__execute_command("docker rm discopop_container")
-        exit_code = self.__execute_command(
-            "docker build -t discopop_container " + docker_context_path
-        )
+        exit_code = self.__execute_command("docker build -t discopop_container " + docker_context_path)
         assert exit_code == 0
-        exit_code = self.__execute_command(
-            "docker run --name discopop_container -d -t discopop_container"
-        )
+        exit_code = self.__execute_command("docker run --name discopop_container -d -t discopop_container")
         assert exit_code == 0
 
     def stop(self):
@@ -75,9 +71,7 @@ def copy_results_from_container(self, target_path: str, execution_view):
     def analyze_project(self, execution_view):
         # copy project folder to container. Note: mounting would be nicer but requires restarting the container.
         # might be a nicer solution in the long run, especially for larger projects
-        self.copy_project_folder_to_container(
-            execution_view.execution_configuration.value_dict["project_path"]
-        )
+        self.copy_project_folder_to_container(execution_view.execution_configuration.value_dict["project_path"])
 
         # settings
         command = "/discopop/build/scripts/runDiscoPoP "
@@ -91,49 +85,25 @@ def analyze_project(self, execution_view):
         command += "--gllvm /software/go/bin "
         # execution configuration
         command += "--project /project "
-        command += (
-            '--linker-flags "'
-            + execution_view.execution_configuration.value_dict["linker_flags"]
-            + '" '
-        )
-        command += (
-            '--executable-name "'
-            + execution_view.execution_configuration.value_dict["executable_name"]
-            + '" '
-        )
+        command += '--linker-flags "' + execution_view.execution_configuration.value_dict["linker_flags"] + '" '
+        command += '--executable-name "' + execution_view.execution_configuration.value_dict["executable_name"] + '" '
         command += (
             '--executable-arguments "'
             + execution_view.execution_configuration.value_dict["executable_arguments"]
             + '" '
         )
-        command += (
-            '--make-flags "'
-            + execution_view.execution_configuration.value_dict["make_flags"]
-            + '" '
-        )
-        command += (
-            '--make-target "'
-            + execution_view.execution_configuration.value_dict["make_target"]
-            + '" '
-        )
-        command += (
-            '--explorer-flags "'
-            + execution_view.execution_configuration.value_dict["explorer_flags"]
-            + '" '
-        )
+        command += '--make-flags "' + execution_view.execution_configuration.value_dict["make_flags"] + '" '
+        command += '--make-target "' + execution_view.execution_configuration.value_dict["make_target"] + '" '
+        command += '--explorer-flags "' + execution_view.execution_configuration.value_dict["explorer_flags"] + '" '
 
         self.__execute_command("docker exec -it discopop_container " + command)
 
         # copy results from container into working copy path
-        if not os.path.exists(
-            execution_view.execution_configuration.value_dict["working_copy_path"]
-        ):
+        if not os.path.exists(execution_view.execution_configuration.value_dict["working_copy_path"]):
             os.mkdir(execution_view.execution_configuration.value_dict["working_copy_path"])
 
         # remove previous results
-        self.remove_previous_results(
-            execution_view.execution_configuration.value_dict["working_copy_path"]
-        )
+        self.remove_previous_results(execution_view.execution_configuration.value_dict["working_copy_path"])
 
         # copy results from container
         self.copy_results_from_container(
@@ -157,9 +127,7 @@ def __correct_file_mapping_paths(self, execution_view):
             file.write(contents)
 
     def __execute_command(self, command: str) -> int:
-        with subprocess.Popen(
-            command, stdout=subprocess.PIPE, bufsize=1, universal_newlines=True, shell=True
-        ) as p:
+        with subprocess.Popen(command, stdout=subprocess.PIPE, bufsize=1, universal_newlines=True, shell=True) as p:
             if p.stdout is None:
                 print("executing command was not successfull")
             else:

discopop_wizard/classes/Settings.py

@@ -33,9 +33,7 @@ class Settings(object):
     code_preview_show_line_numbers: int = 1  # 1 = True, 0 = False
     code_preview_disable_compile_check: int = 0  # 1 = True, 0 = False
 
-    def __init__(
-        self, discopop_build_dir="", go_bin_dir="", use_docker_container: bool = True
-    ) -> None:
+    def __init__(self, discopop_build_dir="", go_bin_dir="", use_docker_container: bool = True) -> None:
         self.discopop_build_dir = discopop_build_dir
         self.go_bin = go_bin_dir
         self.use_docker_container_for_profiling = use_docker_container
@@ -45,11 +43,7 @@ def __init__(
         # get llvm_bin_dir from stored build configuration
         llvm_bin_dir = ""
         if settings_valid:
-            command = (
-                "cat "
-                + self.discopop_build_dir
-                + '/build_config.txt | grep -oP "(?<=LLVM_BIN_DIR=).*"'
-            )
+            command = "cat " + self.discopop_build_dir + '/build_config.txt | grep -oP "(?<=LLVM_BIN_DIR=).*"'
             llvm_bin_dir = os.popen(command).read().replace("\n", "")
             if not os.path.exists(llvm_bin_dir):
                 llvm_bin_dir = ""
@@ -143,9 +137,7 @@ def load_from_config_file(config_dir: str) -> Settings:
     settings.code_preview_show_metadata_regions = __load_or_get_default(
         value_dict, "code_preview_show_metadata_regions"
     )
-    settings.code_preview_show_line_numbers = __load_or_get_default(
-        value_dict, "code_preview_show_line_numbers"
-    )
+    settings.code_preview_show_line_numbers = __load_or_get_default(value_dict, "code_preview_show_line_numbers")
     settings.code_preview_show_metadata_live_device_variables = __load_or_get_default(
         value_dict, "code_preview_show_metadata_live_device_variables"
     )