Merge branch 'master' into knl

# Conflicts:
#	frame/thread/bli_thread.h
This commit is contained in:
Devin Matthews
2016-10-25 13:51:07 -05:00
449 changed files with 11518 additions and 8995 deletions

View File

@@ -723,6 +723,24 @@
// Level-1v
//
// amaxv kernels
#ifndef BLIS_SAMAXV_KERNEL
#define BLIS_SAMAXV_KERNEL BLIS_SAMAXV_KERNEL_REF
#endif
#ifndef BLIS_DAMAXV_KERNEL
#define BLIS_DAMAXV_KERNEL BLIS_DAMAXV_KERNEL_REF
#endif
#ifndef BLIS_CAMAXV_KERNEL
#define BLIS_CAMAXV_KERNEL BLIS_CAMAXV_KERNEL_REF
#endif
#ifndef BLIS_ZAMAXV_KERNEL
#define BLIS_ZAMAXV_KERNEL BLIS_ZAMAXV_KERNEL_REF
#endif
// addv kernels
#ifndef BLIS_SADDV_KERNEL