"docs/source/examples/vscode:/vscode.git/clone" did not exist on "ba78cbdcd0177db9d6ec0947ddf81b5157f3535c"
Unverified Commit 4a3f90f6 authored by VVsssssk's avatar VVsssssk Committed by GitHub
Browse files

[FIx]Replace mmcv.fileclient to mmengine.fileclient (#1737)

* fix mmcv file client

* fix set_env

* fix mmcv file load and dump
parent 47bb07f7
...@@ -13,6 +13,7 @@ import time ...@@ -13,6 +13,7 @@ import time
from os import path as osp from os import path as osp
import mmcv import mmcv
import mmengine
import numpy as np import numpy as np
from nuscenes.nuscenes import NuScenes from nuscenes.nuscenes import NuScenes
...@@ -257,7 +258,7 @@ def update_nuscenes_infos(pkl_path, out_dir): ...@@ -257,7 +258,7 @@ def update_nuscenes_infos(pkl_path, out_dir):
print(f'Warning, you may overwriting ' print(f'Warning, you may overwriting '
f'the original data {pkl_path}.') f'the original data {pkl_path}.')
print(f'Reading from input file: {pkl_path}.') print(f'Reading from input file: {pkl_path}.')
data_list = mmcv.load(pkl_path) data_list = mmengine.load(pkl_path)
METAINFO = { METAINFO = {
'CLASSES': 'CLASSES':
('car', 'truck', 'trailer', 'bus', 'construction_vehicle', 'bicycle', ('car', 'truck', 'trailer', 'bus', 'construction_vehicle', 'bicycle',
...@@ -365,7 +366,7 @@ def update_nuscenes_infos(pkl_path, out_dir): ...@@ -365,7 +366,7 @@ def update_nuscenes_infos(pkl_path, out_dir):
print(f'ignore classes: {ignore_class_name}') print(f'ignore classes: {ignore_class_name}')
converted_data_info = dict(metainfo=METAINFO, data_list=converted_list) converted_data_info = dict(metainfo=METAINFO, data_list=converted_list)
mmcv.dump(converted_data_info, out_path, 'pkl') mmengine.dump(converted_data_info, out_path, 'pkl')
def update_kitti_infos(pkl_path, out_dir): def update_kitti_infos(pkl_path, out_dir):
...@@ -381,7 +382,7 @@ def update_kitti_infos(pkl_path, out_dir): ...@@ -381,7 +382,7 @@ def update_kitti_infos(pkl_path, out_dir):
'Person_sitting', 'Tram', 'Misc'), 'Person_sitting', 'Tram', 'Misc'),
} }
print(f'Reading from input file: {pkl_path}.') print(f'Reading from input file: {pkl_path}.')
data_list = mmcv.load(pkl_path) data_list = mmengine.load(pkl_path)
print('Start updating:') print('Start updating:')
converted_list = [] converted_list = []
for ori_info_dict in mmcv.track_iter_progress(data_list): for ori_info_dict in mmcv.track_iter_progress(data_list):
...@@ -494,7 +495,7 @@ def update_kitti_infos(pkl_path, out_dir): ...@@ -494,7 +495,7 @@ def update_kitti_infos(pkl_path, out_dir):
converted_data_info = dict( converted_data_info = dict(
metainfo={'DATASET': 'KITTI'}, data_list=converted_list) metainfo={'DATASET': 'KITTI'}, data_list=converted_list)
mmcv.dump(converted_data_info, out_path, 'pkl') mmengine.dump(converted_data_info, out_path, 'pkl')
def update_s3dis_infos(pkl_path, out_dir): def update_s3dis_infos(pkl_path, out_dir):
...@@ -505,7 +506,7 @@ def update_s3dis_infos(pkl_path, out_dir): ...@@ -505,7 +506,7 @@ def update_s3dis_infos(pkl_path, out_dir):
time.sleep(5) time.sleep(5)
METAINFO = {'CLASSES': ('table', 'chair', 'sofa', 'bookcase', 'board')} METAINFO = {'CLASSES': ('table', 'chair', 'sofa', 'bookcase', 'board')}
print(f'Reading from input file: {pkl_path}.') print(f'Reading from input file: {pkl_path}.')
data_list = mmcv.load(pkl_path) data_list = mmengine.load(pkl_path)
print('Start updating:') print('Start updating:')
converted_list = [] converted_list = []
for i, ori_info_dict in enumerate(mmcv.track_iter_progress(data_list)): for i, ori_info_dict in enumerate(mmcv.track_iter_progress(data_list)):
...@@ -555,7 +556,7 @@ def update_s3dis_infos(pkl_path, out_dir): ...@@ -555,7 +556,7 @@ def update_s3dis_infos(pkl_path, out_dir):
converted_data_info = dict( converted_data_info = dict(
metainfo={'DATASET': 'S3DIS'}, data_list=converted_list) metainfo={'DATASET': 'S3DIS'}, data_list=converted_list)
mmcv.dump(converted_data_info, out_path, 'pkl') mmengine.dump(converted_data_info, out_path, 'pkl')
def update_scannet_infos(pkl_path, out_dir): def update_scannet_infos(pkl_path, out_dir):
...@@ -571,7 +572,7 @@ def update_scannet_infos(pkl_path, out_dir): ...@@ -571,7 +572,7 @@ def update_scannet_infos(pkl_path, out_dir):
'showercurtrain', 'toilet', 'sink', 'bathtub', 'garbagebin') 'showercurtrain', 'toilet', 'sink', 'bathtub', 'garbagebin')
} }
print(f'Reading from input file: {pkl_path}.') print(f'Reading from input file: {pkl_path}.')
data_list = mmcv.load(pkl_path) data_list = mmengine.load(pkl_path)
print('Start updating:') print('Start updating:')
converted_list = [] converted_list = []
for ori_info_dict in mmcv.track_iter_progress(data_list): for ori_info_dict in mmcv.track_iter_progress(data_list):
...@@ -620,7 +621,7 @@ def update_scannet_infos(pkl_path, out_dir): ...@@ -620,7 +621,7 @@ def update_scannet_infos(pkl_path, out_dir):
converted_data_info = dict( converted_data_info = dict(
metainfo={'DATASET': 'SCANNET'}, data_list=converted_list) metainfo={'DATASET': 'SCANNET'}, data_list=converted_list)
mmcv.dump(converted_data_info, out_path, 'pkl') mmengine.dump(converted_data_info, out_path, 'pkl')
def update_sunrgbd_infos(pkl_path, out_dir): def update_sunrgbd_infos(pkl_path, out_dir):
...@@ -634,7 +635,7 @@ def update_sunrgbd_infos(pkl_path, out_dir): ...@@ -634,7 +635,7 @@ def update_sunrgbd_infos(pkl_path, out_dir):
'dresser', 'night_stand', 'bookshelf', 'bathtub') 'dresser', 'night_stand', 'bookshelf', 'bathtub')
} }
print(f'Reading from input file: {pkl_path}.') print(f'Reading from input file: {pkl_path}.')
data_list = mmcv.load(pkl_path) data_list = mmengine.load(pkl_path)
print('Start updating:') print('Start updating:')
converted_list = [] converted_list = []
for ori_info_dict in mmcv.track_iter_progress(data_list): for ori_info_dict in mmcv.track_iter_progress(data_list):
...@@ -689,7 +690,7 @@ def update_sunrgbd_infos(pkl_path, out_dir): ...@@ -689,7 +690,7 @@ def update_sunrgbd_infos(pkl_path, out_dir):
converted_data_info = dict( converted_data_info = dict(
metainfo={'DATASET': 'SUNRGBD'}, data_list=converted_list) metainfo={'DATASET': 'SUNRGBD'}, data_list=converted_list)
mmcv.dump(converted_data_info, out_path, 'pkl') mmengine.dump(converted_data_info, out_path, 'pkl')
def update_lyft_infos(pkl_path, out_dir): def update_lyft_infos(pkl_path, out_dir):
...@@ -698,7 +699,7 @@ def update_lyft_infos(pkl_path, out_dir): ...@@ -698,7 +699,7 @@ def update_lyft_infos(pkl_path, out_dir):
print(f'Warning, you may overwriting ' print(f'Warning, you may overwriting '
f'the original data {pkl_path}.') f'the original data {pkl_path}.')
print(f'Reading from input file: {pkl_path}.') print(f'Reading from input file: {pkl_path}.')
data_list = mmcv.load(pkl_path) data_list = mmengine.load(pkl_path)
METAINFO = { METAINFO = {
'CLASSES': 'CLASSES':
('car', 'truck', 'bus', 'emergency_vehicle', 'other_vehicle', ('car', 'truck', 'bus', 'emergency_vehicle', 'other_vehicle',
...@@ -793,7 +794,7 @@ def update_lyft_infos(pkl_path, out_dir): ...@@ -793,7 +794,7 @@ def update_lyft_infos(pkl_path, out_dir):
print(f'ignore classes: {ignore_class_name}') print(f'ignore classes: {ignore_class_name}')
converted_data_info = dict(metainfo=METAINFO, data_list=converted_list) converted_data_info = dict(metainfo=METAINFO, data_list=converted_list)
mmcv.dump(converted_data_info, out_path, 'pkl') mmengine.dump(converted_data_info, out_path, 'pkl')
def update_waymo_infos(pkl_path, out_dir): def update_waymo_infos(pkl_path, out_dir):
...@@ -817,7 +818,7 @@ def update_waymo_infos(pkl_path, out_dir): ...@@ -817,7 +818,7 @@ def update_waymo_infos(pkl_path, out_dir):
'CLASSES': ('Car', 'Pedestrian', 'Cyclist', 'Sign'), 'CLASSES': ('Car', 'Pedestrian', 'Cyclist', 'Sign'),
} }
print(f'Reading from input file: {pkl_path}.') print(f'Reading from input file: {pkl_path}.')
data_list = mmcv.load(pkl_path) data_list = mmengine.load(pkl_path)
print('Start updating:') print('Start updating:')
converted_list = [] converted_list = []
for ori_info_dict in mmcv.track_iter_progress(data_list): for ori_info_dict in mmcv.track_iter_progress(data_list):
...@@ -992,7 +993,7 @@ def update_waymo_infos(pkl_path, out_dir): ...@@ -992,7 +993,7 @@ def update_waymo_infos(pkl_path, out_dir):
converted_data_info = dict( converted_data_info = dict(
metainfo={'DATASET': 'Waymo'}, data_list=converted_list) metainfo={'DATASET': 'Waymo'}, data_list=converted_list)
mmcv.dump(converted_data_info, out_path, 'pkl') mmengine.dump(converted_data_info, out_path, 'pkl')
def generate_waymo_camera_instances(ori_info_dict, cam_keys): def generate_waymo_camera_instances(ori_info_dict, cam_keys):
......
# Copyright (c) OpenMMLab. All rights reserved. # Copyright (c) OpenMMLab. All rights reserved.
import argparse import argparse
import mmcv import mmengine
from mmcv import Config from mmcv import Config
from mmdet3d.datasets import build_dataset from mmdet3d.datasets import build_dataset
...@@ -31,7 +31,7 @@ def main(): ...@@ -31,7 +31,7 @@ def main():
# build the dataset # build the dataset
dataset = build_dataset(cfg.data.test) dataset = build_dataset(cfg.data.test)
results = mmcv.load(args.result) results = mmengine.load(args.result)
if getattr(dataset, 'show', None) is not None: if getattr(dataset, 'show', None) is not None:
# data loading pipeline for showing # data loading pipeline for showing
......
...@@ -3,6 +3,7 @@ import time ...@@ -3,6 +3,7 @@ import time
from os import path as osp from os import path as osp
import mmcv import mmcv
import mmengine
import numpy as np import numpy as np
from mmdet3d.structures import limit_period from mmdet3d.structures import limit_period
...@@ -18,7 +19,7 @@ def update_sunrgbd_infos(root_dir, out_dir, pkl_files): ...@@ -18,7 +19,7 @@ def update_sunrgbd_infos(root_dir, out_dir, pkl_files):
for pkl_file in pkl_files: for pkl_file in pkl_files:
in_path = osp.join(root_dir, pkl_file) in_path = osp.join(root_dir, pkl_file)
print(f'Reading from input file: {in_path}.') print(f'Reading from input file: {in_path}.')
a = mmcv.load(in_path) a = mmengine.load(in_path)
print('Start updating:') print('Start updating:')
for item in mmcv.track_iter_progress(a): for item in mmcv.track_iter_progress(a):
if 'rotation_y' in item['annos']: if 'rotation_y' in item['annos']:
...@@ -28,7 +29,7 @@ def update_sunrgbd_infos(root_dir, out_dir, pkl_files): ...@@ -28,7 +29,7 @@ def update_sunrgbd_infos(root_dir, out_dir, pkl_files):
out_path = osp.join(out_dir, pkl_file) out_path = osp.join(out_dir, pkl_file)
print(f'Writing to output file: {out_path}.') print(f'Writing to output file: {out_path}.')
mmcv.dump(a, out_path, 'pkl') mmengine.dump(a, out_path, 'pkl')
def update_outdoor_dbinfos(root_dir, out_dir, pkl_files): def update_outdoor_dbinfos(root_dir, out_dir, pkl_files):
...@@ -41,7 +42,7 @@ def update_outdoor_dbinfos(root_dir, out_dir, pkl_files): ...@@ -41,7 +42,7 @@ def update_outdoor_dbinfos(root_dir, out_dir, pkl_files):
for pkl_file in pkl_files: for pkl_file in pkl_files:
in_path = osp.join(root_dir, pkl_file) in_path = osp.join(root_dir, pkl_file)
print(f'Reading from input file: {in_path}.') print(f'Reading from input file: {in_path}.')
a = mmcv.load(in_path) a = mmengine.load(in_path)
print('Start updating:') print('Start updating:')
for k in a.keys(): for k in a.keys():
print(f'Updating samples of class {k}:') print(f'Updating samples of class {k}:')
...@@ -57,7 +58,7 @@ def update_outdoor_dbinfos(root_dir, out_dir, pkl_files): ...@@ -57,7 +58,7 @@ def update_outdoor_dbinfos(root_dir, out_dir, pkl_files):
out_path = osp.join(out_dir, pkl_file) out_path = osp.join(out_dir, pkl_file)
print(f'Writing to output file: {out_path}.') print(f'Writing to output file: {out_path}.')
mmcv.dump(a, out_path, 'pkl') mmengine.dump(a, out_path, 'pkl')
def update_nuscenes_or_lyft_infos(root_dir, out_dir, pkl_files): def update_nuscenes_or_lyft_infos(root_dir, out_dir, pkl_files):
...@@ -71,7 +72,7 @@ def update_nuscenes_or_lyft_infos(root_dir, out_dir, pkl_files): ...@@ -71,7 +72,7 @@ def update_nuscenes_or_lyft_infos(root_dir, out_dir, pkl_files):
for pkl_file in pkl_files: for pkl_file in pkl_files:
in_path = osp.join(root_dir, pkl_file) in_path = osp.join(root_dir, pkl_file)
print(f'Reading from input file: {in_path}.') print(f'Reading from input file: {in_path}.')
a = mmcv.load(in_path) a = mmengine.load(in_path)
print('Start updating:') print('Start updating:')
for item in mmcv.track_iter_progress(a['infos']): for item in mmcv.track_iter_progress(a['infos']):
boxes = item['gt_boxes'].copy() boxes = item['gt_boxes'].copy()
...@@ -85,7 +86,7 @@ def update_nuscenes_or_lyft_infos(root_dir, out_dir, pkl_files): ...@@ -85,7 +86,7 @@ def update_nuscenes_or_lyft_infos(root_dir, out_dir, pkl_files):
out_path = osp.join(out_dir, pkl_file) out_path = osp.join(out_dir, pkl_file)
print(f'Writing to output file: {out_path}.') print(f'Writing to output file: {out_path}.')
mmcv.dump(a, out_path, 'pkl') mmengine.dump(a, out_path, 'pkl')
parser = argparse.ArgumentParser(description='Arg parser for data coords ' parser = argparse.ArgumentParser(description='Arg parser for data coords '
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment