gaspersic/triton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code quality: everything now compiles without warnings on MSVC

Browse Source
This commit is contained in:
Philippe Tillet
2015-08-05 13:01:20 -07:00
parent ef14e3aa17
commit ebab87af61
8 changed files with 191 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bench/blas.cpp
View File

@@ -103,7 +103,7 @@ void bench(isc::numeric_type dtype, std::string operation)
double total_time = 0;\ double total_time = 0;\
while(total_time*1e-9 < 1e-3){\ while(total_time*1e-9 < 1e-3){\
std::list<isc::driver::Event> events;\ std::list<isc::driver::Event> events;\
flush = isc::zeros(1e6, 1, dtype);\ flush = isc::zeros((isaac::int_t)1e6, 1, dtype);\
queue.synchronize();\ queue.synchronize();\
OP;\ OP;\
queue.synchronize();\ queue.synchronize();\
@@ -205,7 +205,7 @@ void bench(isc::numeric_type dtype, std::string operation)
std::cout << N; std::cout << N;
isc::array x(N, dtype), y(N, dtype); isc::array x(N, dtype), y(N, dtype);
/* ISAAC */ /* ISAAC */
std::list<isc::driver::Event> events;\ std::list<isc::driver::Event> events;
BENCHMARK_ISAAC(y = isc::control(x + alpha*y, isc::execution_options_type(0, &events)), 3*N*dtsize/t) BENCHMARK_ISAAC(y = isc::control(x + alpha*y, isc::execution_options_type(0, &events)), 3*N*dtsize/t)
/* clblas */ /* clblas */
#ifdef BENCH_CLBLAS #ifdef BENCH_CLBLAS

340
python/setup.py Normal file → Executable file
View File

@@ -1,170 +1,170 @@
#Thanks to Andreas Knoeckler for providing stand-alone boost.python #Thanks to Andreas Knoeckler for providing stand-alone boost.python
#through PyOpenCL and PyCUDA #through PyOpenCL and PyCUDA
import os, sys import os, sys
from distutils.ccompiler import show_compilers,new_compiler from distutils.ccompiler import show_compilers,new_compiler
from distutils.command.build_ext import build_ext from distutils.command.build_ext import build_ext
from distutils.command.build_py import build_py from distutils.command.build_py import build_py
from distutils.core import setup, Extension from distutils.core import setup, Extension
from distutils.sysconfig import get_python_inc from distutils.sysconfig import get_python_inc
from distutils import sysconfig from distutils import sysconfig
from imp import find_module from imp import find_module
from glob import glob from glob import glob
from os.path import dirname from os.path import dirname
platform_cflags = {} platform_cflags = {}
platform_ldflags = {} platform_ldflags = {}
platform_libs = {} platform_libs = {}
class build_ext_subclass(build_ext): class build_ext_subclass(build_ext):
def build_extensions(self): def build_extensions(self):
c = self.compiler.compiler_type c = self.compiler.compiler_type
if c in platform_cflags.keys(): if c in platform_cflags.keys():
for e in self.extensions: for e in self.extensions:
e.extra_compile_args = platform_cflags[c] e.extra_compile_args = platform_cflags[c]
if c in platform_ldflags.keys(): if c in platform_ldflags.keys():
for e in self.extensions: for e in self.extensions:
e.extra_link_args = platform_ldflags[c] e.extra_link_args = platform_ldflags[c]
if c in platform_libs.keys(): if c in platform_libs.keys():
for e in self.extensions: for e in self.extensions:
try: try:
e.libraries += platform_libs[c] e.libraries += platform_libs[c]
except: except:
e.libraries = platform_libs[c] e.libraries = platform_libs[c]
build_ext.build_extensions(self) build_ext.build_extensions(self)
def main(): def main():
def recursive_glob(rootdir='.', suffix=''): def recursive_glob(rootdir='.', suffix=''):
return [os.path.join(looproot, filename) return [os.path.join(looproot, filename)
for looproot, _, filenames in os.walk(rootdir) for looproot, _, filenames in os.walk(rootdir)
for filename in filenames if filename.endswith(suffix)] for filename in filenames if filename.endswith(suffix)]
def remove_prefixes(optlist, bad_prefixes): def remove_prefixes(optlist, bad_prefixes):
for bad_prefix in bad_prefixes: for bad_prefix in bad_prefixes:
for i, flag in enumerate(optlist): for i, flag in enumerate(optlist):
if flag.startswith(bad_prefix): if flag.startswith(bad_prefix):
optlist.pop(i) optlist.pop(i)
break break
return optlist return optlist
def find_library(name, cmake_glob_list): def find_library(name, cmake_glob_list):
cvars = sysconfig.get_config_vars() cvars = sysconfig.get_config_vars()
compiler = new_compiler() compiler = new_compiler()
dirs = [] dirs = []
for gpath in cmake_glob_list.split(';'): for gpath in cmake_glob_list.split(';'):
path = glob(gpath) path = glob(gpath)
if path: if path:
dirs += [path[0]] dirs += [path[0]]
return compiler.find_library_file(cvars['LIBDIR'].split(';') + dirs, name) return compiler.find_library_file(cvars['LIBDIR'].split(';') + dirs, name)
def find_opencl(): def find_opencl():
cvars = sysconfig.get_config_vars() cvars = sysconfig.get_config_vars()
is_on_android = '-mandroid' in cvars['PY_CFLAGS'] is_on_android = '-mandroid' in cvars['PY_CFLAGS']
lib = find_library('OpenCL', '' if is_on_android else '/opt/AMDAPPSDK*/lib/x86_64') lib = find_library('OpenCL', '' if is_on_android else '/opt/AMDAPPSDK*/lib/x86_64')
return {'include': '', 'lib': dirname(lib)} if lib else None return {'include': '', 'lib': dirname(lib)} if lib else None
def find_in_path(name, path): def find_in_path(name, path):
"Find a file in a search path" "Find a file in a search path"
#adapted fom http://code.activestate.com/recipes/52224-find-a-file-given-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): for dir in path.split(os.pathsep):
binpath = os.path.join(dir, name) binpath = os.path.join(dir, name)
if os.path.exists(binpath): if os.path.exists(binpath):
return os.path.abspath(binpath) return os.path.abspath(binpath)
return None return None
def find_cuda(): def find_cuda():
if 'CUDAHOME' in os.environ: if 'CUDAHOME' in os.environ:
home = os.environ['CUDAHOME'] home = os.environ['CUDAHOME']
nvcc = os.path.join(home, 'bin', 'nvcc') nvcc = os.path.join(home, 'bin', 'nvcc')
else: else:
nvcc = find_in_path('nvcc', os.environ['PATH']) nvcc = find_in_path('nvcc', os.environ['PATH'])
if nvcc: if nvcc:
home = dirname(os.path.dirname(nvcc)) home = dirname(os.path.dirname(nvcc))
return {'include': os.path.join(home, 'include'), return {'include': os.path.join(home, 'include'),
'lib': os.path.join(home, 'lib64')} 'lib': os.path.join(home, 'lib64')}
else: else:
return None return None
#Tweaks warning, because boost-numpy and boost-python won't compile cleanly without these changes #Tweaks warning, because boost-numpy and boost-python won't compile cleanly without these changes
cvars = sysconfig.get_config_vars() cvars = sysconfig.get_config_vars()
cvars['OPT'] = str.join(' ', remove_prefixes(cvars['OPT'].split(), ['-g', '-Wstrict-prototypes'])) cvars['OPT'] = str.join(' ', remove_prefixes(cvars['OPT'].split(), ['-g', '-Wstrict-prototypes']))
cvars["CFLAGS"] = cvars["BASECFLAGS"] + ' ' + cvars['OPT'] cvars["CFLAGS"] = cvars["BASECFLAGS"] + ' ' + cvars['OPT']
cvars["LDFLAGS"] = '-Wl,--no-as-needed ' + cvars["LDFLAGS"] cvars["LDFLAGS"] = '-Wl,--no-as-needed ' + cvars["LDFLAGS"]
#OpenCL #OpenCL
opencl_config = find_opencl() opencl_config = find_opencl()
#CUDA #CUDA
cuda_config = find_cuda() cuda_config = find_cuda()
#Libraries #Libraries
libraries = ['OpenCL'] libraries = ['OpenCL']
if cuda_config: libraries += ['cuda', 'nvrtc'] if cuda_config: libraries += ['cuda', 'nvrtc']
#Backends: #Backends:
backend_defines = ['-DISAAC_WITH_OPENCL'] backend_defines = ['-DISAAC_WITH_OPENCL']
if cuda_config: backend_defines += ['-DISAAC_WITH_CUDA'] if cuda_config: backend_defines += ['-DISAAC_WITH_CUDA']
#Library directories #Library directories
library_dirs = [config['lib'] for config in [opencl_config, cuda_config] if config is not None] library_dirs = [config['lib'] for config in [opencl_config, cuda_config] if config is not None]
#Include directories #Include directories
include =' src/include'.split() + ['external/boost/include', os.path.join(find_module("numpy")[1], "core", "include")] include =' src/include'.split() + ['external/boost/include', os.path.join(find_module("numpy")[1], "core", "include")]
#Source files #Source files
src = 'src/lib/wrap/clBLAS.cpp src/lib/value_scalar.cpp src/lib/kernels/parse.cpp src/lib/kernels/templates/gemv.cpp src/lib/kernels/templates/ger.cpp src/lib/kernels/templates/dot.cpp src/lib/kernels/templates/axpy.cpp src/lib/kernels/templates/base.cpp src/lib/kernels/templates/gemm.cpp src/lib/kernels/stream.cpp src/lib/kernels/mapped_object.cpp src/lib/kernels/keywords.cpp src/lib/kernels/binder.cpp src/lib/array.cpp src/lib/symbolic/preset.cpp src/lib/symbolic/expression.cpp src/lib/symbolic/execute.cpp src/lib/symbolic/io.cpp src/lib/model/model.cpp src/lib/model/predictors/random_forest.cpp src/lib/exception/unknown_datatype.cpp src/lib/exception/operation_not_supported.cpp src/lib/driver/program.cpp src/lib/driver/event.cpp src/lib/driver/device.cpp src/lib/driver/context.cpp src/lib/driver/program_cache.cpp src/lib/driver/platform.cpp src/lib/driver/ndrange.cpp src/lib/driver/kernel.cpp src/lib/driver/handle.cpp src/lib/driver/command_queue.cpp src/lib/driver/check.cpp src/lib/driver/buffer.cpp src/lib/driver/backend.cpp '.split() + [os.path.join('src', 'wrap', sf) for sf in ['_isaac.cpp', 'core.cpp', 'driver.cpp', 'model.cpp', 'exceptions.cpp']] 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/model/predictors/random_forest.cpp src/lib/model/model.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', 'wrap', sf) for sf in ['_isaac.cpp', 'core.cpp', 'driver.cpp', 'model.cpp', 'exceptions.cpp']]
boostsrc = 'external/boost/libs/' boostsrc = 'external/boost/libs/'
for s in ['numpy','python','smart_ptr','system','thread']: 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] 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 # make sure next line succeeds even on Windows
src = [f.replace("\\", "/") for f in src] src = [f.replace("\\", "/") for f in src]
if sys.platform == "win32": if sys.platform == "win32":
src += glob(boostsrc + "/thread/src/win32/*.cpp") src += glob(boostsrc + "/thread/src/win32/*.cpp")
src += glob(boostsrc + "/thread/src/tss_null.cpp") src += glob(boostsrc + "/thread/src/tss_null.cpp")
else: else:
src += glob(boostsrc + "/thread/src/pthread/*.cpp") src += glob(boostsrc + "/thread/src/pthread/*.cpp")
src= [f for f in src if not f.endswith("once_atomic.cpp")] src= [f for f in src if not f.endswith("once_atomic.cpp")]
#Setup #Setup
setup( setup(
name='isaac', name='isaac',
version='1.0', version='1.0',
description="Input-specific architecture-aware computations", description="Input-specific architecture-aware computations",
author='Philippe Tillet', author='Philippe Tillet',
author_email='ptillet@g.harvard.edu', author_email='ptillet@g.harvard.edu',
license='MPL 2.0', license='MPL 2.0',
packages=["isaac"], packages=["isaac"],
ext_package="isaac", ext_package="isaac",
ext_modules=[Extension( ext_modules=[Extension(
'_isaac',src, '_isaac',src,
extra_compile_args= backend_defines + ['-std=c++11', '-Wno-unused-function', '-Wno-unused-local-typedefs', '-Wno-sign-compare'], extra_compile_args= backend_defines + ['-std=c++11', '-Wno-unused-function', '-Wno-unused-local-typedefs', '-Wno-sign-compare'],
extra_link_args=['-Wl,-soname=_isaac.so'], extra_link_args=['-Wl,-soname=_isaac.so'],
undef_macros=[], undef_macros=[],
include_dirs=include, include_dirs=include,
library_dirs=library_dirs, library_dirs=library_dirs,
libraries=libraries libraries=libraries
)], )],
cmdclass={'build_py': build_py, 'build_ext': build_ext_subclass}, cmdclass={'build_py': build_py, 'build_ext': build_ext_subclass},
classifiers=[ classifiers=[
'Environment :: Console', 'Environment :: Console',
'Development Status :: 1 - Experimental', 'Development Status :: 1 - Experimental',
'Intended Audience :: Developers', 'Intended Audience :: Developers',
'Intended Audience :: Other Audience', 'Intended Audience :: Other Audience',
'Intended Audience :: Science/Research', 'Intended Audience :: Science/Research',
'License :: OSI Approved :: MIT License', 'License :: OSI Approved :: MIT License',
'Natural Language :: English', 'Natural Language :: English',
'Programming Language :: C++', 'Programming Language :: C++',
'Programming Language :: Python', 'Programming Language :: Python',
'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3',
'Topic :: Scientific/Engineering', 'Topic :: Scientific/Engineering',
'Topic :: Scientific/Engineering :: Mathematics', 'Topic :: Scientific/Engineering :: Mathematics',
'Topic :: Scientific/Engineering :: Physics', 'Topic :: Scientific/Engineering :: Physics',
'Topic :: Scientific/Engineering :: Machine Learning', 'Topic :: Scientific/Engineering :: Machine Learning',
] ]
) )
if __name__ == "__main__": if __name__ == "__main__":
main() main()

8
tests/linalg/axpy.cpp
View File

@@ -20,8 +20,8 @@ void test_element_wise_vector(T epsilon, simple_vector_base<T> & cx, simple_vect
cl_command_queue clqueue = queue.handle().cl(); cl_command_queue clqueue = queue.handle().cl();
int_t N = cz.size(); int_t N = cz.size();
T aa = -4.3; T aa = static_cast<T>(-4.3);
T bb=3.5; T bb = static_cast<T>(3.5);
isaac::value_scalar a(aa), b(bb); isaac::value_scalar a(aa), b(bb);
isaac::scalar da(a, context), db(b, context); isaac::scalar da(a, context), db(b, context);
@@ -149,11 +149,11 @@ int main()
std::cout << "Device: " << device.name() << " on " << device.platform().name() << " " << device.platform().version() << std::endl; std::cout << "Device: " << device.name() << " on " << device.platform().name() << " " << device.platform().version() << std::endl;
std::cout << "---" << std::endl; std::cout << "---" << std::endl;
std::cout << ">> float" << std::endl; std::cout << ">> float" << std::endl;
test_impl<float>(1e-4, *context); test_impl<float>(eps_float, *context);
if(device.fp64_support()) if(device.fp64_support())
{ {
std::cout << ">> double" << std::endl; std::cout << ">> double" << std::endl;
test_impl<double>(1e-9, *context); test_impl<double>(eps_double, *context);
} }
std::cout << "---" << std::endl; std::cout << "---" << std::endl;
} }

