Skip to content

feat: add conf_path in PetrelBackend #2459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhouzaida merged 3 commits into from
Nov 28, 2022
Merged

feat: add conf_path in PetrelBackend #2459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1617470
feat: add conf_path in PetrelBackend
sunyc11 Nov 25, 2022
c271a62
fix: add conf_path in MockPetrelClient
sunyc11 Nov 25, 2022
7600c32
fix: adjust parameters order
sunyc11 Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions mmcv/fileio/file_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ class PetrelBackend(BaseStorageBackend):
``filepath`` will be replaced by ``dst``. Default: None.
enable_mc (bool, optional): Whether to enable memcached support.
Default: True.
conf_path (str, optional): Config path of Petrel client. Default: None.
`New in version 1.7.1`.

Examples:
>>> filepath1 = 's3://path/of/file'
Expand All @@ -108,14 +110,15 @@ class PetrelBackend(BaseStorageBackend):

def __init__(self,
path_mapping: Optional[dict] = None,
enable_mc: bool = True):
enable_mc: bool = True,
conf_path: str = None):
try:
from petrel_client import client
except ImportError:
raise ImportError('Please install petrel_client to enable '
'PetrelBackend.')

self._client = client.Client(enable_mc=enable_mc)
self._client = client.Client(conf_path=conf_path, enable_mc=enable_mc)
assert isinstance(path_mapping, dict) or path_mapping is None
self.path_mapping = path_mapping

Expand Down
6 changes: 5 additions & 1 deletion tests/test_fileclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,13 @@ def Get(self, filepath):

class MockPetrelClient:

def __init__(self, enable_mc=True, enable_multi_cluster=False):
def __init__(self,
enable_mc=True,
enable_multi_cluster=False,
conf_path=None):
self.enable_mc = enable_mc
self.enable_multi_cluster = enable_multi_cluster
self.conf_path = conf_path

def Get(self, filepath):
with open(filepath, 'rb') as f:
Expand Down