Don't use memkind for skx configuration. Fixes #163.

flame · Jan 7, 2018 · f7df64d · f7df64d
1 parent 0b3ca3c
commit f7df64d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 20 deletions.
diff --git a/config/skx/bli_family_skx.h b/config/skx/bli_family_skx.h
@@ -50,22 +50,11 @@
 #define BLIS_SIMD_SIZE                   64
 #define BLIS_SIMD_NUM_REGISTERS          32
 
-#ifdef BLIS_NO_HBWMALLOC
-
 #include <stdlib.h>
 
 #define BLIS_MALLOC_POOL malloc
 #define BLIS_FREE_POOL free
 
-#else
-
-#include <hbwmalloc.h>
-
-#define BLIS_MALLOC_POOL hbw_malloc
-#define BLIS_FREE_POOL hbw_free
-
-#endif
-
 
 #if 0
 // -- LEVEL-3 MICRO-KERNEL CONSTANTS -------------------------------------------

diff --git a/config/skx/make_defs.mk b/config/skx/make_defs.mk
@@ -60,15 +60,11 @@ CDBGFLAGS      := -g
 endif
 
 ifeq ($(DEBUG_TYPE),noopt)
-COPTFLAGS      := -O0 -DBLIS_NO_HBWMALLOC
+COPTFLAGS      := -O0
 else
 COPTFLAGS      := -O3
 endif
 
-ifeq ($(DEBUG_TYPE),sde)
-CPPROCFLAGS    += -DBLIS_NO_HBWMALLOC
-endif
-
 CKOPTFLAGS     := $(COPTFLAGS)
 
 ifeq ($(CC_VENDOR),gcc)
@@ -100,11 +96,7 @@ ARFLAGS        := cr
 LINKER         := $(CC)
 SOFLAGS        := -shared
 
-ifneq ($(DEBUG_TYPE),sde)
-LDFLAGS        := -lmemkind
-else
 LDFLAGS        :=
-endif
 
 ifneq ($(CC_VENDOR),icc)
 LDFLAGS        += -lm