3
tests/linalg/common.hpp
View File

@@ -7,6 +7,9 @@
typedef isaac::int_t int_t; typedef isaac::int_t int_t;
static const float eps_float = static_cast<float>(1e-4);
static const double eps_double = static_cast<double>(1e-8);
template<class T> struct BLAS; template<class T> struct BLAS;
template<> struct BLAS<float> { template<class FT, class DT> static FT F(FT SAXPY, DT ) { return SAXPY; } }; template<> struct BLAS<float> { template<class FT, class DT> static FT F(FT SAXPY, DT ) { return SAXPY; } };
template<> struct BLAS<double> { template<class FT, class DT> static DT F(FT , DT DAXPY) { return DAXPY; } }; template<> struct BLAS<double> { template<class FT, class DT> static DT F(FT , DT DAXPY) { return DAXPY; } };

4
tests/linalg/dot.cpp
View File

@@ -99,11 +99,11 @@ int main()
std::cout << "Device: " << device.name() << " on " << device.platform().name() << " " << device.platform().version() << std::endl; std::cout << "Device: " << device.name() << " on " << device.platform().name() << " " << device.platform().version() << std::endl;
std::cout << "---" << std::endl; std::cout << "---" << std::endl;
std::cout << ">> float" << std::endl; std::cout << ">> float" << std::endl;
test_impl<float>(1e-4, *context); test_impl<float>(eps_float, *context);
if(device.fp64_support()) if(device.fp64_support())
{ {
std::cout << ">> double" << std::endl; std::cout << ">> double" << std::endl;
test_impl<double>(1e-9, *context); test_impl<double>(eps_double, *context);
} }
std::cout << "---" << std::endl; std::cout << "---" << std::endl;
} }

