Bienqq
/
car-detection-bayes
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updates

This commit is contained in:
Glenn Jocher 2019-07-20 18:55:36 +02:00
parent 0448d1109f
commit a6877daa41
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
utils/datasets.py
View File

@ -178,19 +178,16 @@ class LoadImagesAndLabels(Dataset): # for training/testing
if self.rect: if self.rect:
# Read image shapes # Read image shapes
sp = 'data' + os.sep + path.replace('.txt', '.shapes').split(os.sep)[-1] # shapefile path sp = 'data' + os.sep + path.replace('.txt', '.shapes').split(os.sep)[-1] # shapefile path
if not os.path.exists(sp): # read shapes using PIL and write shapefile for next time (faster)
s = [exif_size(Image.open(f)) for f in tqdm(self.img_files, desc='Reading image shapes')]
np.savetxt(sp, s, fmt='%g')
try: try:
with open(sp, 'r') as f: # read existing shapefile with open(sp, 'r') as f: # read existing shapefile
s = np.array([x.split() for x in f.read().splitlines()], dtype=np.float64) s = [x.split() for x in f.read().splitlines()]
assert len(s) == n, 'Shapefile out of sync' assert len(s) == n, 'Shapefile out of sync'
except: except:
os.remove(sp) s = [exif_size(Image.open(f)) for f in tqdm(self.img_files, desc='Reading image shapes')]
print('Shapefile deleted: %s. Please rerun again.' % sp) np.savetxt(sp, s, fmt='%g') # overwrites existing (if any)
# Sort by aspect ratio # Sort by aspect ratio
s = np.array(s, dtype=np.float64)
ar = s[:, 1] / s[:, 0] # aspect ratio ar = s[:, 1] / s[:, 0] # aspect ratio
i = ar.argsort() i = ar.argsort()
self.img_files = [self.img_files[i] for i in i] self.img_files = [self.img_files[i] for i in i]