Merge pull request #79 from dividiti/issue-78

Issue 78 - it now works on S7! Thanks! The next step is to check that it will work on other mobile phones (without breaking compatibility with S7) ...

Author: gfursin

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

@@ -27,6 +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_";
     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";
 
@@ -168,6 +169,23 @@ synchronized public static String getRecognitionResultText() {
     }
 
 
+    synchronized public static String parsePredictionRawResult(String value) {
+        final String[] predictions = value.split("[\\r\\n]+");
+        //skip prefix
+        boolean isPredictionStarted = false;
+        StringBuilder predictionBuilder = new StringBuilder();
+        for (String prediction : predictions) {
+            if (prediction.contains("Prediction")){
+                isPredictionStarted = true;
+                continue;
+            }
+            if(isPredictionStarted) {
+                predictionBuilder.append(prediction).append("\n");
+            }
+        }
+        return predictionBuilder.toString();
+    }
+
     synchronized public static void updatePreviewRecognitionText(String value) {
         AppConfig appConfig = loadAppConfig();
         if (appConfig == null) {
@@ -176,8 +194,8 @@ synchronized public static void updatePreviewRecognitionText(String value) {
         if (previewRecognitionTextUpdater != null) {
             if (value != null) {
                 final String[] predictions = value.split("[\\r\\n]+");
-                if (predictions.length >= 2) {
-                    String previewRecognitionText = predictions[1];
+                if (predictions.length >= 1) {
+                    String previewRecognitionText = predictions[0];
                     appConfig.setPreviewRecognitionText(previewRecognitionText);
                     previewRecognitionTextUpdater.update(previewRecognitionText);
                 }

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

@@ -69,11 +69,13 @@
 import javax.microedition.khronos.opengles.GL10;
 
 import static openscience.crowdsource.video.experiments.AppConfigService.COMMAND_CHMOD_744;
+import static openscience.crowdsource.video.experiments.AppConfigService.DATA_LOCAL_TMP_VIENNACL_CACHE;
 import static openscience.crowdsource.video.experiments.AppConfigService.cachedScenariosFilePath;
 import static openscience.crowdsource.video.experiments.AppConfigService.externalSDCardOpensciencePath;
 import static openscience.crowdsource.video.experiments.AppConfigService.externalSDCardOpenscienceTmpPath;
 import static openscience.crowdsource.video.experiments.AppConfigService.externalSDCardPath;
 import static openscience.crowdsource.video.experiments.AppConfigService.initAppConfig;
+import static openscience.crowdsource.video.experiments.AppConfigService.parsePredictionRawResult;
 import static openscience.crowdsource.video.experiments.AppConfigService.url_cserver;
 import static openscience.crowdsource.video.experiments.RecognitionScenarioService.PRELOADING_TEXT;
 import static openscience.crowdsource.video.experiments.Utils.createDirIfNotExist;
@@ -926,9 +928,17 @@ public void println(String text) {
 
                     String scenarioCmd = meta.getString("cmd");
 
+                    //patrh open cl version
+                    String openCLlibPath = null;
+//                    openCLlibPath = patchOpenCL(); temporary disabled 
+
+                    if (openCLlibPath != null) {
+                        libPath = libPath + ":" + openCLlibPath;
+                    }
                     String[] scenarioEnv = {
                             "CT_REPEAT_MAIN=" + String.valueOf(1),
                             "LD_LIBRARY_PATH=" + libPath + ":$LD_LIBRARY_PATH",
+                            "VIENNACL_CACHE_PATH=" +  DATA_LOCAL_TMP_VIENNACL_CACHE
                     };
                     publishProgress("Prepared scenario env " +  scenarioEnv[0]);
                     publishProgress("Prepared scenario env " +  scenarioEnv[1]);
@@ -962,7 +972,8 @@ public void run() {
                     List<Long> processingTimes = new LinkedList<>();
                     List<List<Double[]>> cpuFreqs = new LinkedList<>();
                     JSONArray fineGrainTimerJSONArray = new JSONArray();
-                    String recognitionResultText = null;
+                    String recognitionRawResultText = null;
+                    String predictions = null;
                     for (int it = 0; it <= iterationNum; it ++) {
                         if (it == 0) {
                             publishProgress("Recognition in progress (the device is warming up) ...\n");
@@ -972,8 +983,8 @@ public void run() {
                         long startTime = System.currentTimeMillis();
                         String[] recognitionResult = openme.openme_run_program(scenarioCmd, scenarioEnv, executablePath); //todo fix ck response cmd value: addRecognitionScenario appropriate path to executable from according to path value at "file" json
                         Long processingTime = System.currentTimeMillis() - startTime;
-                        recognitionResultText = recognitionResult[1]; // todo it better to compare recognition results and print error
-                        if (recognitionResultText == null || recognitionResultText.trim().equals("")) {
+                        recognitionRawResultText = recognitionResult[1]; // todo it better to compare recognition results and print error
+                        if (recognitionRawResultText == null || recognitionRawResultText.trim().equals("")) {
                             publishProgress("\nError Recognition result is empty ...\n");
                             if (recognitionResult.length>=1 && recognitionResult[0] != null && !recognitionResult[0].trim().equals("")) {
                                 publishProgress("\nRecognition errors: " + recognitionResult[0]);
@@ -983,11 +994,12 @@ public void run() {
                             }
                             return null;
                         }
+                        predictions = parsePredictionRawResult(recognitionRawResultText);
                         if (it == 0) {
                             // the first iteration is used for warming up the device if it was in a low power state
                             publishProgress(" * Recognition time  (warming up) " + processingTime + " ms \n");
-                            publishProgress("\nRecognition result (warming up):\n " + recognitionResultText);
-                            AppConfigService.updatePreviewRecognitionText(recognitionResultText);
+                            publishProgress("\nRecognition result (warming up):\n " + recognitionRawResultText);
+                            AppConfigService.updatePreviewRecognitionText(predictions);
                             continue;
                         }
                         publishProgress(" * Recognition time " + it + ": " + processingTime + " ms \n");
@@ -1001,7 +1013,7 @@ public void run() {
                             publishProgress("Error on reading fine-grain timers" + e.getLocalizedMessage());
                         }
                     }
-                    publishProgress("\nRecognition result:" + recognitionResultText);
+                    publishProgress("\nRecognition result:" + recognitionRawResultText);
 
                     publishProgress("Submitting results and unexpected behavior (if any) to the Collective Knowledge Aggregator ...\n");
 
@@ -1015,7 +1027,7 @@ public void run() {
                         JSONArray processingTimesJSON = new JSONArray(processingTimes);
                         results.put("xopenme", fineGrainTimerJSONArray);
                         results.put("time", processingTimesJSON);
-                        results.put("prediction", recognitionResultText);
+                        results.put("prediction", predictions);
 
                         results.put("image_width", imageInfo.getWidth());
                         results.put("image_height", imageInfo.getHeight());
@@ -1093,7 +1105,7 @@ public void run() {
                     AppConfigService.updateResultURL(resultURL);
                     publishProgress('\n' + status + '\n');
 
-                    showIsThatCorrectDialog(recognitionResultText, actualImageFilePath, data_uid, behavior_uid, dataUID);
+                    showIsThatCorrectDialog(predictions, actualImageFilePath, data_uid, behavior_uid, dataUID);
                 }
             } catch (JSONException e) {
                 publishProgress("\nError obtaining key 'error' from OpenME output (" + e.getMessage() + ") ...");
@@ -1119,7 +1131,7 @@ private void showIsThatCorrectDialog(final String recognitionResultText, final S
                                              final String behavior_uid, final String crowd_uid) {
             String[] predictions = recognitionResultText.split("[\\r\\n]+");
 
-            if (predictions.length < 2) {
+            if (predictions.length < 1) {
                 publishProgress("\nError incorrect result text format ");
                 return;
             }
@@ -1134,6 +1146,49 @@ private void showIsThatCorrectDialog(final String recognitionResultText, final S
             AppConfigService.updateState(AppConfigService.AppConfig.State.RESULT);
             openResultActivity();
         }
+
+        private String patchOpenCL() {
+            String libOpenCLFileName = "libOpenCL.so";
+            String fromFilePath = "/system/vendor/lib/egl/libGLES_mali.so";
+
+            String targetAppFileDir = AppConfigService.getLocalAppPath() + File.separator + "openscience" + File.separator + "code/libopencl/armeabi-v7a";
+            String targetAppFilePath = targetAppFileDir + File.separator + libOpenCLFileName;
+
+            String[] rmResult = openme.openme_run_program("rm " + targetAppFilePath, null, targetAppFileDir);
+            if (rmResult[0].isEmpty() && rmResult[1].isEmpty() && rmResult[2].isEmpty()) {
+                publishProgress(" * File " + targetAppFilePath + " successfully removed...\n");
+            } else {
+                publishProgress("\nError removing  file " + fromFilePath + " ..." + rmResult[0] + " " + rmResult[1] + " " + rmResult[2]);
+            }
+
+
+            File appfp = new File(targetAppFileDir);
+            if (!appfp.exists()) {
+                if (!appfp.mkdirs()) {
+                    publishProgress("\nError creating dir (" + targetAppFileDir + ") ...");
+                    return null;
+                }
+            }
+
+
+            try {
+                copy_bin_file(fromFilePath, targetAppFilePath);
+                publishProgress("\n * File " + fromFilePath + " successfully copied to " + targetAppFilePath);
+            } catch (IOException e) {
+                e.printStackTrace();
+                publishProgress("\nError copying file " + fromFilePath + " to " + targetAppFilePath + " ..." + e.getLocalizedMessage());
+                return null;
+            }
+
+            String[] chmodResult = openme.openme_run_program(COMMAND_CHMOD_744 + " " + targetAppFilePath, null, targetAppFileDir);
+            if (chmodResult[0].isEmpty() && chmodResult[1].isEmpty() && chmodResult[2].isEmpty()) {
+                publishProgress(" * File " + targetAppFilePath + " successfully set as executable ...\n");
+            } else {
+                publishProgress("\nError setting  file " + fromFilePath + " as executable ...");
+                return null;
+            }
+            return targetAppFileDir;
+        }
     }
 
     private void openResultActivity() {

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

@@ -102,20 +102,20 @@ public void onClick(View arg0) {
         if (recognitionResultText != null) {
             final String[] predictions = recognitionResultText.split("[\\r\\n]+");
 
-            if (predictions.length < 2) {
+            if (predictions.length < 1) {
                 AppLogger.logMessage("Error incorrect result text format...");
                 return;
             }
 
-            for (int p = 1; p <= predictions.length; p++) {
+            for (int p = 0; p <= predictions.length; p++) {
                 LinearLayout ll = new LinearLayout(this);
                 ll.setOrientation(LinearLayout.HORIZONTAL);
                 final TextView resultItemView = new TextView(this);
                 resultItemView.setPadding(0, 20, 0 , 20);
                 Spanned spanned;
                 final EditText edittext = new EditText(ResultActivity.this);
                 edittext.setEnabled(false);
-                int skipIndex = 1; // 0 - mean do not skip
+                int skipIndex = 0;
                 if (p == skipIndex) {
                     spanned = Html.fromHtml("<font color='red'><b>" + predictions[p] + "</b></font>");
                     TextView correctResultvalue = (TextView) findViewById(R.id.predictedResultValue);