Switched to CUNN test

test polished

Author: borisfom

demos/android-demo/assets/main.lua

@@ -5,6 +5,7 @@
 require 'torch'
 require 'cutorch'
 require 'cunn'
+-- require 'cudnn'
 require 'nnx'
 require 'dok'
 require 'image'
@@ -17,15 +18,21 @@ end
 
 print("Hello from Lua")
 
----
-print("Running cutorch.test()")
-cutorch.test()
+-- CuTorch test needs augmentation due to reduced type set.
+-- print("Running cutorch.test()")
+-- cutorch.test()
 
 
 print("Running cunn.test()")
-cunn.test()
+cunn.test('GPU')
+print("After cunn.test(GPU)")
 
--- nn.testcuda{'pointwise_forward'}
+-- nn.testcuda{'VolumetricConvolution_forward_batch'}
+-- cunn.test()
+--print("Running cudnn.test()")
+--cudnn.test()
+
+cunn.test('SpatialConvolutionLocal_forward_single')
 
 --- print('Running VolumetricConvolution_forward_batch:')
 --- nn.testcuda{'VolumetricConvolution_forward_batch'}

demos/android-demo/src/com/torch/Torch.java

@@ -36,7 +36,7 @@ protected String doInBackground(String... lua) {
 	    int count = lua.length;
 	    String response = "";
 	    for (int i = 0; i < count; i++) {
-		Log.d("doInBackground(%s)\n", lua[i]);
+		Log.d("Torch",  String.format("doInBackground(%s)\n", lua[i]));
 		response += evalAssetFile(lua[i]);
 	    }
 	    return response;
@@ -46,7 +46,7 @@ protected String doInBackground(String... lua) {
 
 	// Todo: extract native method to evaluate Lua String
     private String evalAssetFile(String lua) {
-	Log.d("Torch.evalAssetFile(%s)\n", lua);
+	Log.d("Torch", String.format("Torch.evalAssetFile(%s)\n", lua));
 	return jni_call(assetManager, info.nativeLibraryDir, lua);
     }
 

demos/android-demo/src/com/torch/torchdemo/TorchDemo.java

@@ -30,7 +30,7 @@ public TorchTask()
 	    }
 
 	protected void onPostExecute(String result) {
-	    Log.d("onPostExecute, Torch returned: %s)\n", result);
+	    Log.d("torchdemo", String.format("onPostExecute, Torch returned: %s", result));
 	    tv.setText(result);
 	    // setContentView(tv);
 	}