diff --git a/optim_nn.py b/optim_nn.py index 736a6b5..59fc68b 100755 --- a/optim_nn.py +++ b/optim_nn.py @@ -911,7 +911,7 @@ def run(program, args=None): while training and learner.next(): avg_loss, losses = ritual.train_batched( - shuffled_inputs, shuffled_outputs, + inputs, outputs, config.batch_size, return_losses=True) batch_losses += losses diff --git a/optim_nn_mnist.py b/optim_nn_mnist.py index fcc28e3..f6c0dfa 100755 --- a/optim_nn_mnist.py +++ b/optim_nn_mnist.py @@ -197,7 +197,7 @@ while learner.next(): node.reg.lamb = act_t * node.reg.lamb_orig # HACK avg_loss, avg_mloss, losses, mlosses = ritual.train_batched( - shuffled_inputs, shuffled_outputs, + inputs, outputs, batch_size=bs, return_losses='both') fmt = "rate {:10.8f}, loss {:12.6e}, accuracy {:6.2f}%"