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

Merge pull request #49 from xianyi/develop 

rebase
This commit is contained in:
Martin Kroeker 2020-04-24 10:21:48 +02:00 committed by GitHub
parent 568674477c f80dd2151e
commit cba87222b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/nightly-Homebrew-build.yml vendored
View File

@ -21,6 +21,7 @@ jobs:
build-OpenBLAS-with-Homebrew: build-OpenBLAS-with-Homebrew:
runs-on: macos-latest runs-on: macos-latest
env: env:
DEVELOPER_DIR: /Applications/Xcode_11.4.1.app/Contents/Developer
HOMEBREW_DEVELOPER: "ON" HOMEBREW_DEVELOPER: "ON"
HOMEBREW_DISPLAY_INSTALL_TIMES: "ON" HOMEBREW_DISPLAY_INSTALL_TIMES: "ON"
HOMEBREW_NO_ANALYTICS: "ON" HOMEBREW_NO_ANALYTICS: "ON"

2
CMakeLists.txt
View File

@ -240,7 +240,7 @@ if (BUILD_SHARED_LIBS AND BUILD_RELAPACK)
if (NOT MSVC) if (NOT MSVC)
target_link_libraries(${OpenBLAS_LIBNAME} "-Wl,-allow-multiple-definition") target_link_libraries(${OpenBLAS_LIBNAME} "-Wl,-allow-multiple-definition")
else() else()
target_link_libraries(${OpenBLAS_LIBNAME} "/FORCE:MULTIPLE") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /FORCE:MULTIPLE")
endif() endif()
endif() endif()

1
Makefile.system
View File

@ -1349,6 +1349,7 @@ export ARCH
export CORE export CORE
export LIBCORE export LIBCORE
export __BYTE_ORDER__ export __BYTE_ORDER__
export ELF_VERSION
export PGCPATH export PGCPATH
export CONFIG export CONFIG
export CC export CC

6
getarch.c
View File

@ -1362,10 +1362,12 @@ int main(int argc, char *argv[]){
#if defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ #if defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
printf("__BYTE_ORDER__=__ORDER_BIG_ENDIAN__\n"); printf("__BYTE_ORDER__=__ORDER_BIG_ENDIAN__\n");
#endif #elif defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ > 0
#if defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ > 0
printf("__BYTE_ORDER__=__ORDER_BIG_ENDIAN__\n"); printf("__BYTE_ORDER__=__ORDER_BIG_ENDIAN__\n");
#endif #endif
#if defined(_CALL_ELF) && (_CALL_ELF == 2)
printf("ELF_VERSION=2\n");
#endif
#ifdef MAKE_NB_JOBS #ifdef MAKE_NB_JOBS
#if MAKE_NB_JOBS > 0 #if MAKE_NB_JOBS > 0

2
interface/CMakeLists.txt
View File

@ -115,7 +115,7 @@ foreach (float_type ${FLOAT_TYPES})
GenerateNamedObjects("syr2k.c" "HEMM" "her2k" ${CBLAS_FLAG} "" "" false ${float_type}) GenerateNamedObjects("syr2k.c" "HEMM" "her2k" ${CBLAS_FLAG} "" "" false ${float_type})
if (USE_GEMM3M) if (USE_GEMM3M)
GenerateNamedObjects("gemm.c" "GEMM3M" "gemm3m" false "" "" false ${float_type}) GenerateNamedObjects("gemm.c" "GEMM3M" "gemm3m" ${CBLAS_FLAG} "" "" false ${float_type})
endif() endif()
endif () endif ()
if (${float_type} STREQUAL "COMPLEX") if (${float_type} STREQUAL "COMPLEX")

8
kernel/power/KERNEL.POWER8
View File

@ -232,3 +232,11 @@ QCABS_KERNEL = ../generic/cabs.c
#Dump kernel #Dump kernel
CGEMM3MKERNEL = ../generic/zgemm3mkernel_dump.c CGEMM3MKERNEL = ../generic/zgemm3mkernel_dump.c
ZGEMM3MKERNEL = ../generic/zgemm3mkernel_dump.c ZGEMM3MKERNEL = ../generic/zgemm3mkernel_dump.c
ifeq ($(__BYTE_ORDER__)$(ELF_VERSION),__ORDER_BIG_ENDIAN__2)
IDAMAXKERNEL = ../arm/iamax.c
IDAMINKERNEL = ../arm/iamin.c
IZAMAXKERNEL = ../arm/izamax.c
IZAMINKERNEL = ../arm/izamin.c
endif