From 177555a5214b889b4257baf899dc346633018104 Mon Sep 17 00:00:00 2001 From: TrisCC Date: Wed, 3 Apr 2024 12:08:54 +0200 Subject: [PATCH] Fix linter --- autoverify/cli/__main__.py | 1 + autoverify/cli/install/install.py | 1 + autoverify/cli/install/installers/abcrown/install.py | 1 + autoverify/cli/install/installers/mnbab/install.py | 6 ++++-- autoverify/cli/install/installers/nnenum/install.py | 1 + autoverify/cli/install/installers/ovalbab/install.py | 1 + autoverify/cli/install/installers/verinet/install.py | 1 + autoverify/cli/main.py | 1 + autoverify/cli/util/git.py | 1 + autoverify/portfolio/hydra/cost_matrix.py | 1 + autoverify/portfolio/hydra/hydra.py | 1 + autoverify/portfolio/portfolio.py | 1 + autoverify/portfolio/portfolio_runner.py | 1 + autoverify/tune/tune_hydra.py | 1 + autoverify/tune/tune_verifier.py | 1 + autoverify/types.py | 1 + autoverify/util/cli.py | 1 + autoverify/util/configs.py | 1 + autoverify/util/cost_dict.py | 1 + autoverify/util/dataclass.py | 1 + autoverify/util/dict.py | 1 + autoverify/util/env.py | 1 + autoverify/util/instances.py | 1 + autoverify/util/loggers.py | 1 + autoverify/util/onnx.py | 1 + autoverify/util/path.py | 1 + autoverify/util/proc.py | 1 + autoverify/util/resource_strategy.py | 1 + autoverify/util/resources.py | 1 + autoverify/util/smac.py | 1 + autoverify/util/target_function.py | 1 + autoverify/util/tempfiles.py | 1 + autoverify/util/verification_instance.py | 1 + autoverify/util/verifiers.py | 1 + autoverify/util/vnncomp.py | 1 + autoverify/util/vnncomp_filters.py | 1 + autoverify/verifier/complete/abcrown/abcrown_yaml_config.py | 1 + autoverify/verifier/complete/abcrown/verifier.py | 1 + autoverify/verifier/complete/mnbab/configspace.py | 1 + autoverify/verifier/complete/mnbab/mnbab_json.py | 1 + autoverify/verifier/complete/mnbab/verifier.py | 1 + autoverify/verifier/complete/nnenum/configspace.py | 1 + autoverify/verifier/complete/nnenum/verifier.py | 1 + autoverify/verifier/complete/ovalbab/ovalbab_json_config.py | 1 + autoverify/verifier/complete/ovalbab/verifier.py | 1 + autoverify/verifier/complete/verinet/configspace.py | 1 + autoverify/verifier/complete/verinet/verifier.py | 1 + autoverify/verifier/verifier.py | 1 + autoverify/verify/eval_verifier.py | 1 + tests/fake_vnncomp/gen_inst_csv.py | 1 + tests/test_cli/test_cli.py | 1 + 51 files changed, 54 insertions(+), 2 deletions(-) diff --git a/autoverify/cli/__main__.py b/autoverify/cli/__main__.py index 08bf620..157b50c 100644 --- a/autoverify/cli/__main__.py +++ b/autoverify/cli/__main__.py @@ -1,4 +1,5 @@ """This file allows the cli to be called as a module or via the dir.""" + from autoverify.cli.main import main main() diff --git a/autoverify/cli/install/install.py b/autoverify/cli/install/install.py index d8f5bec..c0677cc 100644 --- a/autoverify/cli/install/install.py +++ b/autoverify/cli/install/install.py @@ -1,4 +1,5 @@ """TODO summary.""" + import logging import shlex import shutil diff --git a/autoverify/cli/install/installers/abcrown/install.py b/autoverify/cli/install/installers/abcrown/install.py index c0e6a22..400ea14 100644 --- a/autoverify/cli/install/installers/abcrown/install.py +++ b/autoverify/cli/install/installers/abcrown/install.py @@ -1,4 +1,5 @@ """abcrown installer.""" + from pathlib import Path from autoverify.cli.util.git import GitRepoInfo, clone_checkout_verifier diff --git a/autoverify/cli/install/installers/mnbab/install.py b/autoverify/cli/install/installers/mnbab/install.py index c4b59c5..cbe6f00 100644 --- a/autoverify/cli/install/installers/mnbab/install.py +++ b/autoverify/cli/install/installers/mnbab/install.py @@ -1,4 +1,5 @@ """mnbab installer.""" + import shlex import subprocess from pathlib import Path @@ -54,7 +55,8 @@ def install(install_dir: Path): mpfr_path = str(get_conda_pkg_path("mpfr", "4.0.2", "hb69a4c5_1")) cddlib_path = str(get_conda_pkg_path("cddlib", "1!0.94j", "he80fd80_1001")) - with cwd(install_dir / "tool"), environment( - MPFR_PREFIX=mpfr_path, CDD_PREFIX=cddlib_path + with ( + cwd(install_dir / "tool"), + environment(MPFR_PREFIX=mpfr_path, CDD_PREFIX=cddlib_path), ): subprocess.run(elina_cmd, shell=True) diff --git a/autoverify/cli/install/installers/nnenum/install.py b/autoverify/cli/install/installers/nnenum/install.py index 500dbb8..c50bbea 100644 --- a/autoverify/cli/install/installers/nnenum/install.py +++ b/autoverify/cli/install/installers/nnenum/install.py @@ -1,4 +1,5 @@ """nnenum installer.""" + from pathlib import Path from autoverify.cli.util.git import GitRepoInfo, clone_checkout_verifier diff --git a/autoverify/cli/install/installers/ovalbab/install.py b/autoverify/cli/install/installers/ovalbab/install.py index 459e9a8..8839fcd 100644 --- a/autoverify/cli/install/installers/ovalbab/install.py +++ b/autoverify/cli/install/installers/ovalbab/install.py @@ -1,4 +1,5 @@ """ovalbab installer.""" + import os import subprocess from pathlib import Path diff --git a/autoverify/cli/install/installers/verinet/install.py b/autoverify/cli/install/installers/verinet/install.py index 911b135..acff2db 100644 --- a/autoverify/cli/install/installers/verinet/install.py +++ b/autoverify/cli/install/installers/verinet/install.py @@ -1,4 +1,5 @@ """verinet installer.""" + from pathlib import Path from autoverify.cli.util.git import GitRepoInfo, clone_checkout_verifier diff --git a/autoverify/cli/main.py b/autoverify/cli/main.py index 6825a88..56ef70e 100644 --- a/autoverify/cli/main.py +++ b/autoverify/cli/main.py @@ -1,4 +1,5 @@ """CLI entry point module.""" + import argparse import sys diff --git a/autoverify/cli/util/git.py b/autoverify/cli/util/git.py index 7182d0b..adbf162 100644 --- a/autoverify/cli/util/git.py +++ b/autoverify/cli/util/git.py @@ -1,4 +1,5 @@ """Git and git repo utilities.""" + import os import shlex import subprocess diff --git a/autoverify/portfolio/hydra/cost_matrix.py b/autoverify/portfolio/hydra/cost_matrix.py index b300f3c..b70797a 100644 --- a/autoverify/portfolio/hydra/cost_matrix.py +++ b/autoverify/portfolio/hydra/cost_matrix.py @@ -1,4 +1,5 @@ """_summary_.""" + from collections.abc import Iterable, MutableMapping import numpy as np diff --git a/autoverify/portfolio/hydra/hydra.py b/autoverify/portfolio/hydra/hydra.py index f7e5172..33ac1c7 100644 --- a/autoverify/portfolio/hydra/hydra.py +++ b/autoverify/portfolio/hydra/hydra.py @@ -1,4 +1,5 @@ """_summary_.""" + import logging import random import sys diff --git a/autoverify/portfolio/portfolio.py b/autoverify/portfolio/portfolio.py index aab60b2..c1774b8 100644 --- a/autoverify/portfolio/portfolio.py +++ b/autoverify/portfolio/portfolio.py @@ -1,4 +1,5 @@ """Parallel portfolio.""" + from __future__ import annotations import datetime diff --git a/autoverify/portfolio/portfolio_runner.py b/autoverify/portfolio/portfolio_runner.py index 0cf1e4f..b060a34 100644 --- a/autoverify/portfolio/portfolio_runner.py +++ b/autoverify/portfolio/portfolio_runner.py @@ -1,4 +1,5 @@ """Class to run parallel portfolio.""" + import concurrent.futures import logging import signal diff --git a/autoverify/tune/tune_hydra.py b/autoverify/tune/tune_hydra.py index a6cfad7..26eb4ee 100644 --- a/autoverify/tune/tune_hydra.py +++ b/autoverify/tune/tune_hydra.py @@ -1,4 +1,5 @@ """_summary_.""" + from collections.abc import Sequence from pathlib import Path diff --git a/autoverify/tune/tune_verifier.py b/autoverify/tune/tune_verifier.py index 16161eb..e6fe94d 100644 --- a/autoverify/tune/tune_verifier.py +++ b/autoverify/tune/tune_verifier.py @@ -1,4 +1,5 @@ """_summary_.""" + import logging import sys from pathlib import Path diff --git a/autoverify/types.py b/autoverify/types.py index b374b87..10e6c3d 100644 --- a/autoverify/types.py +++ b/autoverify/types.py @@ -1,4 +1,5 @@ """Shared types.""" + # from dataclasses import dataclass, field from typing import Callable diff --git a/autoverify/util/cli.py b/autoverify/util/cli.py index 561bd06..8cc29f3 100644 --- a/autoverify/util/cli.py +++ b/autoverify/util/cli.py @@ -1,4 +1,5 @@ """CLI utility.""" + import ast from argparse import ArgumentTypeError from typing import Any diff --git a/autoverify/util/configs.py b/autoverify/util/configs.py index 86cda57..fe01c64 100644 --- a/autoverify/util/configs.py +++ b/autoverify/util/configs.py @@ -1,4 +1,5 @@ """_summary_.""" + import ast import re from pathlib import Path diff --git a/autoverify/util/cost_dict.py b/autoverify/util/cost_dict.py index 58496e2..19c3536 100644 --- a/autoverify/util/cost_dict.py +++ b/autoverify/util/cost_dict.py @@ -1,4 +1,5 @@ """_summary_.""" + import numpy as np from ConfigSpace import Configuration diff --git a/autoverify/util/dataclass.py b/autoverify/util/dataclass.py index c3b155f..84bcd6a 100644 --- a/autoverify/util/dataclass.py +++ b/autoverify/util/dataclass.py @@ -1,4 +1,5 @@ """_summary_.""" + import inspect from dataclasses import fields, is_dataclass from typing import Any diff --git a/autoverify/util/dict.py b/autoverify/util/dict.py index f75c705..61ecfa0 100644 --- a/autoverify/util/dict.py +++ b/autoverify/util/dict.py @@ -1,4 +1,5 @@ """Dictionary utilities.""" + from typing import Any diff --git a/autoverify/util/env.py b/autoverify/util/env.py index a599f95..aff2858 100644 --- a/autoverify/util/env.py +++ b/autoverify/util/env.py @@ -1,4 +1,5 @@ """Utilities for managing environments.""" + import os import shutil import sys diff --git a/autoverify/util/instances.py b/autoverify/util/instances.py index dd8871f..94abecf 100644 --- a/autoverify/util/instances.py +++ b/autoverify/util/instances.py @@ -1,4 +1,5 @@ """_summary_.""" + from __future__ import annotations import csv diff --git a/autoverify/util/loggers.py b/autoverify/util/loggers.py index a04b4df..c10ecc7 100644 --- a/autoverify/util/loggers.py +++ b/autoverify/util/loggers.py @@ -1,4 +1,5 @@ """Module-wide loggers.""" + # FIXME: Should use default logging conventions, this is bad # TODO: Why not just logging.getLogger(__name__)????? import logging diff --git a/autoverify/util/onnx.py b/autoverify/util/onnx.py index a18b60f..c417ca4 100644 --- a/autoverify/util/onnx.py +++ b/autoverify/util/onnx.py @@ -1,4 +1,5 @@ """Onnx utility functions.""" + from pathlib import Path import onnx diff --git a/autoverify/util/path.py b/autoverify/util/path.py index 7766849..7e73244 100644 --- a/autoverify/util/path.py +++ b/autoverify/util/path.py @@ -1,4 +1,5 @@ """Path/file utils.""" + from pathlib import Path diff --git a/autoverify/util/proc.py b/autoverify/util/proc.py index aa8d13d..673244b 100644 --- a/autoverify/util/proc.py +++ b/autoverify/util/proc.py @@ -1,4 +1,5 @@ """Utilities for process and CPU stuff.""" + import os import shlex import subprocess diff --git a/autoverify/util/resource_strategy.py b/autoverify/util/resource_strategy.py index c45044c..40efddd 100644 --- a/autoverify/util/resource_strategy.py +++ b/autoverify/util/resource_strategy.py @@ -1,4 +1,5 @@ """_summary_.""" + from enum import Enum from autoverify.types import ResourceList diff --git a/autoverify/util/resources.py b/autoverify/util/resources.py index 6e40a6c..795086c 100644 --- a/autoverify/util/resources.py +++ b/autoverify/util/resources.py @@ -1,4 +1,5 @@ """_summary_.""" + from autoverify.portfolio.portfolio import PortfolioScenario from autoverify.util.proc import cpu_count, nvidia_gpu_count from autoverify.util.resource_strategy import ResourceStrategy diff --git a/autoverify/util/smac.py b/autoverify/util/smac.py index 064a648..ff171d7 100644 --- a/autoverify/util/smac.py +++ b/autoverify/util/smac.py @@ -1,4 +1,5 @@ """SMAC util.""" + import copy import csv import json diff --git a/autoverify/util/target_function.py b/autoverify/util/target_function.py index 91ec1dd..f157183 100644 --- a/autoverify/util/target_function.py +++ b/autoverify/util/target_function.py @@ -1,4 +1,5 @@ """_summary_.""" + from pathlib import Path from ConfigSpace import Configuration diff --git a/autoverify/util/tempfiles.py b/autoverify/util/tempfiles.py index e4ac33e..0004ef6 100644 --- a/autoverify/util/tempfiles.py +++ b/autoverify/util/tempfiles.py @@ -1,4 +1,5 @@ """YAML file utils.""" + import atexit import json import tempfile diff --git a/autoverify/util/verification_instance.py b/autoverify/util/verification_instance.py index f7ada9f..6b3f86e 100644 --- a/autoverify/util/verification_instance.py +++ b/autoverify/util/verification_instance.py @@ -1,4 +1,5 @@ """VerificationInstance.""" + from __future__ import annotations from dataclasses import dataclass diff --git a/autoverify/util/verifiers.py b/autoverify/util/verifiers.py index 14d45bc..a12ba04 100644 --- a/autoverify/util/verifiers.py +++ b/autoverify/util/verifiers.py @@ -1,4 +1,5 @@ """Hardcoded verifier utility.""" + from ConfigSpace import ConfigurationSpace from autoverify.verifier import AbCrown, MnBab, Nnenum, OvalBab, Verinet diff --git a/autoverify/util/vnncomp.py b/autoverify/util/vnncomp.py index 3363a97..22bcac5 100644 --- a/autoverify/util/vnncomp.py +++ b/autoverify/util/vnncomp.py @@ -3,6 +3,7 @@ Return verifier instances that should be compatible with the given benchmark + instance. """ + from pathlib import Path from typing import Any diff --git a/autoverify/util/vnncomp_filters.py b/autoverify/util/vnncomp_filters.py index 10091fe..f8a01c2 100644 --- a/autoverify/util/vnncomp_filters.py +++ b/autoverify/util/vnncomp_filters.py @@ -1,4 +1,5 @@ """Filters VNNCOMP style instances.""" + from typing import Callable from autoverify.util.verification_instance import VerificationInstance diff --git a/autoverify/verifier/complete/abcrown/abcrown_yaml_config.py b/autoverify/verifier/complete/abcrown/abcrown_yaml_config.py index fd1dcda..c2262b1 100644 --- a/autoverify/verifier/complete/abcrown/abcrown_yaml_config.py +++ b/autoverify/verifier/complete/abcrown/abcrown_yaml_config.py @@ -1,4 +1,5 @@ """File for generating abcrown configs.""" + from pathlib import Path from typing import IO, Any diff --git a/autoverify/verifier/complete/abcrown/verifier.py b/autoverify/verifier/complete/abcrown/verifier.py index fbb9ac0..dc225e0 100644 --- a/autoverify/verifier/complete/abcrown/verifier.py +++ b/autoverify/verifier/complete/abcrown/verifier.py @@ -1,4 +1,5 @@ """ab-crown verifier.""" + from collections.abc import Iterable from pathlib import Path from typing import Any, ContextManager diff --git a/autoverify/verifier/complete/mnbab/configspace.py b/autoverify/verifier/complete/mnbab/configspace.py index 22cea15..7c2fb50 100644 --- a/autoverify/verifier/complete/mnbab/configspace.py +++ b/autoverify/verifier/complete/mnbab/configspace.py @@ -1,4 +1,5 @@ """_summary_.""" + from ConfigSpace import ( Categorical, ConfigurationSpace, diff --git a/autoverify/verifier/complete/mnbab/mnbab_json.py b/autoverify/verifier/complete/mnbab/mnbab_json.py index 1955745..9f35f2b 100644 --- a/autoverify/verifier/complete/mnbab/mnbab_json.py +++ b/autoverify/verifier/complete/mnbab/mnbab_json.py @@ -1,4 +1,5 @@ """_sumary_.""" + import csv import json import sys diff --git a/autoverify/verifier/complete/mnbab/verifier.py b/autoverify/verifier/complete/mnbab/verifier.py index 2808cd4..2ac16ea 100644 --- a/autoverify/verifier/complete/mnbab/verifier.py +++ b/autoverify/verifier/complete/mnbab/verifier.py @@ -1,4 +1,5 @@ """Nnenum verifier.""" + from pathlib import Path from typing import ContextManager diff --git a/autoverify/verifier/complete/nnenum/configspace.py b/autoverify/verifier/complete/nnenum/configspace.py index 652f80a..ae50b2b 100644 --- a/autoverify/verifier/complete/nnenum/configspace.py +++ b/autoverify/verifier/complete/nnenum/configspace.py @@ -1,4 +1,5 @@ """_summary_.""" + from ConfigSpace import ( Categorical, ConfigurationSpace, diff --git a/autoverify/verifier/complete/nnenum/verifier.py b/autoverify/verifier/complete/nnenum/verifier.py index f772ae1..c31c2af 100644 --- a/autoverify/verifier/complete/nnenum/verifier.py +++ b/autoverify/verifier/complete/nnenum/verifier.py @@ -1,4 +1,5 @@ """Nnenum verifier.""" + import shlex from pathlib import Path from typing import Any, ContextManager, Iterable diff --git a/autoverify/verifier/complete/ovalbab/ovalbab_json_config.py b/autoverify/verifier/complete/ovalbab/ovalbab_json_config.py index 7689051..2970dda 100644 --- a/autoverify/verifier/complete/ovalbab/ovalbab_json_config.py +++ b/autoverify/verifier/complete/ovalbab/ovalbab_json_config.py @@ -1,4 +1,5 @@ """Intermediate representation of ovalbab json configs.""" + import json from pathlib import Path from typing import IO, Any diff --git a/autoverify/verifier/complete/ovalbab/verifier.py b/autoverify/verifier/complete/ovalbab/verifier.py index 9a4016d..624e47c 100644 --- a/autoverify/verifier/complete/ovalbab/verifier.py +++ b/autoverify/verifier/complete/ovalbab/verifier.py @@ -1,4 +1,5 @@ """OvalBab verifier.""" + from collections.abc import Iterable from pathlib import Path from typing import Any, ContextManager diff --git a/autoverify/verifier/complete/verinet/configspace.py b/autoverify/verifier/complete/verinet/configspace.py index 18267b3..c45d2fc 100644 --- a/autoverify/verifier/complete/verinet/configspace.py +++ b/autoverify/verifier/complete/verinet/configspace.py @@ -1,4 +1,5 @@ """_summary_.""" + from ConfigSpace import Categorical, ConfigurationSpace, Float, Integer VerinetConfigspace = ConfigurationSpace(name="verinet") diff --git a/autoverify/verifier/complete/verinet/verifier.py b/autoverify/verifier/complete/verinet/verifier.py index 0f5f3b8..c6c13d2 100644 --- a/autoverify/verifier/complete/verinet/verifier.py +++ b/autoverify/verifier/complete/verinet/verifier.py @@ -1,4 +1,5 @@ """VerInet.""" + import shlex from pathlib import Path from typing import Any, ContextManager, Iterable diff --git a/autoverify/verifier/verifier.py b/autoverify/verifier/verifier.py index dd59549..b38dbe6 100644 --- a/autoverify/verifier/verifier.py +++ b/autoverify/verifier/verifier.py @@ -1,4 +1,5 @@ """Base verifier class.""" + import os import signal import subprocess diff --git a/autoverify/verify/eval_verifier.py b/autoverify/verify/eval_verifier.py index 2a20451..83c9560 100644 --- a/autoverify/verify/eval_verifier.py +++ b/autoverify/verify/eval_verifier.py @@ -3,6 +3,7 @@ This file is meant for functions that benchmark the performance of a verifier, collecting detailed results about the verification run. """ + import copy import logging from pathlib import Path diff --git a/tests/fake_vnncomp/gen_inst_csv.py b/tests/fake_vnncomp/gen_inst_csv.py index 4ee0bc4..faa5f7f 100644 --- a/tests/fake_vnncomp/gen_inst_csv.py +++ b/tests/fake_vnncomp/gen_inst_csv.py @@ -2,6 +2,7 @@ Creates an `instances.csv` file linking each network to each property. """ + import csv import sys from pathlib import Path diff --git a/tests/test_cli/test_cli.py b/tests/test_cli/test_cli.py index 21b4494..5a78d2a 100644 --- a/tests/test_cli/test_cli.py +++ b/tests/test_cli/test_cli.py @@ -1,4 +1,5 @@ """_summary_.""" + # TODO: Dont hardcore error strings, import them from somewhere instead import subprocess