Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions example/tutorial_tfrecord3.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,12 @@

"""

import io
import json
import os
import time
import numpy as np
import tensorflow as tf
import tensorlayer as tl
from PIL import Image
from tensorlayer.layers import set_keep


def _int64_feature(value):
Expand Down Expand Up @@ -326,7 +323,7 @@ def prefetch_input_data(reader,
try:
# for TensorFlow 0.11
img = tf.image.resize_images(img, size=(resize_height, resize_width), method=tf.image.ResizeMethod.BILINEAR)
except:
except Exception:
# for TensorFlow 0.10
img = tf.image.resize_images(img, new_height=resize_height, new_width=resize_width, method=tf.image.ResizeMethod.BILINEAR)
# Crop to final dimensions.
Expand Down
8 changes: 5 additions & 3 deletions tensorlayer/prepro.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,10 @@ def apply_fn(results, i, data, kwargs):
if thread_count is None:
results = [None] * len(data)
threads = []
for i in range(len(data)):
t = threading.Thread(name='threading_and_return', target=apply_fn, args=(results, i, data[i], kwargs))
# for i in range(len(data)):
# t = threading.Thread(name='threading_and_return', target=apply_fn, args=(results, i, data[i], kwargs))
for i, d in enumerate(data):
t = threading.Thread(name='threading_and_return', target=apply_fn, args=(results, i, d, kwargs))
t.start()
threads.append(t)
else:
Expand All @@ -120,7 +122,7 @@ def apply_fn(results, i, data, kwargs):
if thread_count is None:
try:
return np.asarray(results)
except:
except Exception:
return results
else:
return np.concatenate(results)
Expand Down