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

Windows Python 3.7 .isfile() fix #9879

Merged
merged 12 commits into from
Oct 24, 2022
Merged

Windows Python 3.7 .isfile() fix #9879

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7cb97a7
Update dataloaders.py
SSTato Oct 21, 2022
a1eed3e
Update general.py
SSTato Oct 22, 2022
37f8e48
Update general.py
glenn-jocher Oct 22, 2022
f5a8f29
Update dataloaders.py
glenn-jocher Oct 22, 2022
068f290
Update dataloaders.py
glenn-jocher Oct 22, 2022
b1d9468
Update general.py
SSTato Oct 24, 2022
6aa9657
Update ci-testing.yml
SSTato Oct 24, 2022
dfbcd26
Update ci-testing.yml
SSTato Oct 24, 2022
95100d3
Update ci-testing.yml
SSTato Oct 24, 2022
609b48e
Update general.py
SSTato Oct 24, 2022
91c4d76
Update general.py
SSTato Oct 24, 2022
efe15f4
Update dataloaders.py
SSTato Oct 24, 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
6 changes: 5 additions & 1 deletion utils/dataloaders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,11 @@ def __init__(self, sources='streams.txt', img_size=640, stride=32, auto=True, tr
self.img_size = img_size
self.stride = stride
self.vid_stride = vid_stride # video frame-rate stride
sources = Path(sources).read_text().rsplit() if Path(sources).is_file() else [sources]
if os.path.isfile(sources):
with open(sources) as f:
sources = [x.strip() for x in f.read().strip().splitlines() if len(x.strip())]
else:
sources = [sources]
n = len(sources)
self.sources = [clean_str(x) for x in sources] # clean source names for later
self.imgs, self.fps, self.frames, self.threads = [None] * n, [0] * n, [0] * n, [None] * n
Expand Down