4
tests/linalg/gemm.cpp
View File

@@ -136,11 +136,11 @@ int main()
std::cout << "Device: " << device.name() << " on " << device.platform().name() << " " << device.platform().version() << std::endl; std::cout << "Device: " << device.name() << " on " << device.platform().name() << " " << device.platform().version() << std::endl;
std::cout << "---" << std::endl; std::cout << "---" << std::endl;
std::cout << ">> float" << std::endl; std::cout << ">> float" << std::endl;
test_impl<float>(1e-4, *context); test_impl<float>(eps_float, *context);
if(device.fp64_support()) if(device.fp64_support())
{ {
std::cout << ">> double" << std::endl; std::cout << ">> double" << std::endl;
test_impl<double>(1e-9, *context); test_impl<double>(eps_double, *context);
} }
std::cout << "---" << std::endl; std::cout << "---" << std::endl;
} }

7
tests/linalg/gemv.cpp
View File

@@ -18,7 +18,8 @@ void test_row_wise_reduction(T epsilon, simple_vector_base<T> & cy, simple_matri
simple_vector<T> bufy(M); simple_vector<T> bufy(M);
simple_vector<T> bufx(N); simple_vector<T> bufx(N);
T alpha = 4.2, beta = 5.6; T alpha = static_cast<T>(4.2);
T beta = static_cast<T>(5.6);
isc::driver::CommandQueue queue = isc::driver::backend::queues::get(y.context(),0); isc::driver::CommandQueue queue = isc::driver::backend::queues::get(y.context(),0);
@@ -116,11 +117,11 @@ int main()
std::cout << "Device: " << device.name() << " on " << device.platform().name() << " " << device.platform().version() << std::endl; std::cout << "Device: " << device.name() << " on " << device.platform().name() << " " << device.platform().version() << std::endl;
std::cout << "---" << std::endl; std::cout << "---" << std::endl;
std::cout << ">> float" << std::endl; std::cout << ">> float" << std::endl;
test_impl<float>(1e-4, *context); test_impl<float>(eps_float, *context);
if(device.fp64_support()) if(device.fp64_support())
{ {
std::cout << ">> double" << std::endl; std::cout << ">> double" << std::endl;
test_impl<double>(1e-9, *context); test_impl<double>(eps_double, *context);
} }
std::cout << "---" << std::endl; std::cout << "---" << std::endl;
} }

