From e783ea10db2636f2c4f828917fab9c8deced1662 Mon Sep 17 00:00:00 2001 From: Saitharun Date: Wed, 19 Jan 2022 11:38:45 +0530 Subject: [PATCH] Enable wrapper code by default details: Changes Made for 4.0 branch to enable wrapper code by default and also removed ENABLE_API_WRAPPER macro. Change-Id: I5c9ede7ae959d811bc009073a266e66cbf07ef1a --- CMakeLists.txt | 7 +------ frame/util/bli_util_api_wrap.c | 4 +++- frame/util/bli_util_api_wrap.h | 4 +++- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3affe7b40..3f7cc6ad9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,9 +99,8 @@ option(BLIS_ENABLE_ILP64 "ENABLE BLIS ILP64" OFF) option(ENABLE_INT_TYPE_SIZE " Internal BLIS integers ,used in native BLIS interfaces based on architecture dependent " ON) option(ENABLE_BLASTEST "Enable the blastest" OFF) option(ENABLE_TESTCPP_TESTING "Enabling testcpp" OFF) -option (ENABLE_NO_UNDERSCORE_API "export APIs without underscore" ON) +option (ENABLE_NO_UNDERSCORE_API "export APIs without underscore" OFF) option (ENABLE_UPPERCASE_API "export APIs with uppercase" OFF) -option (ENABLE_API_WRAPPER "Enable wrapper code" OFF) option (ENABLE_COMPLEX_RETURN_INTEL "Enable complex_return_intel" OFF) option (ENABLE_TRSM_PREINVERSION "Enable TRSM preinversion" ON) option (ENABLE_AOCL_DYNAMIC "Enable Dynamic Multi-threading" OFF) @@ -131,10 +130,6 @@ if(ENABLE_UPPERCASE_API) add_definitions(-DBLIS_ENABLE_UPPERCASE_API) endif() -if(ENABLE_API_WRAPPER) - add_definitions(-DBLIS_ENABLE_API_WRAPPER) -endif() - if(ENABLE_AOCL_DYNAMIC) set(AOCL_DYNAMIC TRUE) endif() diff --git a/frame/util/bli_util_api_wrap.c b/frame/util/bli_util_api_wrap.c index 128fba8b8..81300761f 100644 --- a/frame/util/bli_util_api_wrap.c +++ b/frame/util/bli_util_api_wrap.c @@ -39,7 +39,8 @@ #include "bli_util_api_wrap.h" // wrapper functions to support additional symbols -#ifdef BLIS_ENABLE_API_WRAPPER +#ifndef BLIS_ENABLE_NO_UNDERSCORE_API +#ifndef BLIS_ENABLE_UPPERCASE_API void CAXPY(const f77_int *n,const scomplex *ca,const scomplex *cx,const f77_int *incx,scomplex *cy,const f77_int *incy) { caxpy_( n, ca, cx, incx, cy, incy); @@ -3221,3 +3222,4 @@ void CAXPBY_( const f77_int* n, const scomplex* alpha, const scomplex *x, con } #endif +#endif diff --git a/frame/util/bli_util_api_wrap.h b/frame/util/bli_util_api_wrap.h index f0aff49ff..78f088e28 100644 --- a/frame/util/bli_util_api_wrap.h +++ b/frame/util/bli_util_api_wrap.h @@ -35,7 +35,8 @@ // file define different formats of BLAS APIs- uppercase with // and without underscore, lowercase without underscore. -#ifdef BLIS_ENABLE_API_WRAPPER +#ifndef BLIS_ENABLE_NO_UNDERSCORE_API +#ifndef BLIS_ENABLE_UPPERCASE_API //Level 1 APIs BLIS_EXPORT_BLIS void SROTG(float *sa, float *sb, float *c, float *s); @@ -1729,3 +1730,4 @@ BLIS_EXPORT_BLIS void ZOMATCOPY_(f77_char* trans, f77_int* rows, f77_int* cols #endif +#endif