Fixed #315. Added OPENBLAS_ prefix to openblas_config.h.

This commit is contained in:
Zhang Xianyi 2013-11-02 15:59:00 +08:00
parent dfd1064d7b
commit 6d9d70c55c
2 changed files with 10 additions and 10 deletions

View File

@ -23,8 +23,8 @@ install : lib.grd
#for inc #for inc
@echo \#ifndef OPENBLAS_CONFIG_H > $(OPENBLAS_INCLUDE_DIR)/openblas_config.h @echo \#ifndef OPENBLAS_CONFIG_H > $(OPENBLAS_INCLUDE_DIR)/openblas_config.h
@echo \#define OPENBLAS_CONFIG_H >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h @echo \#define OPENBLAS_CONFIG_H >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h
@cat config_last.h >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h @awk '{print $$1, "OPENBLAS_"$$2, $$3}' config_last.h >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h
@echo \#define VERSION \" OpenBLAS $(VERSION) \" >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h @echo \#define OPENBLAS_VERSION \" OpenBLAS $(VERSION) \" >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h
@cat openblas_config_template.h >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h @cat openblas_config_template.h >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h
@echo \#endif \/\* OPENBLAS_CONFIG_H \*\/ >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h @echo \#endif \/\* OPENBLAS_CONFIG_H \*\/ >> $(OPENBLAS_INCLUDE_DIR)/openblas_config.h

View File

@ -1,8 +1,8 @@
/*This is only for "make install" target.*/ /*This is only for "make install" target.*/
#if defined(OS_WINNT) || defined(OS_CYGWIN_NT) || defined(OS_INTERIX) #if defined(OPENBLAS_OS_WINNT) || defined(OPENBLAS_OS_CYGWIN_NT) || defined(OPENBLAS_OS_INTERIX)
#define WINDOWS_ABI #define OPENBLAS_WINDOWS_ABI
#define OS_WINDOWS #define OPENBLAS_OS_WINDOWS
#ifdef DOUBLE #ifdef DOUBLE
#define DOUBLE_DEFINED DOUBLE #define DOUBLE_DEFINED DOUBLE
@ -10,23 +10,23 @@
#endif #endif
#endif #endif
#ifdef NEEDBUNDERSCORE #ifdef OPENBLAS_NEEDBUNDERSCORE
#define BLASFUNC(FUNC) FUNC##_ #define BLASFUNC(FUNC) FUNC##_
#else #else
#define BLASFUNC(FUNC) FUNC #define BLASFUNC(FUNC) FUNC
#endif #endif
#ifdef QUAD_PRECISION #ifdef OPENBLAS_QUAD_PRECISION
typedef struct { typedef struct {
unsigned long x[2]; unsigned long x[2];
} xdouble; } xdouble;
#elif defined EXPRECISION #elif defined OPENBLAS_EXPRECISION
#define xdouble long double #define xdouble long double
#else #else
#define xdouble double #define xdouble double
#endif #endif
#if defined(OS_WINDOWS) && defined(__64BIT__) #if defined(OPENBLAS_OS_WINDOWS) && defined(OPENBLAS___64BIT__)
typedef long long BLASLONG; typedef long long BLASLONG;
typedef unsigned long long BLASULONG; typedef unsigned long long BLASULONG;
#else #else
@ -34,7 +34,7 @@ typedef long BLASLONG;
typedef unsigned long BLASULONG; typedef unsigned long BLASULONG;
#endif #endif
#ifdef USE64BITINT #ifdef OPENBLAS_USE64BITINT
typedef BLASLONG blasint; typedef BLASLONG blasint;
#else #else
typedef int blasint; typedef int blasint;