floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BLD: Move interface arguments a bit

This commit is contained in:
Rohit Goswami 2024-05-19 00:03:43 +00:00 committed by Mateusz Sokół
parent 26b98f6a10
commit e8e3825bd9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
interface/meson.build
View File

@ -1,3 +1,7 @@
interface_args = ['-include', f'@bldroot@/simd_conf.h']
if not build_without_cblas
interface_args += '-DCBLAS'
endif
_blas_roots = [ _blas_roots = [
# NOTE: q, qx, x, xq do not have cblas_ rules in the Makefile # NOTE: q, qx, x, xq do not have cblas_ rules in the Makefile
# NOTE: https://developer.arm.com/documentation/101004/2310/BLAS-Basic-Linear-Algebra-Subprograms/CBLAS-functions?lang=en # NOTE: https://developer.arm.com/documentation/101004/2310/BLAS-Basic-Linear-Algebra-Subprograms/CBLAS-functions?lang=en
@ -559,7 +563,7 @@ foreach conf : _blas_roots
continue continue
endif endif
# Seed with common args # Seed with common args
compiler_args = [_cargs] compiler_args = _cargs + interface_args
# Generate the symbol flags # Generate the symbol flags
base = conf['base'] base = conf['base']
if symb_defs.has_key(base) if symb_defs.has_key(base)

4
meson.build
View File

@ -178,7 +178,6 @@ configure_file(output : 'simd_conf.h',
configuration : simd_conf_data) configuration : simd_conf_data)
# Can't be added as a project argument since it won't be generated until later # Can't be added as a project argument since it won't be generated until later
bldroot = meson.build_root() bldroot = meson.build_root()
_cargs += ['-include', f'@bldroot@/simd_conf.h']
add_project_arguments(simd_cargs, language: 'c') add_project_arguments(simd_cargs, language: 'c')
# Common symbol related options # Common symbol related options
@ -199,9 +198,6 @@ foreach symb : symnames
_cargs += f'-U@symb@' _cargs += f'-U@symb@'
endforeach endforeach
# Based on options # Based on options
if not build_without_cblas
_cargs += '-DCBLAS'
endif
if no_affinity if no_affinity
_cargs += '-DNO_AFFINITY' _cargs += '-DNO_AFFINITY'
endif endif