Skip to content

Commit b6956ed

Browse files
committed
disable tlfloat, as its only for sleef testing
1 parent 8b6877d commit b6956ed

2 files changed

Lines changed: 5 additions & 21 deletions

File tree

‎meson.build‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ if sleef_dep.found() and sleef_dep.type_name() != 'internal' and sleef_dep.versi
2727
# SLEEF found system-wide - verify quad-precision support
2828
cpp = meson.get_compiler('cpp')
2929
sleefquad_lib = cpp.find_library('sleefquad', required: false)
30-
tlfloat_lib = cpp.find_library('tlfloat', required: false)
3130

32-
if sleefquad_lib.found() and tlfloat_lib.found()
31+
if sleefquad_lib.found()
3332
sleefquad_test_code = '''
3433
#include <sleefquad.h>
3534
@@ -43,29 +42,20 @@ if sleef_dep.found() and sleef_dep.type_name() != 'internal' and sleef_dep.versi
4342
# this should compile and link
4443
quad_works = cpp.links(
4544
sleefquad_test_code,
46-
dependencies: [sleef_dep, sleefquad_lib, tlfloat_lib],
45+
dependencies: [sleef_dep, sleefquad_lib],
4746
name: 'SLEEF quad-precision support'
4847
)
4948

5049
if quad_works
5150
sleefquad_dep = declare_dependency(
5251
dependencies: [sleef_dep, sleefquad_lib]
5352
)
54-
tlfloat_dep = declare_dependency(
55-
dependencies: [tlfloat_lib]
56-
)
5753
use_system_sleef = true
5854
else
5955
fallback_reason = 'System-wide SLEEF installation found but a test for quad precision support failed.'
6056
endif
6157
else
62-
if not sleefquad_lib.found() and not tlfloat_lib.found()
63-
fallback_reason = 'System-wide SLEEF installation does not have sleefquad and tlfloat libraries.'
64-
elif not sleefquad_lib.found()
65-
fallback_reason = 'System-wide SLEEF installation does not have the sleefquad library.'
66-
else
67-
fallback_reason = 'System-wide SLEEF installation does not have the tlfloat library.'
68-
endif
58+
fallback_reason = 'System-wide SLEEF installation does not have the sleefquad library.'
6959
endif
7060
else
7161
if sleef_dep.found() and sleef_dep.type_name() != 'internal'
@@ -81,7 +71,6 @@ else
8171
sleef_subproj = subproject('sleef')
8272
sleef_dep = sleef_subproj.get_variable('sleef_dep')
8373
sleefquad_dep = sleef_subproj.get_variable('sleefquad_dep')
84-
tlfloat_dep = sleef_subproj.get_variable('tlfloat_dep')
8574
warning(fallback_reason)
8675
message('Proceeding with vendored SLEEF subproject instead')
8776
endif
@@ -105,7 +94,7 @@ message('Using NumPy version: @0@'.format(numpy_version))
10594
npymath_path = incdir_numpy / '..' / 'lib'
10695
npymath_lib = c.find_library('npymath', dirs: npymath_path)
10796

108-
dependencies = [py_dep, qblas_dep, sleef_dep, sleefquad_dep, tlfloat_dep, npymath_lib]
97+
dependencies = [py_dep, qblas_dep, sleef_dep, sleefquad_dep, npymath_lib]
10998

11099
# Add OpenMP dependency (optional, for threading)
111100
openmp_dep = dependency('openmp', required: false, static: false)

‎subprojects/packagefiles/sleef/meson.build‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ sleef_configure = run_command([
3232
'-DSLEEF_BUILD_SHARED_LIBS=OFF',
3333
'-DSLEEF_BUILD_TESTS=OFF',
3434
'-DSLEEF_BUILD_INLINE_HEADERS=OFF',
35+
'-DSLEEF_ENABLE_TLFLOAT=OFF', # this is only used for testing in SLEEF, not runtime
3536
'-DCMAKE_POSITION_INDEPENDENT_CODE=ON',
3637
'-DCMAKE_INSTALL_PREFIX=' + meson.current_build_dir() / sleef_install_dir
3738
] + sleef_simd_flags, check: false, capture: true)
@@ -72,10 +73,4 @@ sleefquad_dep = declare_dependency(
7273
dependencies: [sleef_build_dep, sleef_dep],
7374
compile_args: compile_args_list,
7475
link_args: ['-L' + meson.current_build_dir() / sleef_install_dir / 'lib', '-L' + meson.current_build_dir() / sleef_install_dir / 'lib64', '-lsleefquad']
75-
)
76-
77-
tlfloat_dep = declare_dependency(
78-
dependencies: [sleef_build_dep],
79-
compile_args: compile_args_list,
80-
link_args: ['-L' + meson.current_build_dir() / sleef_install_dir / 'lib', '-L' + meson.current_build_dir() / sleef_install_dir / 'lib64', '-L' + meson.current_build_dir() / sleef_build_dir / 'submodules' / 'tlfloat' / 'lib', '-L' + meson.current_build_dir() / sleef_build_dir / 'submodules' / 'tlfloat' / 'lib64', '-ltlfloat']
8176
)

0 commit comments

Comments
 (0)