Bugfix: ${input} in convolution template (case: input same as data input)...

Bugfix: ${input} in convolution template (case: input same as data input) should not be a reference anymore due to the new version of the add_input function.
Test must be made with Blob "data" always due to the new version of the add_input function.

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

@@ -179,7 +179,7 @@ img = cv2.imread("3.jpg")                                   # Load test image
 img = cv2.resize(img, (28,28))                              # Resize to 28x28
 img = cv2.cvtColor( img, cv2.COLOR_RGB2GRAY )               # Covert to grayscale
 img = img.reshape((1,1,28,28)).astype('float32')            # Reshape to (1,1,28,28)
-workspace.FeedBlob("${tc.architectureInputs[0]}", img, device_option=device_opts)  # FeedBlob
+workspace.FeedBlob("data", img, device_option=device_opts)  # FeedBlob
 workspace.RunNet('deploy_net', num_iter=1)                  # Forward
 
 print("\nInput: {}".format(img.shape))

src/main/resources/templates/caffe2/elements/Convolution.ftl

@@ -17,7 +17,7 @@
 	<#assign kernelParameter = "kernel=[${kernelHeight},${kernelWidth}]">
 </#if>
 <#if input = tc.architectureInputs[0]>	<#-- TODO: CHECK COMPARISON -->
-		${element.name} = brew.conv(model, '${input}', '${element.name}', dim_in=1, dim_out=${element.channels?c}, ${kernelParameter}, ${strideParameter})
+		${element.name} = brew.conv(model, ${input}, '${element.name}', dim_in=1, dim_out=${element.channels?c}, ${kernelParameter}, ${strideParameter})
 <#else>
 		${element.name} = brew.conv(model, ${input}, '${element.name}', dim_in=${element.element.inputTypes[0].channels?c}, dim_out=${element.channels?c}, ${kernelParameter}, ${strideParameter})
 </#if>