Skip to content

Commit e05c490

Browse files
authored
fixing some warnings messages from CI (aws#157)
Null warning mesg that were handled in the PR - 1) comparison with != for None comparison and 2) regex string was not raw
1 parent d49be8a commit e05c490

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

smdebug/core/index_reader.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,13 +362,13 @@ def _is_event_file_present(self, file):
362362
def list_index_files(self):
363363
index_dirname = IndexFileLocationUtils.get_index_path(self.path)
364364
# index files are json files or csv files ending with string ".csv" or ".json"
365-
index_files_regex = "(.+)\.(json|csv)$"
365+
index_files_regex = r"(.+)\.(json|csv)$"
366366
index_files = list_files_in_directory(index_dirname, file_regex=index_files_regex)
367367
return sorted(index_files)
368368

369369
def list_event_files(self, start_after_key=None):
370370
# event files are ending with string ".tfevents"
371-
event_file_regex = "(.+)\.(tfevents)$"
371+
event_file_regex = r"(.+)\.(tfevents)$"
372372
event_files = list_files_in_directory(
373373
get_path_to_events_directory(self.path), file_regex=event_file_regex
374374
)

smdebug/core/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ def parse_worker_name_from_file(filename: str) -> str:
205205
:return: worker_name: str
206206
"""
207207
# worker_2 = /tmp/ts-logs/index/000000001/000000001230_worker_2.json
208-
worker_name_regex = re.compile(".+\/\d+_(.+)\.(json|csv|tfevents)$")
208+
worker_name_regex = re.compile(r".+\/\d+_(.+)\.(json|csv|tfevents)$")
209209
worker_name_regex_match = re.match(worker_name_regex, filename)
210210
if worker_name_regex_match is None:
211211
raise IndexReaderException(f"Invalid File Found: {filename}")

tests/mxnet/test_hook_reduce_config.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,29 +55,29 @@ def test_save_config(hook=None, out_dir=None):
5555
assert len(tr.steps()) == 7
5656

5757
print(tr.tensor_names())
58-
tname = tr.tensor_names(regex="conv\d+_weight")[0]
58+
tname = tr.tensor_names(regex=r"conv\d+_weight")[0]
5959
# Global reduction with max and mean
6060
weight_tensor = tr.tensor(tname)
6161
max_val = weight_tensor.reduction_value(step_num=1, abs=False, reduction_name="max")
62-
assert max_val != None
62+
assert max_val is not None
6363
mean_val = weight_tensor.reduction_value(step_num=1, abs=False, reduction_name="mean")
64-
assert mean_val != None
64+
assert mean_val is not None
6565

6666
# custom reduction at step 4 with reduction = 'min' and abs reduction = 'max'
67-
tname = tr.tensor_names(regex="conv\d+_relu_input_0")[0]
67+
tname = tr.tensor_names(regex=r"conv\d+_relu_input_0")[0]
6868
relu_input = tr.tensor(tname)
6969
min_val = relu_input.reduction_value(step_num=4, abs=False, reduction_name="min")
70-
assert min_val != None
70+
assert min_val is not None
7171
abs_max_val = relu_input.reduction_value(step_num=4, abs=True, reduction_name="max")
72-
assert abs_max_val != None
72+
assert abs_max_val is not None
7373

7474
# Custom reduction with normalization
75-
tname = tr.tensor_names(regex="flatten\d+_input_0")[0]
75+
tname = tr.tensor_names(regex=r"flatten\d+_input_0")[0]
7676
flatten_input = tr.tensor(tname)
7777
l1_norm = flatten_input.reduction_value(step_num=4, abs=False, reduction_name="l1")
78-
assert l1_norm != None
78+
assert l1_norm is not None
7979
l2_norm = flatten_input.reduction_value(step_num=4, abs=True, reduction_name="l2")
80-
assert l2_norm != None
80+
assert l2_norm is not None
8181
if hook_created:
8282
shutil.rmtree(out_dir)
8383

tests/mxnet/test_modes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def test_modes(hook=None, path=None):
4444
assert grad_eval_steps == []
4545

4646
# Ensure that the weights are available in TRAIN and EVAL modes.
47-
wt_tns_name = tr.tensor_names(regex="conv\d+_weight")[0]
47+
wt_tns_name = tr.tensor_names(regex=r"conv\d+_weight")[0]
4848
wt_tns = tr.tensor(wt_tns_name)
4949
wt_train_steps = wt_tns.steps(mode=modes.TRAIN)
5050
wt_eval_steps = wt_tns.steps(mode=modes.EVAL)

tests/tensorflow/hooks/test_mirrored_strategy.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ def test_basic(out_dir, zcc=False):
323323
assert len(tr.tensor(tname).workers(s, ModeKeys.EVAL)) == 1 # as eval_dist = False
324324
assert tr.tensor(tname).value(s, mode=ModeKeys.EVAL) is not None
325325

326-
tensornames = tr.tensor_names(regex="Identity_\d+:0")
326+
tensornames = tr.tensor_names(regex=r"Identity_\d+:0")
327327
for s in tr.tensor(tensornames[0]).steps(ModeKeys.TRAIN):
328328
for w in tr.tensor(tensornames[0]).workers(s, ModeKeys.TRAIN):
329329
assert tr.tensor(tensornames[0]).value(s, worker=w, mode=ModeKeys.TRAIN) is not None
@@ -369,7 +369,7 @@ def test_eval_distributed(out_dir):
369369
assert len(tr.tensor(tname).workers(s, ModeKeys.EVAL)) == strategy.num_replicas_in_sync
370370
assert tr.tensor(tname).value(s, mode=ModeKeys.EVAL) is not None
371371

372-
tensornames = tr.tensor_names(regex="Identity_\d+:0")
372+
tensornames = tr.tensor_names(regex=r"Identity_\d+:0")
373373
for s in tr.tensor(tensornames[0]).steps(ModeKeys.TRAIN):
374374
for w in tr.tensor(tensornames[0]).workers(s, ModeKeys.TRAIN):
375375
assert tr.tensor(tensornames[0]).value(s, worker=w, mode=ModeKeys.TRAIN) is not None

0 commit comments

Comments
 (0)