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

Added include-guards in viennacl headers generation ; bugfix in autotune.py's operation parsing

Browse Source
This commit is contained in:
Philippe Tillet
2014-11-02 10:31:27 -05:00
parent 0ae87eeff4
commit 6ca682e5eb
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
python/autotune/pysrc/autotune.py
View File

@@ -53,7 +53,7 @@ def do_tuning(args):
for datatype in [vcl.float32, vcl.float64]: for datatype in [vcl.float32, vcl.float64]:
if not any(x in args.operations for x in [operation + '-' + datatype.__name__]): if not any(x in args.operations for x in [operation, operation + '-' + datatype.__name__]):
continue continue
ctx = cl.Context([device]) ctx = cl.Context([device])
@@ -188,8 +188,8 @@ class ArgumentsHandler:
self.device = add_input('Device to tune for','0') self.device = add_input('Device to tune for','0')
self.operations = add_input('Operations to tune for','vector-axpy,matrix-axpy,reduction,row-wise-reduction,matrix-product-float32').split(',') self.operations = add_input('Operations to tune for','vector-axpy,matrix-axpy,reduction,row-wise-reduction,matrix-product-float32').split(',')
self.gemm_layouts = add_input('GEMV Layouts', 'NN,NT,TN,TT') if 'matrix-product' in self.operations else '' self.gemm_layouts = add_input('GEMV Layouts', 'NN,NT,TN,TT')
self.gemv_layouts = add_input('GEMV Layouts', 'N,T') if 'row-wise-reduction' in self.operations else '' self.gemv_layouts = add_input('GEMV Layouts', 'N,T')
self.json_file = add_input('JSON File', misc_tools.sanitize_string(devices[int(self.device)].name) + '.json') self.json_file = add_input('JSON File', misc_tools.sanitize_string(devices[int(self.device)].name) + '.json')
self.method = add_input('Tuning type', 'simple') self.method = add_input('Tuning type', 'simple')
if self.method == 'simple': if self.method == 'simple':

2
python/autotune/pysrc/misc_tools.py
View File

@@ -273,7 +273,7 @@ def update_viennacl_headers(viennacl_root, device, datatype, operation, addition
data = '' data = ''
if not data: if not data:
ifndef_suffix = ('_'.join(header_hierarchy) + '_hpp_').upper() ifndef_suffix = ('_'.join(header_hierarchy + [cpp_device_name]) + '_hpp_').upper()
data = ('#ifndef VIENNACL_DEVICE_SPECIFIC_BUILTIN_DATABASE_' + ifndef_suffix + '\n' data = ('#ifndef VIENNACL_DEVICE_SPECIFIC_BUILTIN_DATABASE_' + ifndef_suffix + '\n'
'#define VIENNACL_DEVICE_SPECIFIC_BUILTIN_DATABASE_' + ifndef_suffix + '\n' '#define VIENNACL_DEVICE_SPECIFIC_BUILTIN_DATABASE_' + ifndef_suffix + '\n'
'\n' '\n'