Merge pull request #85 from dividiti/issue-84

Issue 84

Author: Daniil Efremov

.travis.yml

@@ -7,7 +7,7 @@ android:
     components:
         - platform-tools
         - tools
-        - build-tools-23.0.2
+        - build-tools-25.0.0
         - android-22
         - extra-android-m2repository
         - extra-google-m2repository

app/src/main/java/openscience/crowdsource/video/experiments/AppConfigService.java

@@ -27,7 +27,7 @@
 //todo it's better to implement all services using IoC
 public class AppConfigService {
 
-    public static final String DATA_LOCAL_TMP_VIENNACL_CACHE = "/data/local/tmp/viennacl_cache_";
+    public static final String DATA_LOCAL_TMP_VIENNACL_CACHE = "/data/local/tmp/viennacl_cache/";
     private final static String APP_CONFIG_DIR = "/sdcard/openscience/"; //todo get log dir from common config service
     private final static String APP_CONFIG_FILE_PATH = APP_CONFIG_DIR + "app_config.json";
 

app/src/main/java/openscience/crowdsource/video/experiments/MainActivity.java

@@ -763,7 +763,7 @@ protected String doInBackground(String... arg0) {
                     publishProgress("\nUnfortunately, no scenarios found for your device ...");
                     return null;
                 }
-
+                String localAppPath =  AppConfigService.getLocalAppPath() + File.separator + "openscience" + File.separator;
                 for (int i = 0; i < scenarios.length(); i++) {
                     JSONObject scenario = scenarios.getJSONObject(i);
                     final String module_uoa = scenario.getString("module_uoa");
@@ -845,7 +845,6 @@ public void println(String text) {
                                 // copyToAppSpace is not mandatory
                             }
                             if (copyToAppSpace != null && copyToAppSpace.equalsIgnoreCase("yes")) {
-                                String localAppPath =  AppConfigService.getLocalAppPath() + File.separator + "openscience" + File.separator;
                                 String fileAppDir = localAppPath + file.getString("path");
                                 File appfp = new File(fileAppDir);
                                 if (!appfp.exists()) {
@@ -933,13 +932,24 @@ public void println(String text) {
                     String openCLlibPath = null;
                     openCLlibPath = patchOpenCLIfRequired();
 
+                    String viennaclCachePath = "";
+
                     if (openCLlibPath != null) {
                         libPath = libPath + ":" + openCLlibPath;
+                        viennaclCachePath = localAppPath + File.separator + "viennacl_cache"+ File.separator;
+                        File appfp = new File(viennaclCachePath);
+                        if (!appfp.exists()) {
+                            if (!appfp.mkdirs()) {
+                                publishProgress("\nError creating dir (" + viennaclCachePath + ") ...");
+                                return null;
+                            }
+                        }
+
                     }
                     String[] scenarioEnv = {
                             "CT_REPEAT_MAIN=" + String.valueOf(1),
                             "LD_LIBRARY_PATH=" + libPath + ":$LD_LIBRARY_PATH",
-                            "VIENNACL_CACHE_PATH=" +  DATA_LOCAL_TMP_VIENNACL_CACHE
+                            "VIENNACL_CACHE_PATH=" +  viennaclCachePath
                     };
                     publishProgress("Prepared scenario env " +  scenarioEnv[0]);
                     publishProgress("Prepared scenario env " +  scenarioEnv[1]);
@@ -1016,6 +1026,17 @@ public void run() {
                     }
                     publishProgress("\nRecognition result:" + recognitionRawResultText);
 
+
+                    if (viennaclCachePath != null && !viennaclCachePath.trim().equals("")) {
+                        String[] lsCacheResult = openme.openme_run_program("ls  " + viennaclCachePath, null, viennaclCachePath);
+                        if (!lsCacheResult [1].isEmpty()) {
+                            publishProgress("ViennaCL cache generated " + lsCacheResult[1]);
+                        } else {
+                            publishProgress("ViennaCL cache not generated");
+                        }
+                    }
+
+
                     publishProgress("Submitting results and unexpected behavior (if any) to the Collective Knowledge Aggregator ...\n");
 
                     if (getCurl() == null) {