Merge branch 'master' into added-trainer

.idea/vcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

src/main/resources/templates/mxnet/CNNCreator.ftl

@@ -107,6 +107,7 @@ class ${tc.fileNameWithoutEnding}:
 
     def train(self, batch_size,
               num_epoch=10,
+              eval_metric='acc',
               optimizer='adam',
               optimizer_params=(('learning_rate', 0.001),),
               load_checkpoint=True,
@@ -158,6 +159,7 @@ class ${tc.fileNameWithoutEnding}:
 
         self.module.fit(
             train_data=train_iter,
+            eval_metric=eval_metric,
             eval_data=test_iter,
             optimizer=optimizer,
             optimizer_params=optimizer_params,

src/test/resources/target_code/CNNCreator_Alexnet.py

@@ -107,6 +107,7 @@ class CNNCreator_Alexnet:
 
     def train(self, batch_size,
               num_epoch=10,
+              eval_metric='acc',
               optimizer='adam',
               optimizer_params=(('learning_rate', 0.001),),
               load_checkpoint=True,
@@ -158,6 +159,7 @@ class CNNCreator_Alexnet:
 
         self.module.fit(
             train_data=train_iter,
+            eval_metric=eval_metric,
             eval_data=test_iter,
             optimizer=optimizer,
             optimizer_params=optimizer_params,

src/test/resources/target_code/CNNCreator_CifarClassifierNetwork.py

@@ -107,6 +107,7 @@ class CNNCreator_CifarClassifierNetwork:
 
     def train(self, batch_size,
               num_epoch=10,
+              eval_metric='acc',
               optimizer='adam',
               optimizer_params=(('learning_rate', 0.001),),
               load_checkpoint=True,
@@ -158,6 +159,7 @@ class CNNCreator_CifarClassifierNetwork:
 
         self.module.fit(
             train_data=train_iter,
+            eval_metric=eval_metric,
             eval_data=test_iter,
             optimizer=optimizer,
             optimizer_params=optimizer_params,

src/test/resources/target_code/CNNCreator_VGG16.py

@@ -107,6 +107,7 @@ class CNNCreator_VGG16:
 
     def train(self, batch_size,
               num_epoch=10,
+              eval_metric='acc',
               optimizer='adam',
               optimizer_params=(('learning_rate', 0.001),),
               load_checkpoint=True,
@@ -158,6 +159,7 @@ class CNNCreator_VGG16:
 
         self.module.fit(
             train_data=train_iter,
+            eval_metric=eval_metric,
             eval_data=test_iter,
             optimizer=optimizer,
             optimizer_params=optimizer_params,