Skip to content

Commit 113e523

Browse files
author
Jonathan DEKHTIAR
authored
YAPF Update (#896)
YAPF Update
1 parent 9980f99 commit 113e523

File tree

9 files changed

+43
-32
lines changed

9 files changed

+43
-32
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ To release a new version, please update the changelog as followed:
7676
### Dependencies Update
7777
- nltk>=3.3,<3.4 => nltk>=3.3,<3.5 (PR #892)
7878
- pytest>=3.6,<3.11 => pytest>=3.6,<4.1 (PR #889)
79+
- yapf>=0.22,<0.25 => yapf==0.25.0 (PR #896)
7980

8081
### Deprecated
8182

‎requirements/requirements_test.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ pytest-cache>=1.0,<1.1
66
pytest-cov>=2.5,<2.7
77
pytest-xdist>=1.22,<1.25
88
sphinx>=1.7,<1.9
9-
yapf>=0.22,<0.25
9+
yapf==0.25.0

‎tensorlayer/db.py‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,8 @@ def find_top_model(self, sess, sort=None, model_name='model', **kwargs):
219219

220220
pc = self.db.Model.find(kwargs)
221221
print(
222-
"[Database] Find one model SUCCESS. kwargs:{} sort:{} save time:{} took: {}s".format(
223-
kwargs, sort, _datetime, round(time.time() - s, 2)
224-
)
222+
"[Database] Find one model SUCCESS. kwargs:{} sort:{} save time:{} took: {}s".
223+
format(kwargs, sort, _datetime, round(time.time() - s, 2))
225224
)
226225

227226
# put all informations of model into the TL layer
@@ -656,10 +655,9 @@ def run_top_task(self, task_name=None, sort=None, **kwargs):
656655
}}, return_document=pymongo.ReturnDocument.AFTER
657656
)
658657
logging.info(
659-
"[Database] Finished Task: task_name - {} sort: {} push time: {} took: {}s".format(
660-
task_name, sort, _datetime,
661-
time.time() - s
662-
)
658+
"[Database] Finished Task: task_name - {} sort: {} push time: {} took: {}s".
659+
format(task_name, sort, _datetime,
660+
time.time() - s)
663661
)
664662
return True
665663
except Exception as e:

‎tensorlayer/files/dataset_loaders/voc_dataset.py‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,9 @@ def _recursive_parse_xml_to_dict(xml):
204204
imgs_file_list = load_file_list(path=folder_imgs, regx='\\.jpg', printable=False)
205205
logging.info("[VOC] {} images found".format(len(imgs_file_list)))
206206

207-
imgs_file_list.sort(key=lambda s: int(s.replace('.', ' ').replace('_', '').split(' ')[-2])
208-
) # 2007_000027.jpg --> 2007000027
207+
imgs_file_list.sort(
208+
key=lambda s: int(s.replace('.', ' ').replace('_', '').split(' ')[-2])
209+
) # 2007_000027.jpg --> 2007000027
209210

210211
imgs_file_list = [os.path.join(folder_imgs, s) for s in imgs_file_list]
211212
# logging.info('IM',imgs_file_list[0::3333], imgs_file_list[-1])
@@ -215,17 +216,19 @@ def _recursive_parse_xml_to_dict(xml):
215216
folder_semseg = os.path.join(path, extracted_filename, "SegmentationClass")
216217
imgs_semseg_file_list = load_file_list(path=folder_semseg, regx='\\.png', printable=False)
217218
logging.info("[VOC] {} maps for semantic segmentation found".format(len(imgs_semseg_file_list)))
218-
imgs_semseg_file_list.sort(key=lambda s: int(s.replace('.', ' ').replace('_', '').split(' ')[-2])
219-
) # 2007_000032.png --> 2007000032
219+
imgs_semseg_file_list.sort(
220+
key=lambda s: int(s.replace('.', ' ').replace('_', '').split(' ')[-2])
221+
) # 2007_000032.png --> 2007000032
220222
imgs_semseg_file_list = [os.path.join(folder_semseg, s) for s in imgs_semseg_file_list]
221223
# logging.info('Semantic Seg IM',imgs_semseg_file_list[0::333], imgs_semseg_file_list[-1])
222224
##======== 3. instance segmentation maps path list
223225
# folder_insseg = path+"/"+extracted_filename+"/SegmentationObject/"
224226
folder_insseg = os.path.join(path, extracted_filename, "SegmentationObject")
225227
imgs_insseg_file_list = load_file_list(path=folder_insseg, regx='\\.png', printable=False)
226228
logging.info("[VOC] {} maps for instance segmentation found".format(len(imgs_semseg_file_list)))
227-
imgs_insseg_file_list.sort(key=lambda s: int(s.replace('.', ' ').replace('_', '').split(' ')[-2])
228-
) # 2007_000032.png --> 2007000032
229+
imgs_insseg_file_list.sort(
230+
key=lambda s: int(s.replace('.', ' ').replace('_', '').split(' ')[-2])
231+
) # 2007_000032.png --> 2007000032
229232
imgs_insseg_file_list = [os.path.join(folder_insseg, s) for s in imgs_insseg_file_list]
230233
# logging.info('Instance Seg IM',imgs_insseg_file_list[0::333], imgs_insseg_file_list[-1])
231234
else:
@@ -238,8 +241,9 @@ def _recursive_parse_xml_to_dict(xml):
238241
logging.info(
239242
"[VOC] {} XML annotation files for bounding box and object class found".format(len(imgs_ann_file_list))
240243
)
241-
imgs_ann_file_list.sort(key=lambda s: int(s.replace('.', ' ').replace('_', '').split(' ')[-2])
242-
) # 2007_000027.xml --> 2007000027
244+
imgs_ann_file_list.sort(
245+
key=lambda s: int(s.replace('.', ' ').replace('_', '').split(' ')[-2])
246+
) # 2007_000027.xml --> 2007000027
243247
imgs_ann_file_list = [os.path.join(folder_ann, s) for s in imgs_ann_file_list]
244248
# logging.info('ANN',imgs_ann_file_list[0::3333], imgs_ann_file_list[-1])
245249

‎tensorlayer/files/utils.py‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,8 +1189,9 @@ def _recursive_parse_xml_to_dict(xml):
11891189
imgs_file_list = load_file_list(path=folder_imgs, regx='\\.jpg', printable=False)
11901190
logging.info("[VOC] {} images found".format(len(imgs_file_list)))
11911191

1192-
imgs_file_list.sort(key=lambda s: int(s.replace('.', ' ').replace('_', '').split(' ')[-2])
1193-
) # 2007_000027.jpg --> 2007000027
1192+
imgs_file_list.sort(
1193+
key=lambda s: int(s.replace('.', ' ').replace('_', '').split(' ')[-2])
1194+
) # 2007_000027.jpg --> 2007000027
11941195

11951196
imgs_file_list = [os.path.join(folder_imgs, s) for s in imgs_file_list]
11961197
# logging.info('IM',imgs_file_list[0::3333], imgs_file_list[-1])
@@ -1200,17 +1201,19 @@ def _recursive_parse_xml_to_dict(xml):
12001201
folder_semseg = os.path.join(path, extracted_filename, "SegmentationClass")
12011202
imgs_semseg_file_list = load_file_list(path=folder_semseg, regx='\\.png', printable=False)
12021203
logging.info("[VOC] {} maps for semantic segmentation found".format(len(imgs_semseg_file_list)))
1203-
imgs_semseg_file_list.sort(key=lambda s: int(s.replace('.', ' ').replace('_', '').split(' ')[-2])
1204-
) # 2007_000032.png --> 2007000032
1204+
imgs_semseg_file_list.sort(
1205+
key=lambda s: int(s.replace('.', ' ').replace('_', '').split(' ')[-2])
1206+
) # 2007_000032.png --> 2007000032
12051207
imgs_semseg_file_list = [os.path.join(folder_semseg, s) for s in imgs_semseg_file_list]
12061208
# logging.info('Semantic Seg IM',imgs_semseg_file_list[0::333], imgs_semseg_file_list[-1])
12071209
# ======== 3. instance segmentation maps path list
12081210
# folder_insseg = path+"/"+extracted_filename+"/SegmentationObject/"
12091211
folder_insseg = os.path.join(path, extracted_filename, "SegmentationObject")
12101212
imgs_insseg_file_list = load_file_list(path=folder_insseg, regx='\\.png', printable=False)
12111213
logging.info("[VOC] {} maps for instance segmentation found".format(len(imgs_semseg_file_list)))
1212-
imgs_insseg_file_list.sort(key=lambda s: int(s.replace('.', ' ').replace('_', '').split(' ')[-2])
1213-
) # 2007_000032.png --> 2007000032
1214+
imgs_insseg_file_list.sort(
1215+
key=lambda s: int(s.replace('.', ' ').replace('_', '').split(' ')[-2])
1216+
) # 2007_000032.png --> 2007000032
12141217
imgs_insseg_file_list = [os.path.join(folder_insseg, s) for s in imgs_insseg_file_list]
12151218
# logging.info('Instance Seg IM',imgs_insseg_file_list[0::333], imgs_insseg_file_list[-1])
12161219
else:
@@ -1223,8 +1226,9 @@ def _recursive_parse_xml_to_dict(xml):
12231226
logging.info(
12241227
"[VOC] {} XML annotation files for bounding box and object class found".format(len(imgs_ann_file_list))
12251228
)
1226-
imgs_ann_file_list.sort(key=lambda s: int(s.replace('.', ' ').replace('_', '').split(' ')[-2])
1227-
) # 2007_000027.xml --> 2007000027
1229+
imgs_ann_file_list.sort(
1230+
key=lambda s: int(s.replace('.', ' ').replace('_', '').split(' ')[-2])
1231+
) # 2007_000027.xml --> 2007000027
12281232
imgs_ann_file_list = [os.path.join(folder_ann, s) for s in imgs_ann_file_list]
12291233
# logging.info('ANN',imgs_ann_file_list[0::3333], imgs_ann_file_list[-1])
12301234

‎tensorlayer/layers/convolution/deformable_conv.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,9 @@ def __init__(
107107
input_h = int(self.inputs.get_shape()[1])
108108
input_w = int(self.inputs.get_shape()[2])
109109
kernel_n = shape[0] * shape[1]
110-
initial_offsets = tf.stack(tf.meshgrid(tf.range(shape[0]), tf.range(shape[1]),
111-
indexing='ij')) # initial_offsets --> (kh, kw, 2)
110+
initial_offsets = tf.stack(
111+
tf.meshgrid(tf.range(shape[0]), tf.range(shape[1]), indexing='ij')
112+
) # initial_offsets --> (kh, kw, 2)
112113
initial_offsets = tf.reshape(initial_offsets, (-1, 2)) # initial_offsets --> (n, 2)
113114
initial_offsets = tf.expand_dims(initial_offsets, 0) # initial_offsets --> (1, n, 2)
114115
initial_offsets = tf.expand_dims(initial_offsets, 0) # initial_offsets --> (1, 1, n, 2)

‎tensorlayer/utils.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,9 @@ def exit_tensorflow(sess=None, port=6006):
573573

574574
elif _platform == "darwin":
575575
tl.logging.info('OS X: %s' % text)
576-
subprocess.Popen("lsof -i tcp:" + str(port) + " | grep -v PID | awk '{print $2}' | xargs kill",
577-
shell=True) # kill tensorboard
576+
subprocess.Popen(
577+
"lsof -i tcp:" + str(port) + " | grep -v PID | awk '{print $2}' | xargs kill", shell=True
578+
) # kill tensorboard
578579
elif _platform == "win32":
579580
raise NotImplementedError("this function is not supported on the Windows platform")
580581

‎tensorlayer/visualize.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -645,8 +645,9 @@ def draw_weights(W=None, second=10, saveable=True, shape=None, name='mnist', fig
645645
# feature = np.zeros_like(feature)
646646
# if np.mean(feature) < -0.015: # condition threshold
647647
# feature = np.zeros_like(feature)
648-
plt.imshow(np.reshape(feature, (shape[0], shape[1])), cmap='gray',
649-
interpolation="nearest") # , vmin=np.min(feature), vmax=np.max(feature))
648+
plt.imshow(
649+
np.reshape(feature, (shape[0], shape[1])), cmap='gray', interpolation="nearest"
650+
) # , vmin=np.min(feature), vmax=np.max(feature))
650651
# plt.title(name)
651652
# ------------------------------------------------------------
652653
# plt.imshow(np.reshape(W[:,count-1] ,(np.sqrt(size),np.sqrt(size))), cmap='gray', interpolation="nearest")

‎tests/test_tf_layers.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,9 @@ def get_network_3d(inputs, reuse=False):
162162
with tf.variable_scope("3D_network", reuse=reuse):
163163
net = tl.layers.InputLayer(inputs)
164164

165-
net1 = tl.layers.Conv3dLayer(net, shape=(2, 2, 2, 3, 32), strides=(1, 2, 2, 2, 1),
166-
name="Conv3dLayer") # 2 params
165+
net1 = tl.layers.Conv3dLayer(
166+
net, shape=(2, 2, 2, 3, 32), strides=(1, 2, 2, 2, 1), name="Conv3dLayer"
167+
) # 2 params
167168
net2 = tl.layers.DeConv3d(net1, name="DeConv3d") # 2 params
168169
net3 = tl.layers.MaxPool3d(net2, (1, 1, 1), name="MaxPool3d") # 0 params
169170
net4 = tl.layers.MeanPool3d(net3, (1, 1, 1), name="MeanPool3d") # 0 params

0 commit comments

Comments
 (0)