Skip to content

Commit 1496de4

Browse files
committed
Simplifying next_to_execute
Do not to return a list with an empty dict, but just an empty list.
1 parent 5bb6b1f commit 1496de4

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

neuralmonkey/runners/base_runner.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def executor(self) -> Executor:
7373

7474
def next_to_execute(self) -> NextExecute:
7575
"""Get the tensors and additional feed dicts for execution."""
76-
return self.executor.fetches, [{}]
76+
return self.executor.fetches, []
7777

7878
@abstractmethod
7979
def collect_results(self, results: List[Dict]) -> None:
@@ -122,7 +122,7 @@ def next_to_execute(self) -> NextExecute:
122122
for loss in self.executor.loss_names:
123123
fetches[loss] = tf.zeros([])
124124

125-
return fetches, [{}]
125+
return fetches, []
126126
# pylint: enable=too-few-public-methods
127127

128128
def __init__(self,

neuralmonkey/runners/runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def next_to_execute(self) -> NextExecute:
3030
fetches["train_xent"] = tf.zeros([])
3131
fetches["runtime_xent"] = tf.zeros([])
3232

33-
return fetches, [{}]
33+
return fetches, []
3434

3535
def collect_results(self, results: List[Dict]) -> None:
3636
train_loss = 0.

neuralmonkey/trainers/delayed_update_trainer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def next_to_execute(self) -> NextExecute:
4646
else: # RESETTING
4747
fetches = {"resets": self.executor.reset_ops}
4848

49-
return fetches, [{}]
49+
return fetches, []
5050

5151
def collect_results(self, results: List[Dict]) -> None:
5252
assert len(results) == 1

neuralmonkey/trainers/generic_trainer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def next_to_execute(self) -> NextExecute:
5757
if self.summaries:
5858
fetches.update(self.executor.summaries)
5959

60-
return fetches, [{}]
60+
return fetches, []
6161

6262
def collect_results(self, results: List[Dict]) -> None:
6363
assert len(results) == 1

neuralmonkey/trainers/test_multitask_trainer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,23 @@ def test_mt_trainer(self):
6464
# mparts = trainer.feedables
6565
fetches, feeds = executable.next_to_execute()
6666
# self.assertSetEqual(mparts, {self.mpart})
67-
self.assertFalse(feeds[0])
67+
self.assertFalse(feeds)
6868

6969
self.assertTrue(trainer.trainer_idx == 1)
7070
self.assertTrue(fetches["losses"][0] == self.mpart.loss)
7171

7272
executable = trainer.get_executable()
7373
fetches, feeds = executable.next_to_execute()
7474
# self.assertSetEqual(mparts, {self.mpart_2})
75-
self.assertFalse(feeds[0])
75+
self.assertFalse(feeds)
7676

7777
self.assertTrue(trainer.trainer_idx == 2)
7878
self.assertTrue(fetches["losses"][0] == self.mpart_2.loss)
7979

8080
executable = trainer.get_executable()
8181
fetches, feeds = executable.next_to_execute()
8282
# self.assertSetEqual(mparts, {self.mpart})
83-
self.assertFalse(feeds[0])
83+
self.assertFalse(feeds)
8484

8585
self.assertTrue(trainer.trainer_idx == 0)
8686
self.assertTrue(fetches["losses"][0] == self.mpart.loss)

0 commit comments

Comments
 (0)