7
tests/linalg/ger.cpp
View File

@@ -19,7 +19,8 @@ void test(T epsilon, simple_matrix_base<T> & cA, simple_matrix_base<T>& cB, simp
int_t N = cC.size2(); int_t N = cC.size2();
T aa = 3.12, bb=3.5; T aa = static_cast<T>(3.12);
T bb = static_cast<T>(3.5);
isaac::value_scalar a(aa), b(bb); isaac::value_scalar a(aa), b(bb);
isaac::scalar da(a, ctx), db(b, ctx); isaac::scalar da(a, ctx), db(b, ctx);
@@ -132,11 +133,11 @@ int main()
std::cout << "Device: " << device.name() << " on " << device.platform().name() << " " << device.platform().version() << std::endl; std::cout << "Device: " << device.name() << " on " << device.platform().name() << " " << device.platform().version() << std::endl;
std::cout << "---" << std::endl; std::cout << "---" << std::endl;
std::cout << ">> float" << std::endl; std::cout << ">> float" << std::endl;
test_impl<float>(1e-4, *context); test_impl<float>(eps_float, *context);
if(device.fp64_support()) if(device.fp64_support())
{ {
std::cout << ">> double" << std::endl; std::cout << ">> double" << std::endl;
test_impl<double>(1e-9, *context); test_impl<double>(eps_double, *context);
} }
std::cout << "---" << std::endl; std::cout << "---" << std::endl;
} }