diff --git a/scenarionet/converter/waymo/utils.py b/scenarionet/converter/waymo/utils.py index c71275c..404c446 100644 --- a/scenarionet/converter/waymo/utils.py +++ b/scenarionet/converter/waymo/utils.py @@ -438,7 +438,7 @@ def get_waymo_scenarios(waymo_data_directory, start_index, num): logger.info("\nFind {} waymo files".format(num_files)) return all_result - + def preprocess_waymo_scenarios(files, worker_index): """ Convert the waymo files into scenario_pb2. This happens in each worker. diff --git a/scenarionet/tests/script/generate_sensor.py b/scenarionet/tests/script/generate_sensor.py index 1a76598..eabf3ee 100644 --- a/scenarionet/tests/script/generate_sensor.py +++ b/scenarionet/tests/script/generate_sensor.py @@ -50,7 +50,7 @@ if __name__ == "__main__": lane_line_detector=dict(num_lasers=0, distance=50), side_detector=dict(num_lasers=12, distance=50) ), - "data_directory": AssetLoader.file_path("nuscenes", return_raw_style=False), + "data_directory": AssetLoader.file_path("nuscenes", unix_style=False), # "image_observation": True, } diff --git a/scenarionet/tests/script/run_ckpt.py b/scenarionet/tests/script/run_ckpt.py index ec5e134..30658f6 100644 --- a/scenarionet/tests/script/run_ckpt.py +++ b/scenarionet/tests/script/run_ckpt.py @@ -9,7 +9,7 @@ if __name__ == "__main__": initialize_ray(test_mode=False, num_gpus=1) env = createGymWrapper(ScenarioEnv)( { - # "data_directory": AssetLoader.file_path("nuscenes", return_raw_style=False), + # "data_directory": AssetLoader.file_path("nuscenes", unix_style=False), "data_directory": "D:\\scenarionet_testset\\nuplan_test\\nuplan_test_w_raw", "use_render": True, # "agent_policy": ReplayEgoCarPolicy, diff --git a/scenarionet/tests/test_filter_overpass.py b/scenarionet/tests/test_filter_overpass.py index 00776f1..4c6e6d1 100644 --- a/scenarionet/tests/test_filter_overpass.py +++ b/scenarionet/tests/test_filter_overpass.py @@ -10,7 +10,7 @@ from scenarionet.builder.utils import merge_database def test_filter_overpass(): overpass_1 = os.path.join(SCENARIONET_PACKAGE_PATH, "tests", "test_dataset", "overpass") - overpass_in_md = AssetLoader.file_path("waymo", return_raw_style=False) + overpass_in_md = AssetLoader.file_path("waymo", unix_style=False) dataset_paths = [overpass_1, overpass_in_md] output_path = os.path.join(TMP_PATH, "combine") diff --git a/tutorial/read_established_scenarionet_dataset.ipynb b/tutorial/read_established_scenarionet_dataset.ipynb index a02d319..f415829 100644 --- a/tutorial/read_established_scenarionet_dataset.ipynb +++ b/tutorial/read_established_scenarionet_dataset.ipynb @@ -158,7 +158,7 @@ } ], "source": [ - "waymo_data = AssetLoader.file_path(AssetLoader.asset_path, \"waymo\", return_raw_style=False) # Use the built-in datasets with simulator\n", + "waymo_data = AssetLoader.file_path(AssetLoader.asset_path, \"waymo\", unix_style=False) # Use the built-in datasets with simulator\n", "os.listdir(waymo_data) # there are 3 waymo scenario file with a 'dataset_summary.pkl'" ] }, @@ -188,7 +188,7 @@ } ], "source": [ - "nuscenes_data = AssetLoader.file_path(AssetLoader.asset_path, \"nuscenes\", return_raw_style=False) # Use the built-in datasets with simulator\n", + "nuscenes_data = AssetLoader.file_path(AssetLoader.asset_path, \"nuscenes\", unix_style=False) # Use the built-in datasets with simulator\n", "os.listdir(nuscenes_data) # there are 10 nuscenes scenario file with a 'dataset_summary.pkl' and a 'dataset_summary.pkl'" ] }, diff --git a/tutorial/simulation.ipynb b/tutorial/simulation.ipynb index 67b416e..956a1c5 100644 --- a/tutorial/simulation.ipynb +++ b/tutorial/simulation.ipynb @@ -118,8 +118,8 @@ "threeD_render=False # turn on this to enable 3D render. It only works when you have a screen and not running on Colab.\n", "threeD_render=threeD_render and not RunningInCOLAB\n", "os.environ[\"SDL_VIDEODRIVER\"] = \"dummy\" # Hide the pygame window\n", - "waymo_data = AssetLoader.file_path(AssetLoader.asset_path, \"waymo\", return_raw_style=False) # Use the built-in datasets with simulator\n", - "nuscenes_data = AssetLoader.file_path(AssetLoader.asset_path, \"nuscenes\", return_raw_style=False) # Use the built-in datasets with simulator" + "waymo_data = AssetLoader.file_path(AssetLoader.asset_path, \"waymo\", unix_style=False) # Use the built-in datasets with simulator\n", + "nuscenes_data = AssetLoader.file_path(AssetLoader.asset_path, \"nuscenes\", unix_style=False) # Use the built-in datasets with simulator" ] }, {