Android: restored compatibility
This commit is contained in:
Philippe Tillet
@@ -25,8 +25,10 @@ else()
|
||||
endif()
|
||||
|
||||
#Binary to convert .cu files to const char *
|
||||
add_executable(bin2cpp ${CMAKE_MODULE_PATH}/helpers/bin2cpp.cpp)
|
||||
include("${CMAKE_MODULE_PATH}/helpers/CodeToH.cmake")
|
||||
if(NOT ANDROID)
|
||||
add_executable(bin2cpp ${CMAKE_MODULE_PATH}/helpers/bin2cpp.cpp)
|
||||
include("${CMAKE_MODULE_PATH}/helpers/CodeToH.cmake")
|
||||
endif()
|
||||
|
||||
#Source files
|
||||
file(GLOB_RECURSE LIBISAAC_SRC lib/*.cpp)
|
||||
|
||||
@@ -13,6 +13,7 @@ if(ANDROID)
|
||||
file(GLOB _TMP ${PATH})
|
||||
set(L_HINTS ${L_HINTS} ${_TMP})
|
||||
endforeach()
|
||||
find_library(OPENCL_LIBRARIES NAMES OpenCL NO_CMAKE_FIND_ROOT_PATH HINTS ${L_HINTS} )
|
||||
else()
|
||||
set(X86_CL_GLOB_HINTS /opt/AMDAPPSDK*/lib/x86_64)
|
||||
foreach(PATH ${X86_CL_GLOB_HINTS})
|
||||
@@ -20,9 +21,9 @@ else()
|
||||
set(L_HINTS ${L_HINTS} ${_TMP})
|
||||
endforeach()
|
||||
set(L_HINTS ${L_HINTS} ${CUDA_TOOLKIT_ROOT_DIR}/targets/x86_64-linux/lib/)
|
||||
find_library(OPENCL_LIBRARIES NAMES OpenCL HINTS ${L_HINTS} )
|
||||
endif()
|
||||
|
||||
find_library(OPENCL_LIBRARIES NAMES OpenCL HINTS ${L_HINTS} )
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(OpenCL DEFAULT_MSG OPENCL_LIBRARIES)
|
||||
mark_as_advanced(OpenCL)
|
||||
|
||||
1
cmake/android/example.sh
Normal file
1
cmake/android/example.sh
Normal file
@@ -0,0 +1 @@
|
||||
cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain/android.cmake -DANDROID_NDK=/opt/android-ndk-r10d/ -DANDROID_ABI=armeabi-v7a with NEON -DANDROID_NATIVE_API_LEVEL=19 -DANDROID_APK_API_LEVEL=19 -DANDROID_APK_RUN=1 ../
|
||||
@@ -1,8 +1,10 @@
|
||||
#Database
|
||||
set(DATABASE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/profiles/presets/")
|
||||
file(GLOB_RECURSE JSON_FILES "${DATABASE_PATH}/json/*.json")
|
||||
CODE_TO_H(SOURCES ${JSON_FILES} VARNAME json_files EXTENSION "hpp" OUTPUT_DIR "${DATABASE_PATH}"
|
||||
NAMESPACE "isaac presets" TARGET database EOF "1")
|
||||
if(NOT ANDROID)
|
||||
#Presets
|
||||
set(DATABASE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/profiles/presets/")
|
||||
file(GLOB_RECURSE JSON_FILES "${DATABASE_PATH}/json/*.json")
|
||||
CODE_TO_H(SOURCES ${JSON_FILES} VARNAME json_files EXTENSION "hpp" OUTPUT_DIR "${DATABASE_PATH}"
|
||||
NAMESPACE "isaac presets" TARGET database EOF "1")
|
||||
endif()
|
||||
|
||||
#Compilation
|
||||
if(ANDROID)
|
||||
|
||||
2
lib/external/to_string.hpp
vendored
2
lib/external/to_string.hpp
vendored
@@ -13,7 +13,7 @@ template<class T>
|
||||
inline std::string to_string ( T const t )
|
||||
{
|
||||
|
||||
#ifdef __CYGWIN__
|
||||
#if defined(ANDROID) || defined(__CYGWIN__)
|
||||
std::stringstream ss;
|
||||
ss << t;
|
||||
return ss.str();
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
340
python/setup.py
Executable file → Normal file
340
python/setup.py
Executable file → Normal file
@@ -1,170 +1,170 @@
|
||||
#Thanks to Andreas Knoeckler for providing stand-alone boost.python
|
||||
#through PyOpenCL and PyCUDA
|
||||
|
||||
import os, sys
|
||||
from distutils.ccompiler import show_compilers,new_compiler
|
||||
from distutils.command.build_ext import build_ext
|
||||
from distutils.command.build_py import build_py
|
||||
from distutils.core import setup, Extension
|
||||
from distutils.sysconfig import get_python_inc
|
||||
from distutils import sysconfig
|
||||
from imp import find_module
|
||||
from glob import glob
|
||||
from os.path import dirname
|
||||
|
||||
platform_cflags = {}
|
||||
platform_ldflags = {}
|
||||
platform_libs = {}
|
||||
|
||||
class build_ext_subclass(build_ext):
|
||||
def build_extensions(self):
|
||||
c = self.compiler.compiler_type
|
||||
if c in platform_cflags.keys():
|
||||
for e in self.extensions:
|
||||
e.extra_compile_args = platform_cflags[c]
|
||||
if c in platform_ldflags.keys():
|
||||
for e in self.extensions:
|
||||
e.extra_link_args = platform_ldflags[c]
|
||||
if c in platform_libs.keys():
|
||||
for e in self.extensions:
|
||||
try:
|
||||
e.libraries += platform_libs[c]
|
||||
except:
|
||||
e.libraries = platform_libs[c]
|
||||
build_ext.build_extensions(self)
|
||||
|
||||
def main():
|
||||
|
||||
def recursive_glob(rootdir='.', suffix=''):
|
||||
return [os.path.join(looproot, filename)
|
||||
for looproot, _, filenames in os.walk(rootdir)
|
||||
for filename in filenames if filename.endswith(suffix)]
|
||||
|
||||
def remove_prefixes(optlist, bad_prefixes):
|
||||
for bad_prefix in bad_prefixes:
|
||||
for i, flag in enumerate(optlist):
|
||||
if flag.startswith(bad_prefix):
|
||||
optlist.pop(i)
|
||||
break
|
||||
return optlist
|
||||
|
||||
def find_library(name, cmake_glob_list):
|
||||
cvars = sysconfig.get_config_vars()
|
||||
compiler = new_compiler()
|
||||
dirs = []
|
||||
for gpath in cmake_glob_list.split(';'):
|
||||
path = glob(gpath)
|
||||
if path:
|
||||
dirs += [path[0]]
|
||||
return compiler.find_library_file(cvars['LIBDIR'].split(';') + dirs, name)
|
||||
|
||||
def find_opencl():
|
||||
cvars = sysconfig.get_config_vars()
|
||||
is_on_android = '-mandroid' in cvars['PY_CFLAGS']
|
||||
lib = find_library('OpenCL', '' if is_on_android else '/opt/AMDAPPSDK*/lib/x86_64')
|
||||
return {'include': '', 'lib': dirname(lib)} if lib else None
|
||||
|
||||
def find_in_path(name, path):
|
||||
"Find a file in a search path"
|
||||
#adapted fom http://code.activestate.com/recipes/52224-find-a-file-given-a-search-path/
|
||||
for dir in path.split(os.pathsep):
|
||||
binpath = os.path.join(dir, name)
|
||||
if os.path.exists(binpath):
|
||||
return os.path.abspath(binpath)
|
||||
return None
|
||||
|
||||
def find_cuda():
|
||||
if 'CUDAHOME' in os.environ:
|
||||
home = os.environ['CUDAHOME']
|
||||
nvcc = os.path.join(home, 'bin', 'nvcc')
|
||||
else:
|
||||
nvcc = find_in_path('nvcc', os.environ['PATH'])
|
||||
|
||||
if nvcc:
|
||||
home = dirname(os.path.dirname(nvcc))
|
||||
return {'include': os.path.join(home, 'include'),
|
||||
'lib': os.path.join(home, 'lib64')}
|
||||
else:
|
||||
return None
|
||||
|
||||
|
||||
#Tweaks warning, because boost-numpy and boost-python won't compile cleanly without these changes
|
||||
cvars = sysconfig.get_config_vars()
|
||||
cvars['OPT'] = str.join(' ', remove_prefixes(cvars['OPT'].split(), ['-g', '-Wstrict-prototypes']))
|
||||
cvars["CFLAGS"] = cvars["BASECFLAGS"] + ' ' + cvars['OPT']
|
||||
cvars["LDFLAGS"] = '-Wl,--no-as-needed ' + cvars["LDFLAGS"]
|
||||
|
||||
#OpenCL
|
||||
opencl_config = find_opencl()
|
||||
|
||||
#CUDA
|
||||
cuda_config = find_cuda()
|
||||
|
||||
#Libraries
|
||||
libraries = ['OpenCL']
|
||||
if cuda_config: libraries += ['cuda', 'nvrtc']
|
||||
|
||||
#Backends:
|
||||
backend_defines = ['-DISAAC_WITH_OPENCL']
|
||||
if cuda_config: backend_defines += ['-DISAAC_WITH_CUDA']
|
||||
|
||||
#Library directories
|
||||
library_dirs = [config['lib'] for config in [opencl_config, cuda_config] if config is not None]
|
||||
|
||||
#Include directories
|
||||
include =' src/include src/lib/external'.split() + ['external/boost/', 'external/boost/boost/', os.path.join(find_module("numpy")[1], "core", "include")]
|
||||
|
||||
#Source files
|
||||
src = 'src/lib/wrap/clBLAS.cpp src/lib/value_scalar.cpp src/lib/symbolic/preset.cpp src/lib/symbolic/io.cpp src/lib/symbolic/expression.cpp src/lib/symbolic/execute.cpp src/lib/profiles/profiles.cpp src/lib/profiles/presets.cpp src/lib/profiles/predictors/random_forest.cpp src/lib/kernels/templates/ger.cpp src/lib/kernels/templates/gemv.cpp src/lib/kernels/templates/gemm.cpp src/lib/kernels/templates/dot.cpp src/lib/kernels/templates/base.cpp src/lib/kernels/templates/axpy.cpp src/lib/kernels/stream.cpp src/lib/kernels/parse.cpp src/lib/kernels/mapped_object.cpp src/lib/kernels/keywords.cpp src/lib/kernels/binder.cpp src/lib/exception/unknown_datatype.cpp src/lib/exception/operation_not_supported.cpp src/lib/driver/program_cache.cpp src/lib/driver/program.cpp src/lib/driver/platform.cpp src/lib/driver/ndrange.cpp src/lib/driver/kernel.cpp src/lib/driver/handle.cpp src/lib/driver/event.cpp src/lib/driver/device.cpp src/lib/driver/context.cpp src/lib/driver/command_queue.cpp src/lib/driver/check.cpp src/lib/driver/buffer.cpp src/lib/driver/backend.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']]
|
||||
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]
|
||||
# make sure next line succeeds even on Windows
|
||||
src = [f.replace("\\", "/") for f in src]
|
||||
if sys.platform == "win32":
|
||||
src += glob(boostsrc + "/thread/src/win32/*.cpp")
|
||||
src += glob(boostsrc + "/thread/src/tss_null.cpp")
|
||||
else:
|
||||
src += glob(boostsrc + "/thread/src/pthread/*.cpp")
|
||||
src= [f for f in src if not f.endswith("once_atomic.cpp")]
|
||||
|
||||
#Setup
|
||||
setup(
|
||||
name='isaac',
|
||||
version='1.0',
|
||||
description="Input-specific architecture-aware computations",
|
||||
author='Philippe Tillet',
|
||||
author_email='ptillet@g.harvard.edu',
|
||||
license='MPL 2.0',
|
||||
packages=["isaac"],
|
||||
ext_package="isaac",
|
||||
ext_modules=[Extension(
|
||||
'_isaac',src,
|
||||
extra_compile_args= backend_defines + ['-std=c++11', '-Wno-unused-function', '-Wno-unused-local-typedefs', '-Wno-sign-compare', '-Wno-attributes', '-DBOOST_PYTHON_SOURCE '],
|
||||
extra_link_args=['-Wl,-soname=_isaac.so'],
|
||||
undef_macros=[],
|
||||
include_dirs=include,
|
||||
library_dirs=library_dirs,
|
||||
libraries=libraries
|
||||
)],
|
||||
cmdclass={'build_py': build_py, 'build_ext': build_ext_subclass},
|
||||
classifiers=[
|
||||
'Environment :: Console',
|
||||
'Development Status :: 1 - Experimental',
|
||||
'Intended Audience :: Developers',
|
||||
'Intended Audience :: Other Audience',
|
||||
'Intended Audience :: Science/Research',
|
||||
'License :: OSI Approved :: MIT License',
|
||||
'Natural Language :: English',
|
||||
'Programming Language :: C++',
|
||||
'Programming Language :: Python',
|
||||
'Programming Language :: Python :: 3',
|
||||
'Topic :: Scientific/Engineering',
|
||||
'Topic :: Scientific/Engineering :: Mathematics',
|
||||
'Topic :: Scientific/Engineering :: Physics',
|
||||
'Topic :: Scientific/Engineering :: Machine Learning',
|
||||
]
|
||||
)
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
#Thanks to Andreas Knoeckler for providing stand-alone boost.python
|
||||
#through PyOpenCL and PyCUDA
|
||||
|
||||
import os, sys
|
||||
from distutils.ccompiler import show_compilers,new_compiler
|
||||
from distutils.command.build_ext import build_ext
|
||||
from distutils.command.build_py import build_py
|
||||
from distutils.core import setup, Extension
|
||||
from distutils.sysconfig import get_python_inc
|
||||
from distutils import sysconfig
|
||||
from imp import find_module
|
||||
from glob import glob
|
||||
from os.path import dirname
|
||||
|
||||
platform_cflags = {}
|
||||
platform_ldflags = {}
|
||||
platform_libs = {}
|
||||
|
||||
class build_ext_subclass(build_ext):
|
||||
def build_extensions(self):
|
||||
c = self.compiler.compiler_type
|
||||
if c in platform_cflags.keys():
|
||||
for e in self.extensions:
|
||||
e.extra_compile_args = platform_cflags[c]
|
||||
if c in platform_ldflags.keys():
|
||||
for e in self.extensions:
|
||||
e.extra_link_args = platform_ldflags[c]
|
||||
if c in platform_libs.keys():
|
||||
for e in self.extensions:
|
||||
try:
|
||||
e.libraries += platform_libs[c]
|
||||
except:
|
||||
e.libraries = platform_libs[c]
|
||||
build_ext.build_extensions(self)
|
||||
|
||||
def main():
|
||||
|
||||
def recursive_glob(rootdir='.', suffix=''):
|
||||
return [os.path.join(looproot, filename)
|
||||
for looproot, _, filenames in os.walk(rootdir)
|
||||
for filename in filenames if filename.endswith(suffix)]
|
||||
|
||||
def remove_prefixes(optlist, bad_prefixes):
|
||||
for bad_prefix in bad_prefixes:
|
||||
for i, flag in enumerate(optlist):
|
||||
if flag.startswith(bad_prefix):
|
||||
optlist.pop(i)
|
||||
break
|
||||
return optlist
|
||||
|
||||
def find_library(name, cmake_glob_list):
|
||||
cvars = sysconfig.get_config_vars()
|
||||
compiler = new_compiler()
|
||||
dirs = []
|
||||
for gpath in cmake_glob_list.split(';'):
|
||||
path = glob(gpath)
|
||||
if path:
|
||||
dirs += [path[0]]
|
||||
return compiler.find_library_file(cvars['LIBDIR'].split(';') + dirs, name)
|
||||
|
||||
def find_opencl():
|
||||
cvars = sysconfig.get_config_vars()
|
||||
is_on_android = '-mandroid' in cvars['PY_CFLAGS']
|
||||
lib = find_library('OpenCL', '/opt/adreno-driver/lib' if is_on_android else '/opt/AMDAPPSDK*/lib/x86_64')
|
||||
return {'include': '', 'lib': dirname(lib)} if lib else None
|
||||
|
||||
def find_in_path(name, path):
|
||||
"Find a file in a search path"
|
||||
#adapted fom http://code.activestate.com/recipes/52224-find-a-file-given-a-search-path/
|
||||
for dir in path.split(os.pathsep):
|
||||
binpath = os.path.join(dir, name)
|
||||
if os.path.exists(binpath):
|
||||
return os.path.abspath(binpath)
|
||||
return None
|
||||
|
||||
def find_cuda():
|
||||
if 'CUDAHOME' in os.environ:
|
||||
home = os.environ['CUDAHOME']
|
||||
nvcc = os.path.join(home, 'bin', 'nvcc')
|
||||
else:
|
||||
nvcc = find_in_path('nvcc', os.environ['PATH'])
|
||||
|
||||
if nvcc:
|
||||
home = dirname(os.path.dirname(nvcc))
|
||||
return {'include': os.path.join(home, 'include'),
|
||||
'lib': os.path.join(home, 'lib64')}
|
||||
else:
|
||||
return None
|
||||
|
||||
|
||||
#Tweaks warning, because boost-numpy and boost-python won't compile cleanly without these changes
|
||||
cvars = sysconfig.get_config_vars()
|
||||
cvars['OPT'] = str.join(' ', remove_prefixes(cvars['OPT'].split(), ['-g', '-Wstrict-prototypes']))
|
||||
cvars["CFLAGS"] = cvars["BASECFLAGS"] + ' ' + cvars['OPT']
|
||||
cvars["LDFLAGS"] = '-Wl,--no-as-needed ' + cvars["LDFLAGS"]
|
||||
|
||||
#OpenCL
|
||||
opencl_config = find_opencl()
|
||||
|
||||
#CUDA
|
||||
cuda_config = find_cuda()
|
||||
|
||||
#Libraries
|
||||
libraries = ['OpenCL']
|
||||
if cuda_config: libraries += ['cuda', 'nvrtc']
|
||||
|
||||
#Backends:
|
||||
backend_defines = ['-DISAAC_WITH_OPENCL']
|
||||
if cuda_config: backend_defines += ['-DISAAC_WITH_CUDA']
|
||||
|
||||
#Library directories
|
||||
library_dirs = [config['lib'] for config in [opencl_config, cuda_config] if config is not None]
|
||||
|
||||
#Include directories
|
||||
include =' src/include src/lib/external'.split() + ['external/boost/', 'external/boost/boost/', os.path.join(find_module("numpy")[1], "core", "include")]
|
||||
|
||||
#Source files
|
||||
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/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]
|
||||
# make sure next line succeeds even on Windows
|
||||
src = [f.replace("\\", "/") for f in src]
|
||||
if sys.platform == "win32":
|
||||
src += glob(boostsrc + "/thread/src/win32/*.cpp")
|
||||
src += glob(boostsrc + "/thread/src/tss_null.cpp")
|
||||
else:
|
||||
src += glob(boostsrc + "/thread/src/pthread/*.cpp")
|
||||
src= [f for f in src if not f.endswith("once_atomic.cpp")]
|
||||
|
||||
#Setup
|
||||
setup(
|
||||
name='isaac',
|
||||
version='1.0',
|
||||
description="Input-specific architecture-aware computations",
|
||||
author='Philippe Tillet',
|
||||
author_email='ptillet@g.harvard.edu',
|
||||
license='MPL 2.0',
|
||||
packages=["isaac"],
|
||||
ext_package="isaac",
|
||||
ext_modules=[Extension(
|
||||
'_isaac',src,
|
||||
extra_compile_args= backend_defines + ['-std=c++11', '-Wno-unused-function', '-Wno-unused-local-typedefs', '-Wno-sign-compare', '-Wno-attributes', '-DBOOST_PYTHON_SOURCE '],
|
||||
extra_link_args=['-Wl,-soname=_isaac.so'],
|
||||
undef_macros=[],
|
||||
include_dirs=include,
|
||||
library_dirs=library_dirs,
|
||||
libraries=libraries
|
||||
)],
|
||||
cmdclass={'build_py': build_py, 'build_ext': build_ext_subclass},
|
||||
classifiers=[
|
||||
'Environment :: Console',
|
||||
'Development Status :: 1 - Experimental',
|
||||
'Intended Audience :: Developers',
|
||||
'Intended Audience :: Other Audience',
|
||||
'Intended Audience :: Science/Research',
|
||||
'License :: OSI Approved :: MIT License',
|
||||
'Natural Language :: English',
|
||||
'Programming Language :: C++',
|
||||
'Programming Language :: Python',
|
||||
'Programming Language :: Python :: 3',
|
||||
'Topic :: Scientific/Engineering',
|
||||
'Topic :: Scientific/Engineering :: Mathematics',
|
||||
'Topic :: Scientific/Engineering :: Physics',
|
||||
'Topic :: Scientific/Engineering :: Machine Learning',
|
||||
]
|
||||
)
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
@@ -2,14 +2,15 @@
|
||||
#include <android_native_app_glue.h>
|
||||
#include <sstream>
|
||||
#include "isaac/array.h"
|
||||
#include "isaac/tools/to_string.hpp"
|
||||
|
||||
void android_main(struct android_app* state)
|
||||
{
|
||||
app_dummy(); // Make sure glue isn't stripped
|
||||
__android_log_print(ANDROID_LOG_INFO, "IsaacAndroidTest", "This is a test");
|
||||
isaac::array test(5, isaac::FLOAT_TYPE);
|
||||
__android_log_print(ANDROID_LOG_INFO, "IsaacAndroidTest", isaac::tools::to_string(test).c_str());
|
||||
std::ostringstream oss;
|
||||
oss << test;
|
||||
__android_log_print(ANDROID_LOG_INFO, "IsaacAndroidTest", oss.str().c_str());
|
||||
ANativeActivity_finish(state->activity);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user