Merge pull request #18 from xianyi/develop

rebase
This commit is contained in:
Martin Kroeker 2021-03-16 21:09:45 +01:00 committed by GitHub
commit 9e0dbe8e59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 5 deletions

View File

@ -31,7 +31,6 @@ environment:
matrix: matrix:
- COMPILER: clang-cl - COMPILER: clang-cl
WITH_FORTRAN: ON WITH_FORTRAN: ON
USE_OPENMP: ON
- COMPILER: clang-cl - COMPILER: clang-cl
DYNAMIC_ARCH: ON DYNAMIC_ARCH: ON
WITH_FORTRAN: OFF WITH_FORTRAN: OFF

View File

@ -40,7 +40,14 @@ char *gotoblas_corename(void) {
return corename[0]; return corename[0];
} }
#ifdef C_PGI #if defined(__clang__)
static int __builtin_cpu_supports(char* arg)
{
return 0;
}
#endif
#if defined(C_PGI) || defined(__clang__)
/* /*
* NV HPC compilers do not yet implement __builtin_cpu_is(). * NV HPC compilers do not yet implement __builtin_cpu_is().
* Fake a version here for use in the CPU detection code below. * Fake a version here for use in the CPU detection code below.

View File

@ -4,7 +4,7 @@
#else #else
#include "config_kernel.h" #include "config_kernel.h"
#endif #endif
#include "param.h" #include "common.h"
int main(int argc, char **argv) { int main(int argc, char **argv) {

View File

@ -72,8 +72,6 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef PARAM_H #ifndef PARAM_H
#define PARAM_H #define PARAM_H
#include "common.h"
#define SBGEMM_DEFAULT_UNROLL_N 4 #define SBGEMM_DEFAULT_UNROLL_N 4
#define SBGEMM_DEFAULT_UNROLL_M 8 #define SBGEMM_DEFAULT_UNROLL_M 8
#define SBGEMM_DEFAULT_UNROLL_MN 32 #define SBGEMM_DEFAULT_UNROLL_MN 32