From 49537ffc1e14951e5a9db6602d0d11e6ed04b091 Mon Sep 17 00:00:00 2001 From: QuanyiLi Date: Sat, 6 May 2023 22:10:58 +0100 Subject: [PATCH] format --- .style.yapf | 7 +++++++ format.sh | 20 ++++++++++++++++++++ scenarionet/builder/select_demo_pickles.py | 1 - scenarionet/converter/nuplan/utils.py | 4 ++-- scenarionet/converter/nuscenes/utils.py | 6 +++--- scenarionet/converter/utils.py | 10 +++------- scenarionet/examples/convert_nuplan.py | 15 ++++++++------- scenarionet/examples/convert_nuscenes.py | 16 +++++++++------- scenarionet/examples/convert_waymo.py | 14 ++++++++------ setup.py | 1 + 10 files changed, 61 insertions(+), 33 deletions(-) create mode 100644 .style.yapf create mode 100755 format.sh diff --git a/.style.yapf b/.style.yapf new file mode 100644 index 0000000..a1b60ce --- /dev/null +++ b/.style.yapf @@ -0,0 +1,7 @@ +[style] +based_on_style=pep8 +dedent_closing_brackets=True +split_before_first_argument=True +allow_split_before_dict_value=False +join_multiple_lines=False +column_limit=120 diff --git a/format.sh b/format.sh new file mode 100755 index 0000000..bf3b7b1 --- /dev/null +++ b/format.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash +# Usage: at the root dir >> bash scripts/format.sh + +# Check yapf version. +ver=$(yapf --version) +if ! echo $ver | grep -q 0.30.0; then + echo "Wrong YAPF version installed: 0.30.0 is required, not $ver. Please install via `pip install yapf==0.30.0`" + exit 1 +fi + +yapf --in-place --recursive -p --verbose --style .style.yapf scenarionet/ + +if [[ "$1" == '--test' ]]; then # Only for CI usage, user should not use --test flag. + if ! git diff --quiet &>/dev/null; then + echo '*** You have not formatted your code! Please run [bash format.sh] at root directory before commit! Thanks! ***' + exit 1 + else + echo "Code style test passed!" + fi +fi diff --git a/scenarionet/builder/select_demo_pickles.py b/scenarionet/builder/select_demo_pickles.py index 5ceb5d6..77b6323 100644 --- a/scenarionet/builder/select_demo_pickles.py +++ b/scenarionet/builder/select_demo_pickles.py @@ -1,6 +1,5 @@ import pickle - if __name__ == '__main__': with open("waymo120/0408_output_final/dataset_summary.pkl", "rb") as f: diff --git a/scenarionet/converter/nuplan/utils.py b/scenarionet/converter/nuplan/utils.py index 664c3da..4e07744 100644 --- a/scenarionet/converter/nuplan/utils.py +++ b/scenarionet/converter/nuplan/utils.py @@ -356,9 +356,9 @@ def extract_traffic(scenario: NuPlanScenario, center): type=MetaDriveType.UNSET, state=dict( position=np.zeros(shape=(episode_len, 3)), - heading=np.zeros(shape=(episode_len,)), + heading=np.zeros(shape=(episode_len, )), velocity=np.zeros(shape=(episode_len, 2)), - valid=np.zeros(shape=(episode_len,)), + valid=np.zeros(shape=(episode_len, )), length=np.zeros(shape=(episode_len, 1)), width=np.zeros(shape=(episode_len, 1)), height=np.zeros(shape=(episode_len, 1)) diff --git a/scenarionet/converter/nuscenes/utils.py b/scenarionet/converter/nuscenes/utils.py index c22eef4..18b43f7 100644 --- a/scenarionet/converter/nuscenes/utils.py +++ b/scenarionet/converter/nuscenes/utils.py @@ -128,9 +128,9 @@ def get_tracks_from_frames(nuscenes: NuScenes, scene_info, frames, num_to_interp type=MetaDriveType.UNSET, state=dict( position=np.zeros(shape=(episode_len, 3)), - heading=np.zeros(shape=(episode_len,)), + heading=np.zeros(shape=(episode_len, )), velocity=np.zeros(shape=(episode_len, 2)), - valid=np.zeros(shape=(episode_len,)), + valid=np.zeros(shape=(episode_len, )), length=np.zeros(shape=(episode_len, 1)), width=np.zeros(shape=(episode_len, 1)), height=np.zeros(shape=(episode_len, 1)) @@ -183,7 +183,7 @@ def get_tracks_from_frames(nuscenes: NuScenes, scene_info, frames, num_to_interp interpolate_tracks[id]["metadata"]["track_length"] = new_episode_len # valid first - new_valid = np.zeros(shape=(new_episode_len,)) + new_valid = np.zeros(shape=(new_episode_len, )) if track["state"]["valid"][0]: new_valid[0] = 1 for k, valid in enumerate(track["state"]["valid"][1:], start=1): diff --git a/scenarionet/converter/utils.py b/scenarionet/converter/utils.py index d25a32e..a4f7133 100644 --- a/scenarionet/converter/utils.py +++ b/scenarionet/converter/utils.py @@ -66,13 +66,9 @@ def contains_explicit_return(f): return any(isinstance(node, ast.Return) for node in ast.walk(ast.parse(inspect.getsource(f)))) -def write_to_directory(convert_func, - scenarios, - output_path, - dataset_version, - dataset_name, - force_overwrite=False, - **kwargs): +def write_to_directory( + convert_func, scenarios, output_path, dataset_version, dataset_name, force_overwrite=False, **kwargs +): """ Convert a batch of scenarios. """ diff --git a/scenarionet/examples/convert_nuplan.py b/scenarionet/examples/convert_nuplan.py index 607b4fe..dfb1f28 100644 --- a/scenarionet/examples/convert_nuplan.py +++ b/scenarionet/examples/convert_nuplan.py @@ -19,10 +19,11 @@ if __name__ == "__main__": # scenarios = get_nuplan_scenarios(data_root, map_root, logs=["2021.07.16.20.45.29_veh-35_01095_01486"]) scenarios = get_nuplan_scenarios(data_root, map_root) - write_to_directory(convert_func=convert_nuplan_scenario, - scenarios=scenarios, - output_path=output_path, - dataset_version=version, - dataset_name=dataset_name, - force_overwrite=force_overwrite, - ) + write_to_directory( + convert_func=convert_nuplan_scenario, + scenarios=scenarios, + output_path=output_path, + dataset_version=version, + dataset_name=dataset_name, + force_overwrite=force_overwrite, + ) diff --git a/scenarionet/examples/convert_nuscenes.py b/scenarionet/examples/convert_nuscenes.py index 3644a0f..f0e5fb6 100644 --- a/scenarionet/examples/convert_nuscenes.py +++ b/scenarionet/examples/convert_nuscenes.py @@ -17,10 +17,12 @@ if __name__ == "__main__": dataroot = '/home/shady/data/nuscenes' scenarios, nusc = get_nuscenes_scenarios(dataroot, version) - write_to_directory(convert_func=convert_nuscenes_scenario, - scenarios=scenarios, - output_path=output_path, - dataset_version=version, - dataset_name=dataset_name, - force_overwrite=force_overwrite, - nuscenes=nusc) + write_to_directory( + convert_func=convert_nuscenes_scenario, + scenarios=scenarios, + output_path=output_path, + dataset_version=version, + dataset_name=dataset_name, + force_overwrite=force_overwrite, + nuscenes=nusc + ) diff --git a/scenarionet/examples/convert_waymo.py b/scenarionet/examples/convert_waymo.py index 634a044..9640c43 100644 --- a/scenarionet/examples/convert_waymo.py +++ b/scenarionet/examples/convert_waymo.py @@ -17,9 +17,11 @@ if __name__ == '__main__': waymo_data_direction = os.path.join(SCENARIONET_DATASET_PATH, "waymo_origin") scenarios = get_waymo_scenarios(waymo_data_direction) - write_to_directory(convert_func=convert_waymo_scenario, - scenarios=scenarios, - output_path=output_path, - dataset_version=version, - dataset_name=dataset_name, - force_overwrite=force_overwrite) + write_to_directory( + convert_func=convert_waymo_scenario, + scenarios=scenarios, + output_path=output_path, + dataset_version=version, + dataset_name=dataset_name, + force_overwrite=force_overwrite + ) diff --git a/setup.py b/setup.py index 4f91429..02c4969 100644 --- a/setup.py +++ b/setup.py @@ -36,6 +36,7 @@ install_requires = [ "tqdm", "metadrive-simulator", "geopandas", + "yapf==0.30.0", "shapely" ]