Browse Source

MAINT: Rework make defines to meson arguments

For SMALL_MATRIX_OPT and MAX_STACK_ALLOC
pull/4820/head
Rohit Goswami 2 years ago
parent
commit
32567edbcc
No known key found for this signature in database GPG Key ID: 9CCCE36402CB49A6
3 changed files with 13 additions and 8 deletions
  1. +1
    -4
      interface/meson.build
  2. +0
    -3
      kernel/meson.build
  3. +12
    -1
      meson.build

+ 1
- 4
interface/meson.build View File

@@ -82,10 +82,7 @@ _static_libs += static_library(
'cblas_drot',
'rot.c',
include_directories: _inc,
c_args: [ '-O2',
'-DSMALL_MATRIX_OPT',
'-DMAX_STACK_ALLOC=2048',
'-Wall',
c_args: [
'-m64',
'-DF_INTERFACE_GFORT',
'-fPIC',


+ 0
- 3
kernel/meson.build View File

@@ -786,9 +786,6 @@ _configs = [
'undef': ['COMPLEX', 'COMPLEX'],
'def': ['DOUBLE'],
'addl': [fma3_flag,
'-DSMALL_MATRIX_OPT',
'-DMAX_STACK_ALLOC=2048',
'-Wall',
'-m64',
'-DF_INTERFACE_GFORT',
'-fPIC',


+ 12
- 1
meson.build View File

@@ -44,6 +44,7 @@ no_affinity = get_option('no_affinity')
build_cpp_thread_safety_test = get_option('build_cpp_thread_safety_test')
build_cpp_thread_safety_gemv = get_option('build_cpp_thread_safety_gemv')
build_static_libs = get_option('build_static_libs')
max_stack_alloc = get_option('max_stack_alloc')

if host_machine.system() == 'linux'
no_affinity = true
@@ -136,7 +137,17 @@ configure_file(output : 'getarch_conf.h',
# configuration : conf_data)

# Makefile.system
# Ignoring all the hostarch checks and conflicts for arch in BSD for now
cpu_fam = target_machine.cpu_family()

if cpu_fam in ['x86_64', 'ppc64', 'ppc']
add_project_arguments([
'-DSMALL_MATRIX_OPT',
f'-DMAX_STACK_ALLOC=@max_stack_alloc@',
], language:'c')
endif


# Ignoring other hostarch checks and conflicts for arch in BSD for now
_inc = include_directories('.')
# subdir('lapack-netlib')
subdir('interface')


Loading…
Cancel
Save