Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2432a7a

Browse files
Remove prints and revert dispatch
Removing the prints and providing an option that removes the dispatching for Accelerate.
1 parent 27caded commit 2432a7a

12 files changed

+386
-16601
lines changed

numpy/core/meson.build

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -727,12 +727,6 @@ if have_blas
727727
'src/common/cblasfuncs.c',
728728
'src/common/python_xerbla.c',
729729
]
730-
if macOS13_3_or_later and not use_ilp64
731-
src_multiarray_umath_common += [
732-
'src/common/lapack/accelerate_wrapper.c',
733-
'src/common/lapack/accelerate_wrapper_cblas.c',
734-
]
735-
endif
736730
endif
737731

738732
src_multiarray = [

numpy/core/setup.py

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -710,10 +710,7 @@ def get_mathlib_info(*args):
710710
join('src', 'common', 'lowlevel_strided_loops.h'),
711711
join('src', 'common', 'mem_overlap.h'),
712712
join('src', 'common', 'npy_argparse.h'),
713-
join('src', 'common', 'npy_blas_config.h'),
714-
join('src', 'common', 'npy_blas_lapack.h'),
715713
join('src', 'common', 'npy_cblas.h'),
716-
join('src', 'common', 'npy_cblas_base.h'),
717714
join('src', 'common', 'npy_config.h'),
718715
join('src', 'common', 'npy_ctypes.h'),
719716
join('src', 'common', 'npy_dlpack.h'),
@@ -759,20 +756,6 @@ def get_mathlib_info(*args):
759756
common_src.extend([join('src', 'common', 'cblasfuncs.c'),
760757
join('src', 'common', 'python_xerbla.c'),
761758
])
762-
if (
763-
('ACCELERATE_NEW_LAPACK', None) in blas_info.get('define_macros', [])
764-
and os.environ.get('NPY_USE_BLAS_ILP64', None) is None
765-
):
766-
common_deps.extend([
767-
join('src', 'common', 'lapack', 'accelerate_legacy.h'),
768-
join('src', 'common', 'lapack', 'accelerate_legacy_blas.h'),
769-
join('src', 'common', 'lapack', 'accelerate_legacy_cblas.h'),
770-
join('src', 'common', 'lapack', 'accelerate_legacy_lapack.h'),
771-
])
772-
common_src.extend([
773-
join('src', 'common', 'lapack', 'accelerate_wrapper.c'),
774-
join('src', 'common', 'lapack', 'accelerate_wrapper_cblas.c')
775-
])
776759
else:
777760
extra_info = {}
778761

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +0,0 @@
1-
#include <sys/cdefs.h>
2-
3-
/*
4-
* The macros and additional headers here expose Accelerate's legacy
5-
* BLAS / LAPACK APIs with unique names. Each API will be suffixed
6-
* with '$LEGACY' for use in source code. Those will be hooked up
7-
* to the legacy binary symbols.
8-
*
9-
* Examples:
10-
* - dgemm
11-
* source code: dgemm$LEGACY(...)
12-
* binary symbol: _dgemm_
13-
* - cblas_dgemm
14-
* source code: cblas_dgemm$LEGACY(...)
15-
* binary symbol: _cblas_dgemm
16-
*/
17-
18-
#define __TEMPLATE_FUNC(func) __CONCAT(func,$LEGACY)
19-
#define __TEMPLATE_ALIAS(sym) __asm("_" __STRING(sym))
20-
21-
#include "lapack/accelerate_legacy_blas.h"
22-
#include "lapack/accelerate_legacy_cblas.h"
23-
#include "lapack/accelerate_legacy_lapack.h"
24-
25-
#undef __TEMPLATE_FUNC
26-
#undef __TEMPLATE_ALIAS

0 commit comments

Comments
 (0)