Skip to content
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

Jump to bottom

Update manifest.py to use os.path for get_full_path #6598

Merged
merged 10 commits into from
May 10, 2023
Merged

Update manifest.py to use os.path for get_full_path #6598

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b1c3047
Update manifest.py to use os.path for get_full_path
stevehuang52 May 8, 2023
cd326c8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 8, 2023
c88cd05
Update manifest.py to get rid of pathlib
stevehuang52 May 8, 2023
9424ce7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 8, 2023
6acb281
Update manifest.py
stevehuang52 May 8, 2023
678ba09
Update manifest.py
stevehuang52 May 8, 2023
7a00c64
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 8, 2023
46d797f
Merge branch 'main' into stevehuang52-patch-4
stevehuang52 May 9, 2023
c72301e
Merge branch 'main' into stevehuang52-patch-4
stevehuang52 May 9, 2023
058700a
Merge branch 'main' into stevehuang52-patch-4
VahidooX May 10, 2023
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
23 changes: 9 additions & 14 deletions nemo/collections/common/parts/preprocessing/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import json
import os
from os.path import expanduser
from pathlib import Path
from typing import Any, Callable, Dict, Iterator, List, Optional, Union

from nemo.utils import logging
Expand Down Expand Up @@ -196,9 +195,11 @@ def get_full_path(
]
elif isinstance(audio_file, str):
# If input is a string, get the corresponding full path
audio_file = Path(audio_file)

if (len(str(audio_file)) < audio_file_len_limit) and not audio_file.is_absolute() and not audio_file.is_file():
if (
(len(audio_file) < audio_file_len_limit)
and not os.path.isabs(audio_file)
and not os.path.isfile(audio_file)
):
# If audio_file is not available and the path is not absolute, the full path is assumed
# to be relative to the manifest file parent directory or data directory.
if manifest_file is None and data_dir is None:
Expand All @@ -210,23 +211,17 @@ def get_full_path(

# resolve the data directory
if data_dir is None:
if is_datastore_path(manifest_file):
# WORKAROUND: pathlib does not support URIs, so use os.path
data_dir = os.path.dirname(manifest_file)
else:
data_dir = Path(manifest_file).parent.as_posix()
data_dir = os.path.dirname(manifest_file)

# assume audio_file path is relative to data_dir
audio_file_path = os.path.join(data_dir, audio_file.as_posix())
audio_file_path = os.path.join(data_dir, audio_file)

if is_datastore_path(audio_file_path):
# If audio was originally on an object store, use locally-cached path
audio_file_path = datastore_path_to_local_path(audio_file_path)

audio_file_path = Path(audio_file_path)

if audio_file_path.is_file():
audio_file = str(audio_file_path.absolute())
if os.path.isfile(audio_file_path):
audio_file = os.path.abspath(audio_file_path)
else:
audio_file = expanduser(audio_file)
else:
Expand Down