Support old phones for OpenCL scenarios #80

Author: Daniil Efremov

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

@@ -42,6 +42,12 @@ public class AppConfigService {
 
     public static final String path_opencl = "/system/vendor/lib/libOpenCL.so";
 
+    public static final String libOpenCLFileName = "libOpenCL.so";
+    public static final String maliGLESFilePaths[] = new String[]{
+            "/system/vendor/lib/egl/libGLES_mali.so",
+            "/system/vendor/egl/libGLES_mali.so"
+    };
+
     public static final String url_cserver = "http://cTuning.org/shared-computing-resources-json/ck.json";
 
     public static final String repo_uoa = "upload";

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

@@ -75,11 +75,12 @@
 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.libOpenCLFileName;
+import static openscience.crowdsource.video.experiments.AppConfigService.maliGLESFilePaths;
 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;
-import static openscience.crowdsource.video.experiments.Utils.getABI;
 import static openscience.crowdsource.video.experiments.Utils.validateReturnCode;
 
 /**
@@ -930,7 +931,7 @@ public void println(String text) {
 
                     //patrh open cl version
                     String openCLlibPath = null;
-//                    openCLlibPath = patchOpenCL(); temporary disabled 
+                    openCLlibPath = patchOpenCLIfRequired();
 
                     if (openCLlibPath != null) {
                         libPath = libPath + ":" + openCLlibPath;
@@ -1147,47 +1148,53 @@ private void showIsThatCorrectDialog(final String recognitionResultText, final S
             openResultActivity();
         }
 
-        private String patchOpenCL() {
-            String libOpenCLFileName = "libOpenCL.so";
-            String fromFilePath = "/system/vendor/lib/egl/libGLES_mali.so";
+        private String patchOpenCLIfRequired() {
+            if (PlatformFeaturesService.isOpenCLSupported()) {
+                // patch is not required
+                return null;
+            }
 
-            String targetAppFileDir = AppConfigService.getLocalAppPath() + File.separator + "openscience" + File.separator + "code/libopencl/armeabi-v7a";
-            String targetAppFilePath = targetAppFileDir + File.separator + libOpenCLFileName;
+            for (String fromFilePath : maliGLESFilePaths) {
 
-            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]);
-            }
+                String targetAppFileDir = AppConfigService.getLocalAppPath() + File.separator + "openscience" + File.separator + "code/libopencl";
+                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;
+
+                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;
-            }
+                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;
+                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;
             }
-            return targetAppFileDir;
+            return null;
         }
     }
 

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

@@ -430,10 +430,9 @@ public static JSONObject loadPlatformFeaturesFromServer() {
         if (ix > 0) pf_os_bits = "64";
 
         //Get OpenCL info **************************************************
-        File fopencl = new File(path_opencl);
-        long lfopencl = fopencl.length();
-
-        if (lfopencl > 0) {
+        if (isOpenCLSupported()) {
+            File fopencl = new File(path_opencl);
+            long lfopencl = fopencl.length();
             pf_gpu_opencl = "libOpenCL.so - found (" + Long.toString(lfopencl) + " bytes)";
             pf_gpu_openclx = "yes";
         } else {
@@ -859,4 +858,11 @@ public static JSONObject getPlatformFeaturesJSONObject(String pf_gpu_openclx, JS
         ft.put("platform_uoa", deviceInfo.getJ_sys_uid());
         return ft;
     }
+
+    // Get OpenCL info
+    public static boolean isOpenCLSupported() {
+        File fopencl = new File(path_opencl);
+        long lfopencl = fopencl.length();
+        return (lfopencl > 0);
+    }
 }