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

Merge branch 'develop' into cmake 

Conflicts:
	driver/others/memory.c
This commit is contained in:
Zhang Xianyi 2015-10-26 14:54:34 -05:00
parent 53b6023a6c 5a291606ad
commit 2feef49fa8
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
driver/others/memory.c
View File

@ -142,6 +142,9 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#if defined(_MSC_VER) && !defined(__clang__) #if defined(_MSC_VER) && !defined(__clang__)
#define CONSTRUCTOR __cdecl #define CONSTRUCTOR __cdecl
#define DESTRUCTOR __cdecl #define DESTRUCTOR __cdecl
#elif defined(OS_DARWIN) && defined(C_GCC)
#define CONSTRUCTOR __attribute__ ((constructor))
#define DESTRUCTOR __attribute__ ((destructor))
#else #else
#define CONSTRUCTOR __attribute__ ((constructor(101))) #define CONSTRUCTOR __attribute__ ((constructor(101)))
#define DESTRUCTOR __attribute__ ((destructor(101))) #define DESTRUCTOR __attribute__ ((destructor(101)))

4
interface/imax.c
View File

@ -136,6 +136,8 @@ blasint NAME(blasint *N, FLOAT *x, blasint *INCX){
ret = (blasint)MAX_K(n, x, incx); ret = (blasint)MAX_K(n, x, incx);
if(ret > n) ret=n;
FUNCTION_PROFILE_END(COMPSIZE, n, 0); FUNCTION_PROFILE_END(COMPSIZE, n, 0);
IDEBUG_END; IDEBUG_END;
@ -159,6 +161,8 @@ CBLAS_INDEX CNAME(blasint n, FLOAT *x, blasint incx){
ret = MAX_K(n, x, incx); ret = MAX_K(n, x, incx);
if (ret > n) ret=n;
if (ret) ret --; if (ret) ret --;
FUNCTION_PROFILE_END(COMPSIZE, n, 0); FUNCTION_PROFILE_END(COMPSIZE, n, 0);