Android: various fixes

cmake/python/setup.py

@@ -59,6 +59,7 @@ def main():
 
     #Dynamic load for backend switching
     libraries = ['dl']
+    library_dirs = []
 
     #Include directories
     numpy_include = os.path.join(find_module("numpy")[1], "core", "include")
@@ -87,7 +88,7 @@ def main():
 		    extra_link_args=['-Wl,-soname=_isaac.so'],
                     undef_macros=[],
                     include_dirs=include,
-                    library_dirs=[],
+                    library_dirs=library_dirs,
                     libraries=libraries)]
     
     #External

include/isaac/driver/external/CL/cl_ext.h

@@ -33,12 +33,7 @@
 extern "C" {
 #endif
 
-#ifdef __APPLE__
+#include "isaac/driver/external/CL/cl_ext.h"
-        #include <OpenCL/cl.h>
-    #include <AvailabilityMacros.h>
-#else
-        #include <CL/cl.h>
-#endif
 
 /* cl_khr_fp64 extension - no extension #define since it has no functions  */
 #define CL_DEVICE_DOUBLE_FP_CONFIG                  0x1032

lib/kernels/templates/gemm.cpp

@@ -56,7 +56,7 @@ gemm_parameters::gemm_parameters(unsigned int simd_width
       return 0;
   }
 
-  int gemm::is_invalid_impl(driver::Device const & device, expressions_tuple const &) const
+  int gemm::is_invalid_impl(driver::Device const &, expressions_tuple const &) const
   {
 //    if(device.vendor()==driver::Device::Vendor::NVIDIA && p_.simd_width > 1)
 //      return TEMPLATE_INVALID_SIMD_WIDTH;

python/setup.py

@@ -59,6 +59,7 @@ def main():
 
     #Dynamic load for backend switching
     libraries = ['dl']
+    library_dirs = []
 
     #Include directories
     numpy_include = os.path.join(find_module("numpy")[1], "core", "include")
@@ -72,7 +73,7 @@ def main():
       libraries += ['gnustl_shared']
 
     #Source files
-    src =  'src/lib/exception/operation_not_supported.cpp src/lib/exception/unknown_datatype.cpp src/lib/value_scalar.cpp src/lib/driver/check.cpp src/lib/driver/ndrange.cpp src/lib/driver/platform.cpp src/lib/driver/backend.cpp src/lib/driver/program.cpp src/lib/driver/command_queue.cpp src/lib/driver/event.cpp src/lib/driver/kernel.cpp src/lib/driver/handle.cpp src/lib/driver/device.cpp src/lib/driver/program_cache.cpp src/lib/driver/buffer.cpp src/lib/driver/context.cpp src/lib/driver/dispatch.cpp src/lib/kernels/templates/axpy.cpp src/lib/kernels/templates/gemv.cpp src/lib/kernels/templates/dot.cpp src/lib/kernels/templates/base.cpp src/lib/kernels/templates/ger.cpp src/lib/kernels/templates/gemm.cpp src/lib/kernels/stream.cpp src/lib/kernels/keywords.cpp src/lib/kernels/mapped_object.cpp src/lib/kernels/binder.cpp src/lib/kernels/parse.cpp src/lib/wrap/clBLAS.cpp src/lib/profiles/predictors/random_forest.cpp src/lib/profiles/presets.cpp src/lib/profiles/profiles.cpp src/lib/symbolic/execute.cpp src/lib/symbolic/expression.cpp src/lib/symbolic/io.cpp src/lib/symbolic/preset.cpp src/lib/array.cpp '.split() + [os.path.join('src', 'bind', sf)  for sf in ['_isaac.cpp', 'core.cpp', 'driver.cpp', 'kernels.cpp', 'exceptions.cpp']]
+    src =  'src/lib/symbolic/preset.cpp src/lib/symbolic/execute.cpp src/lib/symbolic/io.cpp src/lib/symbolic/expression.cpp src/lib/array.cpp src/lib/value_scalar.cpp src/lib/driver/backend.cpp src/lib/driver/device.cpp src/lib/driver/kernel.cpp src/lib/driver/buffer.cpp src/lib/driver/platform.cpp src/lib/driver/check.cpp src/lib/driver/program.cpp src/lib/driver/command_queue.cpp src/lib/driver/dispatch.cpp src/lib/driver/program_cache.cpp src/lib/driver/context.cpp src/lib/driver/event.cpp src/lib/driver/ndrange.cpp src/lib/driver/handle.cpp src/lib/exception/unknown_datatype.cpp src/lib/exception/operation_not_supported.cpp src/lib/profiles/presets.cpp src/lib/profiles/profiles.cpp src/lib/profiles/predictors/random_forest.cpp src/lib/kernels/templates/gemv.cpp src/lib/kernels/templates/axpy.cpp src/lib/kernels/templates/gemm.cpp src/lib/kernels/templates/ger.cpp src/lib/kernels/templates/dot.cpp src/lib/kernels/templates/base.cpp src/lib/kernels/mapped_object.cpp src/lib/kernels/stream.cpp src/lib/kernels/parse.cpp src/lib/kernels/keywords.cpp src/lib/kernels/binder.cpp src/lib/wrap/clBLAS.cpp '.split() + [os.path.join('src', 'bind', sf)  for sf in ['_isaac.cpp', 'core.cpp', 'driver.cpp', 'kernels.cpp', 'exceptions.cpp']]
     boostsrc = 'external/boost/libs/'
     for s in ['numpy','python','smart_ptr','system','thread']:
         src = src + [x for x in recursive_glob('external/boost/libs/' + s + '/src/','.cpp') if 'win32' not in x and 'pthread' not in x]
@@ -87,7 +88,7 @@ def main():
 		    extra_link_args=['-Wl,-soname=_isaac.so'],
                     undef_macros=[],
                     include_dirs=include,
-                    library_dirs=[],
+                    library_dirs=library_dirs,
                     libraries=libraries)]
     
     #External

tune/android/main.py

@@ -134,6 +134,9 @@ class IsaacApp(App):
         
     def show_benchmark(self):
         pass
+    
+    def on_pause(self):
+        return True
         
     def show_tune(self):
         if self.root.ids.sm.current != 'Tune':

tune/android/screens/tune.kv

@@ -22,9 +22,10 @@ IsaacScreen:
             size_hint: 1, .1
             on_release: app.start_tuning()
         
-        ScrollableLabel:
+        Label:
             id: out
             text: ''
             font_name: 'DroidSansMono'
+            text_size: self.width, self.height