Renamed (shortened) a few build system variables.

Details:
- Renamed the following variables in config.mk (via build/config.mk.in):
    BLIS_ENABLE_VERBOSE_MAKE_OUTPUT -> ENABLE_VERBOSE
    BLIS_ENABLE_STATIC_BUILD        -> MK_ENABLE_STATIC
    BLIS_ENABLE_SHARED_BUILD        -> MK_ENABLE_SHARED
    BLIS_ENABLE_BLAS2BLIS           -> MK_ENABLE_BLAS
    BLIS_ENABLE_CBLAS               -> MK_ENABLE_CBLAS
    BLIS_ENABLE_MEMKIND             -> MK_ENABLE_MEMKIND
  and also renamed all uses of these variables in makefiles and makefile
  fragments. Notice that we use the "MK_" prefix so that those variables
  can be easily differentiated (such as via grep) from their "BLIS_" C
  preprocessor macro counterparts.
- Other whitespace changes to build/config.mk.in.
- Renamed the following C preprocessor macros in bli_config.h (via
  build/bli_config.h.in):
    BLIS_ENABLE_BLAS2BLIS        -> BLIS_ENABLE_BLAS
    BLIS_DISABLE_BLAS2BLIS       -> BLIS_DISABLE_BLAS
    BLIS_BLAS2BLIS_INT_TYPE_SIZE -> BLIS_BLAS_INT_TYPE_SIZE
  and also renamed all relevant uses of these macros in BLIS source
  files.
- Renamed "blas2blis" variable occurrences in configure to "blas", as
  was done in build/config.mk.in and build/bli_config.h.in.
- Renamed the following functions in frame/base/bli_info.c:
    bli_info_get_enable_blas2blis() -> bli_info_get_enable_blas()
    bli_info_get_blas2blis_int_type_size()
                                    -> bli_info_get_blas_int_type_size()
- Remove bli_config.h during 'make cleanh' target of top-level Makefile.

Makefile

@@ -156,13 +156,13 @@ MK_LIBS                           :=
 MK_LIBS_INST                      :=
 MK_LIBS_INST_W_VERS_CONF          :=
 
-ifeq ($(BLIS_ENABLE_STATIC_BUILD),yes)
+ifeq ($(MK_ENABLE_STATIC),yes)
 MK_LIBS                           += $(LIBBLIS_A_PATH)
 MK_LIBS_INST                      += $(LIBBLIS_A_INST)
 MK_LIBS_INST_W_VERS_CONF          += $(LIBBLIS_A_INST_W_VERS_CONF)
 endif
 
-ifeq ($(BLIS_ENABLE_SHARED_BUILD),yes)
+ifeq ($(MK_ENABLE_SHARED),yes)
 MK_LIBS                           += $(LIBBLIS_SO_PATH)
 MK_LIBS_INST                      += $(LIBBLIS_SO_INST)
 MK_LIBS_INST_W_VERS_CONF          += $(LIBBLIS_SO_INST_W_VERS_CONF)
@@ -273,10 +273,10 @@ MK_BLIS_OBJS         := $(MK_CONFIG_OBJS) \
 # added into the library (and reduces compilation time).
 BASE_OBJ_BLAS_PATH   := $(BASE_OBJ_FRAME_PATH)/compat
 BASE_OBJ_CBLAS_PATH  := $(BASE_OBJ_FRAME_PATH)/compat/cblas
-ifeq ($(BLIS_ENABLE_CBLAS),no)
+ifeq ($(MK_ENABLE_CBLAS),no)
 MK_BLIS_OBJS         := $(filter-out $(BASE_OBJ_CBLAS_PATH)/%.o, $(MK_BLIS_OBJS) )
 endif
-ifeq ($(BLIS_ENABLE_BLAS2BLIS),no)
+ifeq ($(MK_ENABLE_BLAS),no)
 MK_BLIS_OBJS         := $(filter-out $(BASE_OBJ_BLAS_PATH)/%.o,  $(MK_BLIS_OBJS) )
 endif
 
@@ -292,7 +292,7 @@ HEADERS_TO_INSTALL := $(BLIS_H_FLAT)
 # If CBLAS is enabled, we also install cblas.h so the user does not need to
 # change their source code to #include "blis.h" in order to access the CBLAS
 # function prototypes and enums.
-ifeq ($(BLIS_ENABLE_CBLAS),yes)
+ifeq ($(MK_ENABLE_CBLAS),yes)
 HEADERS_TO_INSTALL += $(CBLAS_H_FLAT)
 endif
 
@@ -457,7 +457,7 @@ endif
 flat-header: check-env $(BLIS_H_FLAT)
 
 $(BLIS_H_FLAT): $(MK_HEADER_FILES)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(FLATTEN_H) -c -v1 $(BLIS_H_SRC_PATH) $@ "./$(INCLUDE_DIR)" "$(MK_HEADER_DIR_PATHS)"
 else
 	@echo -n "Generating monolithic blis.h"
@@ -470,7 +470,7 @@ endif
 flat-cblas-header: check-env $(CBLAS_H_FLAT)
 
 $(CBLAS_H_FLAT): $(MK_HEADER_FILES)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(FLATTEN_H) -c -v1 $(CBLAS_H_SRC_PATH) $@ "./$(INCLUDE_DIR)" "$(MK_HEADER_DIR_PATHS)"
 else
 	@echo -n "Generating monolithic cblas.h"
@@ -489,7 +489,7 @@ endif
 # CFLAGS to use during compilation.
 define make-config-rule
 $(BASE_OBJ_CONFIG_PATH)/$(1)/%.o: $(CONFIG_PATH)/$(1)/%.c $(BLIS_H_FLAT) $(MAKE_DEFS_MK_PATHS)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(CC) $(call get-config-cflags-for,$(1)) -c $$< -o $$@
 else
 	@echo "Compiling $$@" $(call get-config-text-for,$(1))
@@ -501,7 +501,7 @@ endef
 # config_name, used to look up the CFLAGS to use during compilation.
 define make-frame-rule
 $(BASE_OBJ_FRAME_PATH)/%.o: $(FRAME_PATH)/%.c $(BLIS_H_FLAT) $(MAKE_DEFS_MK_PATHS)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(CC) $(call get-frame-cflags-for,$(1)) -c $$< -o $$@
 else
 	@echo "Compiling $$@" $(call get-frame-text-for,$(1))
@@ -512,7 +512,7 @@ endef
 # first argument: a kernel set (name) being targeted (e.g. haswell).
 define make-refinit-rule
 $(BASE_OBJ_REFKERN_PATH)/$(1)/bli_cntx_$(1)_ref.o: $(REFKERN_PATH)/bli_cntx_ref.c $(BLIS_H_FLAT) $(MAKE_DEFS_MK_PATHS)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(CC) $(call get-refinit-cflags-for,$(1)) -c $$< -o $$@
 else
 	@echo "Compiling $$@" $(call get-refinit-text-for,$(1))
@@ -523,7 +523,7 @@ endef
 # first argument: a kernel set (name) being targeted (e.g. haswell).
 define make-refkern-rule
 $(BASE_OBJ_REFKERN_PATH)/$(1)/%_$(1)_ref.o: $(REFKERN_PATH)/%_ref.c $(BLIS_H_FLAT) $(MAKE_DEFS_MK_PATHS)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(CC) $(call get-refkern-cflags-for,$(1)) -c $$< -o $$@
 else
 	@echo "Compiling $$@" $(call get-refkern-text-for,$(1))
@@ -537,7 +537,7 @@ endef
 #$(BASE_OBJ_KERNELS_PATH)/$(1)/%.o: $(KERNELS_PATH)/$(1)/%.c $(BLIS_H_FLAT) $(MAKE_DEFS_MK_PATHS)
 define make-kernels-rule
 $(BASE_OBJ_KERNELS_PATH)/$(1)/%.o: $(KERNELS_PATH)/$(1)/%.$(3) $(BLIS_H_FLAT) $(MAKE_DEFS_MK_PATHS)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(CC) $(call get-kernel-cflags-for,$(2)) -c $$< -o $$@
 else
 	@echo "Compiling $$@" $(call get-kernel-text-for,$(2))
@@ -591,7 +591,7 @@ libblis: check-env $(MK_LIBS)
 # --- Static library archiver rules ---
 
 $(LIBBLIS_A_PATH): $(MK_BLIS_OBJS)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(AR) $(ARFLAGS) $@ $?
 	$(RANLIB) $@
 else
@@ -604,7 +604,7 @@ endif
 # --- Dynamic library linker rules ---
 
 $(LIBBLIS_SO_PATH): $(MK_BLIS_OBJS)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(LINKER) $(SOFLAGS) $(LDFLAGS) -o $@ $?
 else 
 	@echo "Dynamically linking $@"
@@ -624,7 +624,7 @@ blastest-run: $(BLASTEST_DRV_BINS_R)
 
 # f2c object file rule.
 $(BASE_OBJ_BLASTEST_PATH)/%.o: $(BLASTEST_F2C_SRC_PATH)/%.c
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(CC) $(CFLAGS) $(BLAT_CFLAGS) -c $< -o $@
 else
 	@echo "Compiling $@"
@@ -633,7 +633,7 @@ endif
 
 # driver object file rule.
 $(BASE_OBJ_BLASTEST_PATH)/%.o: $(BLASTEST_DRV_SRC_PATH)/%.c
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(CC) $(CFLAGS) $(BLAT_CFLAGS) -c $< -o $@
 else
 	@echo "Compiling $@"
@@ -642,7 +642,7 @@ endif
 
 # libf2c library archive rule.
 $(BLASTEST_F2C_LIB): $(BLASTEST_F2C_OBJS)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(AR) $(ARFLAGS) $@ $?
 	$(RANLIB) $@
 else
@@ -654,7 +654,7 @@ endif
 # first argument: the base name of the BLAS test driver.
 define make-blat-rule
 $(BASE_OBJ_BLASTEST_PATH)/$(1).x: $(BASE_OBJ_BLASTEST_PATH)/$(1).o $(BLASTEST_F2C_LIB) $(LIBBLIS_LINK)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(LINKER) $(BASE_OBJ_BLASTEST_PATH)/$(1).o $(BLASTEST_F2C_LIB) $(LIBBLIS_LINK) $(LDFLAGS) -o $$@
 else
 	@echo "Linking $$(@F) against '$(notdir $(BLASTEST_F2C_LIB)) $(LIBBLIS_LINK) $(LDFLAGS)'"
@@ -668,7 +668,7 @@ $(foreach name, $(BLASTEST_DRV_BASES), $(eval $(call make-blat-rule,$(name))))
 # A rule to run ?blat1.x driver files.
 define make-run-blat1-rule
 run-$(1): $(BASE_OBJ_BLASTEST_PATH)/$(1).x
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(BASE_OBJ_BLASTEST_PATH)/$(1).x > out.$(1)
 else
 	@echo "Running $(1).x > 'out.$(1)'"
@@ -682,7 +682,7 @@ $(foreach name, $(BLASTEST_DRV1_BASES), $(eval $(call make-run-blat1-rule,$(name
 # A rule to run ?blat2.x and ?blat3.x driver files.
 define make-run-blat23-rule
 run-$(1): $(BASE_OBJ_BLASTEST_PATH)/$(1).x
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(BASE_OBJ_BLASTEST_PATH)/$(1).x < $(BLASTEST_INPUT_PATH)/$(1).in
 else
 	@echo "Running $(1).x < '$(BLASTEST_INPUT_PATH)/$(1).in' (output to 'out.$(1)')"
@@ -698,7 +698,7 @@ $(foreach name, $(BLASTEST_DRV3_BASES), $(eval $(call make-run-blat23-rule,$(nam
 
 # Check the results of the BLAS test suite drivers.
 checkblas: blastest-run
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	- $(BLASTEST_CHECK)
 else
 	@- $(BLASTEST_CHECK)
@@ -716,7 +716,7 @@ testsuite-bin: check-env $(TESTSUITE_BIN)
 
 # Object file rule.
 $(BASE_OBJ_TESTSUITE_PATH)/%.o: $(TESTSUITE_SRC_PATH)/%.c
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(CC) $(call get-frame-cflags-for,$(CONFIG_NAME)) -c $< -o $@
 else
 	@echo "Compiling $@"
@@ -725,7 +725,7 @@ endif
 
 # Testsuite binary rule.
 $(TESTSUITE_BIN): $(MK_TESTSUITE_OBJS) $(LIBBLIS_LINK)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(LINKER) $(MK_TESTSUITE_OBJS) $(LIBBLIS_LINK) $(LDFLAGS) -o $@
 else
 	@echo "Linking $@ against '$(LIBBLIS_LINK) $(LDFLAGS)'"
@@ -734,7 +734,7 @@ endif
 
 # A rule to run the testsuite using the normal input.* files.
 testsuite-run: testsuite-bin
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	./$(TESTSUITE_BIN) -g $(TESTSUITE_CONF_GEN_PATH) \
 	                   -o $(TESTSUITE_CONF_OPS_PATH) \
 	                    > $(TESTSUITE_OUT_FILE)
@@ -749,7 +749,7 @@ endif
 # A rule to run the testsuite using the input.*.fast files, which
 # run a set of tests designed to finish much more quickly.
 testsuite-run-fast: testsuite-bin
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	./$(TESTSUITE_BIN) -g $(TESTSUITE_FAST_GEN_PATH) \
 	                   -o $(TESTSUITE_FAST_OPS_PATH) \
 	                    > $(TESTSUITE_OUT_FILE)
@@ -763,7 +763,7 @@ endif
 
 # Check the results of the BLIS testsuite.
 checkblis: testsuite-run
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	- $(TESTSUITE_CHECK) $(TESTSUITE_OUT_FILE)
 else
 	@- $(TESTSUITE_CHECK) $(TESTSUITE_OUT_FILE)
@@ -771,7 +771,7 @@ endif
 
 # Check the results of the BLIS testsuite (fast).
 checkblis-fast: testsuite-run-fast
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	- $(TESTSUITE_CHECK) $(TESTSUITE_OUT_FILE)
 else
 	@- $(TESTSUITE_CHECK) $(TESTSUITE_OUT_FILE)
@@ -782,7 +782,7 @@ endif
 install-headers: check-env $(MK_INCL_DIR_INST)
 
 $(MK_INCL_DIR_INST): $(HEADERS_TO_INSTALL) $(CONFIG_MK_FILE)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(MKDIR) $(@)
 	$(INSTALL) -m 0644 $(HEADERS_TO_INSTALL) $(@)
 else
@@ -797,7 +797,7 @@ endif
 install-libs: check-env $(MK_LIBS_INST_W_VERS_CONF)
 
 $(INSTALL_LIBDIR)/%-$(VERS_CONF).a: $(BASE_LIB_PATH)/%.a $(CONFIG_MK_FILE)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(MKDIR) $(@D)
 	$(INSTALL) -m 0644 $< $@
 else
@@ -807,7 +807,7 @@ else
 endif
 
 $(INSTALL_LIBDIR)/%-$(VERS_CONF).so: $(BASE_LIB_PATH)/%.so $(CONFIG_MK_FILE)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(MKDIR) $(@D)
 	$(INSTALL) -m 0644 $< $@
 else
@@ -822,7 +822,7 @@ endif
 install-lib-symlinks: check-env $(MK_LIBS_INST)
 
 $(INSTALL_LIBDIR)/%.a: $(INSTALL_LIBDIR)/%-$(VERS_CONF).a
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(SYMLINK) $(<F) $(@F)
 	$(MV) $(@F) $(INSTALL_LIBDIR)/
 else
@@ -832,7 +832,7 @@ else
 endif
 
 $(INSTALL_LIBDIR)/%.so: $(INSTALL_LIBDIR)/%-$(VERS_CONF).so
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(SYMLINK) $(<F) $(@F)
 	$(MV) $(@F) $(INSTALL_LIBDIR)/
 else
@@ -855,17 +855,17 @@ showconfig: check-env
 	@echo "install includedir:    $(INSTALL_INCDIR)"
 	@echo "debugging status:      $(DEBUG_TYPE)"
 	@echo "multithreading status: $(THREADING_MODEL)"
-	@echo "enable BLAS API?       $(BLIS_ENABLE_BLAS2BLIS)"
-	@echo "enable CBLAS API?      $(BLIS_ENABLE_CBLAS)"
-	@echo "build static library?  $(BLIS_ENABLE_STATIC_BUILD)"
-	@echo "build shared library?  $(BLIS_ENABLE_SHARED_BUILD)"
+	@echo "enable BLAS API?       $(MK_ENABLE_BLAS)"
+	@echo "enable CBLAS API?      $(MK_ENABLE_CBLAS)"
+	@echo "build static library?  $(MK_ENABLE_STATIC)"
+	@echo "build shared library?  $(MK_ENABLE_SHARED)"
 
 
 # --- Clean rules ---
 
 cleanmk:
 ifeq ($(IS_CONFIGURED),yes)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	- $(FIND) $(CONFIG_PATH) -name "$(FRAGMENT_MK)" | $(XARGS) $(RM_F)
 	- $(FIND) $(FRAME_PATH) -name "$(FRAGMENT_MK)" | $(XARGS) $(RM_F)
 	- $(FIND) $(REFKERN_PATH) -name "$(FRAGMENT_MK)" | $(XARGS) $(RM_F)
@@ -884,10 +884,13 @@ endif
 
 cleanh:
 ifeq ($(IS_CONFIGURED),yes)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
+	$(RM_F) $(BLIS_CONFIG_H)
 	$(RM_F) $(BLIS_H_FLAT)
 	$(RM_F) $(CBLAS_H_FLAT)
 else
+	@echo "Removing config header $(BLIS_CONFIG_H)."
+	@$(RM_F) $(BLIS_CONFIG_H)
 	@echo "Removing flattened header files from $(BASE_INC_PATH)."
 	@$(RM_F) $(BLIS_H_FLAT)
 	@$(RM_F) $(CBLAS_H_FLAT)
@@ -896,7 +899,7 @@ endif
 
 cleanlib:
 ifeq ($(IS_CONFIGURED),yes)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	- $(FIND) $(BASE_OBJ_PATH) -name "*.o" | $(XARGS) $(RM_F)
 	- $(RM_F) $(LIBBLIS_A_PATH)
 	- $(RM_F) $(LIBBLIS_SO_PATH)
@@ -919,7 +922,7 @@ endif
 
 cleanblastesttop:
 ifeq ($(IS_CONFIGURED),yes)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	- $(RM_F) $(BLASTEST_F2C_OBJS) $(BLASTEST_DRV_OBJS)
 	- $(RM_F) $(BLASTEST_F2C_LIB)
 	- $(RM_F) $(BLASTEST_DRV_BIN_PATHS)
@@ -933,12 +936,12 @@ else
 	@- $(RM_F) $(BLASTEST_DRV_BIN_PATHS)
 	@echo "Removing driver output files 'out.*'."
 	@- $(RM_F) $(addprefix out.,$(BLASTEST_DRV_BASES))
-endif # BLIS_ENABLE_VERBOSE_MAKE_OUTPUT
+endif # ENABLE_VERBOSE
 endif # IS_CONFIGURED
 
 cleanblastestdir:
 ifeq ($(IS_CONFIGURED),yes)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	- $(FIND) $(BLASTEST_DIR)/$(OBJ_DIR) -name "*.o" | $(XARGS) $(RM_F)
 	- $(FIND) $(BLASTEST_DIR) -name "*.x" | $(XARGS) $(RM_F)
 	- $(RM_F) $(BLASTEST_DIR)/$(BLASTEST_F2C_LIB_NAME)
@@ -952,7 +955,7 @@ else
 	@- $(FIND) $(BLASTEST_DIR) -name "*.x" | $(XARGS) $(RM_F)
 	@echo "Removing driver output files 'out.*' from ./$(BLASTEST_DIR)."
 	@- $(RM_F) $(addprefix $(BLASTEST_DIR)/out.,$(BLASTEST_DRV_BASES))
-endif # BLIS_ENABLE_VERBOSE_MAKE_OUTPUT
+endif # ENABLE_VERBOSE
 endif # IS_CONFIGURED
 
 ifeq ($(BUILDING_OOT),no)
@@ -963,7 +966,7 @@ endif
 
 cleanblistesttop:
 ifeq ($(IS_CONFIGURED),yes)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	- $(RM_F) $(MK_TESTSUITE_OBJS)
 	- $(RM_F) $(TESTSUITE_BIN)
 	- $(RM_F) $(TESTSUITE_OUT_FILE)
@@ -974,12 +977,12 @@ else
 	@- $(RM_F) $(TESTSUITE_BIN)
 	@echo "Removing $(TESTSUITE_OUT_FILE)."
 	@- $(RM_F) $(TESTSUITE_OUT_FILE)
-endif # BLIS_ENABLE_VERBOSE_MAKE_OUTPUT
+endif # ENABLE_VERBOSE
 endif # IS_CONFIGURED
 
 cleanblistestdir:
 ifeq ($(IS_CONFIGURED),yes)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	- $(FIND) $(TESTSUITE_DIR)/$(OBJ_DIR) -name "*.o" | $(XARGS) $(RM_F)
 	- $(RM_F) $(TESTSUITE_DIR)/$(TESTSUITE_BIN)
 else
@@ -987,12 +990,12 @@ else
 	@- $(FIND) $(TESTSUITE_DIR)/$(OBJ_DIR) -name "*.o" | $(XARGS) $(RM_F)
 	@echo "Removing binary $(TESTSUITE_DIR)/$(TESTSUITE_BIN)."
 	@- $(RM_F) $(TESTSUITE_DIR)/$(TESTSUITE_BIN)
-endif # BLIS_ENABLE_VERBOSE_MAKE_OUTPUT
+endif # ENABLE_VERBOSE
 endif # IS_CONFIGURED
 
 distclean: cleanmk cleanh cleanlib cleantest
 ifeq ($(IS_CONFIGURED),yes)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	- $(RM_F) $(CONFIG_MK_FILE)
 	- $(RM_RF) $(OBJ_DIR)
 	- $(RM_RF) $(LIB_DIR)
@@ -1026,7 +1029,7 @@ changelog:
 # those products.
 
 uninstall-libs: check-env
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	- $(RM_F) $(MK_LIBS_INST_W_VERS_CONF)
 else
 	@echo "Removing $(MK_LIBS_INST_W_VERS_CONF)."
@@ -1034,7 +1037,7 @@ else
 endif
 
 uninstall-lib-symlinks: check-env
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	- $(RM_F) $(MK_LIBS_INST)
 else
 	@echo "Removing $(MK_LIBS_INST)."
@@ -1042,7 +1045,7 @@ else
 endif
 
 uninstall-headers: check-env
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	- $(RM_RF) $(MK_INCL_DIR_INST)
 else
 	@echo "Removing $(MK_INCL_DIR_INST)/."
@@ -1056,7 +1059,7 @@ uninstall-old-libs: $(UNINSTALL_LIBS) check-env
 uninstall-old-headers: $(UNINSTALL_HEADERS) check-env
 
 $(UNINSTALL_LIBS): check-env
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	- $(RM_F) $@
 else
 	@echo "Removing $(@F) from $(@D)/."
@@ -1064,7 +1067,7 @@ else
 endif
 
 $(UNINSTALL_HEADERS): check-env
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	- $(RM_F) $@
 else
 	@echo "Removing $(@F) from $(@D)/."

blastest/Makefile

@@ -218,7 +218,7 @@ endif
 # --Object file rules --
 
 $(TEST_OBJ_PATH)/%.o: $(F2C_PATH)/%.c
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(CC) $(CFLAGS) -c $< -o $@
 else
 	@echo "Compiling $@"
@@ -226,7 +226,7 @@ else
 endif
 
 $(TEST_OBJ_PATH)/%.o: $(DRIVER_PATH)/%.c
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(CC) $(CFLAGS) -c $< -o $@
 else
 	@echo "Compiling $@"
@@ -237,7 +237,7 @@ endif
 # -- libf2c library archive rule --
 
 $(F2C_LIB): $(F2C_OBJS)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(AR) $(ARFLAGS) $@ $?
 	$(RANLIB) $@
 else
@@ -252,7 +252,7 @@ endif
 # first argument: the base name of the BLAS test driver.
 define make-blat-rule
 $(1).x: $(TEST_OBJ_PATH)/$(1).o $(F2C_LIB) $(LIBBLIS_LINK)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(LINKER) $(TEST_OBJ_PATH)/$(1).o $(F2C_OBJS) $(LIBBLIS_LINK) $(LDFLAGS) -o $$@
 else
 	@echo "Linking $$@ against '$(F2C_LIB) $(LIBBLIS_LINK) $(LDFLAGS)'"
@@ -271,7 +271,7 @@ run: $(DRIVER_BINS_R)
 # A rule to run ?blat1.x driver files.
 define make-run-blat1-rule
 run-$(1): $(1).x
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	./$(1).x > out.$(1)
 else
 	@echo "Running $(1).x > 'out.$(1)'"
@@ -285,7 +285,7 @@ $(foreach name, $(DRIVER1_BASES), $(eval $(call make-run-blat1-rule,$(name))))
 # A rule to run ?blat2.x and ?blat3.x driver files.
 define make-run-blat23-rule
 run-$(1): $(1).x
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	./$(1).x < $(INPUT_DIR)/$(1).in
 else
 	@echo "Running $(1).x < '$(INPUT_DIR)/$(1).in' (output to 'out.$(1)')"
@@ -300,7 +300,7 @@ $(foreach name, $(DRIVER2_BASES), $(eval $(call make-run-blat23-rule,$(name))))
 $(foreach name, $(DRIVER3_BASES), $(eval $(call make-run-blat23-rule,$(name))))
 
 check: run
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	- $(BLASTEST_CHECK)
 else
 	@- $(BLASTEST_CHECK)

blastest/f2c/f2c_types.h

@@ -51,9 +51,9 @@ extern "C" {
 #define F2C_LONG_LONG_BITS 64
 
 #ifdef HAVE_BLIS_H
-  #if   BLIS_BLAS2BLIS_INT_TYPE_SIZE == 32
+  #if   BLIS_BLAS_INT_TYPE_SIZE == 32
     typedef int32_t   integer;
-  #elif BLIS_BLAS2BLIS_INT_TYPE_SIZE == 64
+  #elif BLIS_BLAS_INT_TYPE_SIZE == 64
     typedef int64_t   integer;
   #else
     typedef long int  integer;

build/bli_config.h.in

@@ -64,20 +64,20 @@
 // determine automatically
 #endif
 
-#if @blas2blis_int_type_size@ == 64
-#define BLIS_BLAS2BLIS_INT_TYPE_SIZE 64
-#elif @blas2blis_int_type_size@ == 32
-#define BLIS_BLAS2BLIS_INT_TYPE_SIZE 32
+#if @blas_int_type_size@ == 64
+#define BLIS_BLAS_INT_TYPE_SIZE 64
+#elif @blas_int_type_size@ == 32
+#define BLIS_BLAS_INT_TYPE_SIZE 32
 #else
 // determine automatically
 #endif
 
-#ifndef BLIS_ENABLE_BLAS2BLIS
-#ifndef BLIS_DISABLE_BLAS2BLIS
-#if @enable_blas2blis@
-#define BLIS_ENABLE_BLAS2BLIS
+#ifndef BLIS_ENABLE_BLAS
+#ifndef BLIS_DISABLE_BLAS
+#if @enable_blas@
+#define BLIS_ENABLE_BLAS
 #else
-#define BLIS_DISABLE_BLAS2BLIS
+#define BLIS_DISABLE_BLAS
 #endif
 #endif
 #endif

build/config.mk.in

@@ -38,16 +38,16 @@ CONFIG_MK_INCLUDED := yes
 
 # The version string. This could be the official string or a custom
 # string forced at configure-time.
-VERSION         := @version@
+VERSION           := @version@
 
 # The name of the configuration family.
-CONFIG_NAME     := @config_name@
+CONFIG_NAME       := @config_name@
 
 # The list of sub-configurations associated with CONFIG_NAME. Each
 # sub-configuration in CONFIG_LIST corresponds to a configuration
 # sub-directory in the 'config' directory. See the 'config_registry'
 # file for the full list of registered configurations.
-CONFIG_LIST     := @config_list@
+CONFIG_LIST       := @config_list@
 
 # This list of kernels needed for the configurations in CONFIG_LIST.
 # Each item in this list corresponds to a sub-directory in the top-level
@@ -55,15 +55,15 @@ CONFIG_LIST     := @config_list@
 # but not always. For example, if configuration X and Y use the same
 # kernel set X, and configuration W uses kernel set Q, and the CONFIG_LIST
 # might contained "X Y Z W", then the KERNEL_LIST would contain "X Z Q".
-KERNEL_LIST     := @kernel_list@
+KERNEL_LIST       := @kernel_list@
 
 # This list contains some number of "kernel:config" pairs, where "config"
 # specifies which configuration's compilation flags (CFLAGS) should be
 # used to compile the source code for the kernel set named "kernel".
-KCONFIG_MAP     := @kconfig_map@
+KCONFIG_MAP       := @kconfig_map@
 
 # The operating system name, which should be either 'Linux' or 'Darwin'.
-OS_NAME         := $(shell uname -s)
+OS_NAME           := $(shell uname -s)
 
 # The directory path to the top level of the source distribution.
 # NOTE: We allow the includer to override this value by setting DIST_PATH
@@ -72,40 +72,44 @@ OS_NAME         := $(shell uname -s)
 # to the 'testsuite' directory, or the 'test' directory containing
 # individual test drivers.
 ifeq ($(strip $(DIST_PATH)),)
-DIST_PATH       := @dist_path@
+DIST_PATH         := @dist_path@
 endif
 
-# The level of debugging info to generate.
-DEBUG_TYPE      := @debug_type@
-
 # The C compiler.
-CC              := @CC@
-RANLIB          := @RANLIB@
+CC                := @CC@
+RANLIB            := @RANLIB@
+
+# The level of debugging info to generate.
+DEBUG_TYPE        := @debug_type@
 
 # The requested threading model.
-THREADING_MODEL := @threading_model@
+THREADING_MODEL   := @threading_model@
 
 # The install libdir and includedir values from configure tell us where to
 # install the libraries and header files, respectively. Notice that we
 # support the use of DESTDIR so that advanced users may install to a
 # temporary location.
-INSTALL_LIBDIR := $(DESTDIR)@install_libdir@
-INSTALL_INCDIR := $(DESTDIR)@install_incdir@
+INSTALL_LIBDIR    := $(DESTDIR)@install_libdir@
+INSTALL_INCDIR    := $(DESTDIR)@install_incdir@
 
-# Variables corresponding to other configure-time options.
-BLIS_ENABLE_VERBOSE_MAKE_OUTPUT := @enable_verbose@
-BLIS_ENABLE_STATIC_BUILD        := @enable_static@
-BLIS_ENABLE_SHARED_BUILD        := @enable_shared@
+# Whether to output verbose command-line feedback as the Makefile is processed.
+ENABLE_VERBOSE    := @enable_verbose@
 
-# The status of BLAS and CBLAS compatibility layers
-BLIS_ENABLE_BLAS2BLIS := @enable_blas2blis@
-BLIS_ENABLE_CBLAS     := @enable_cblas@
+# Whether we are building out-of-tree.
+BUILDING_OOT      := @configured_oot@
+
+# Whether to build the static and shared libraries.
+# Note the "MK_" prefix, which helps differentiate these variables from
+# their corresonding cpp macros that use the BLIS_ prefix.
+MK_ENABLE_STATIC  := @enable_static@
+MK_ENABLE_SHARED  := @enable_shared@
+
+# Whether to enable either the BLAS or CBLAS compatibility layers.
+MK_ENABLE_BLAS    := @enable_blas@
+MK_ENABLE_CBLAS   := @enable_cblas@
 
 # Whether libblis will depend on libmemkind for certain memory allocations.
-BLIS_ENABLE_MEMKIND   := @enable_memkind@
-
-# Whether we are building out-of-tree
-BUILDING_OOT          := @configured_oot@
+MK_ENABLE_MEMKIND := @enable_memkind@
 
 # end of ifndef CONFIG_MK_INCLUDED conditional block
 endif

common.mk

@@ -332,7 +332,7 @@ LIBPTHREAD := -lpthread
 LDFLAGS    := $(LIBM) $(LIBPTHREAD)
 
 # Add libmemkind to the link-time flags, if it was enabled at configure-time.
-ifeq ($(BLIS_ENABLE_MEMKIND),yes)
+ifeq ($(MK_ENABLE_MEMKIND),yes)
 LDFLAGS    += $(LIBMEMKIND)
 endif
 
@@ -353,8 +353,8 @@ SOFLAGS    := -shared
 # to the static library, unless only the shared library was enabled, in
 # which case we use the shared library.
 LIBBLIS_LINK   := $(LIBBLIS_A_PATH)
-ifeq ($(BLIS_ENABLE_SHARED_BUILD),yes)
-ifeq ($(BLIS_ENABLE_STATIC_BUILD),no)
+ifeq ($(MK_ENABLE_SHARED),yes)
+ifeq ($(MK_ENABLE_STATIC),no)
 LIBBLIS_LINK   := $(LIBBLIS_SO_PATH)
 endif
 endif
@@ -503,12 +503,12 @@ endif
 #
 
 ifeq ($(V),1)
-BLIS_ENABLE_VERBOSE_MAKE_OUTPUT := yes
+ENABLE_VERBOSE := yes
 BLIS_ENABLE_TEST_OUTPUT := yes
 endif
 
 ifeq ($(V),0)
-BLIS_ENABLE_VERBOSE_MAKE_OUTPUT := no
+ENABLE_VERBOSE := no
 BLIS_ENABLE_TEST_OUTPUT := no
 endif
 
@@ -674,6 +674,15 @@ CBLAS_H_SRC_PATH := $(filter %/$(CBLAS_H), $(MK_HEADER_FILES))
 CBLAS_H_FLAT    := $(BASE_INC_PATH)/$(CBLAS_H)
 
 
+#
+# --- BLIS configuration header definitions ------------------------------------
+#
+
+# This file was created by configure, but we need to define it here so we can
+# remove it as part of the clean targets.
+BLIS_CONFIG_H   := ./bli_config.h
+
+
 #
 # --- Special preprocessor macro definitions -----------------------------------
 #

config/knl/make_defs.mk

@@ -74,7 +74,7 @@ CPPROCFLAGS    += -DBLIS_DISABLE_MEMKIND
 # config.mk, however, the make_defs.mk files (this file) get included
 # after config.mk, so this definition will override that earlier
 # definition.
-BLIS_ENABLE_MEMKIND := no
+MK_ENABLE_MEMKIND := no
 endif
 
 # Flags specific to optimized kernels.

configure

@@ -1495,8 +1495,8 @@ main()
 	enable_shared='no'
 	enable_packbuf_pools='yes'
 	int_type_size=0
-	blas2blis_int_type_size=32
-	enable_blas2blis='yes'
+	blas_int_type_size=32
+	enable_blas='yes'
 	enable_cblas='no'
 	enable_memkind='' # The default memkind value is determined later on.
 	force_version='no'
@@ -1593,13 +1593,13 @@ main()
 						int_type_size=${OPTARG#*=}
 						;;
 					blas-int-size=*)
-						blas2blis_int_type_size=${OPTARG#*=}
+						blas_int_type_size=${OPTARG#*=}
 						;;
 					enable-blas)
-						enable_blas2blis='yes'
+						enable_blas='yes'
 						;;
 					disable-blas)
-						enable_blas2blis='no'
+						enable_blas='no'
 						;;
 					enable-cblas)
 						enable_cblas='yes'
@@ -1644,7 +1644,7 @@ main()
 				int_type_size=$OPTARG
 				;;
 			b)
-				blas2blis_int_type_size=$OPTARG
+				blas_int_type_size=$OPTARG
 				;;
 			c)
 				show_config_list=1
@@ -2145,18 +2145,18 @@ main()
 		fi
 		enable_memkind_01=0
 	fi
-	if [ "x${enable_blas2blis}" = "xyes" ]; then
+	if [ "x${enable_blas}" = "xyes" ]; then
 		echo "${script_name}: the BLAS compatibility layer is enabled."
-		enable_blas2blis_01=1
+		enable_blas_01=1
 	else
 		echo "${script_name}: the BLAS compatibility layer is disabled."
-		enable_blas2blis_01=0
+		enable_blas_01=0
 	fi
 	if [ "x${enable_cblas}" = "xyes" ]; then
 		echo "${script_name}: the CBLAS compatibility layer is enabled."
 		enable_cblas_01=1
 		# Force BLAS layer when CBLAS is enabled
-		enable_blas2blis='yes'
+		enable_blas='yes'
 	else
 		echo "${script_name}: the CBLAS compatibility layer is disabled."
 		enable_cblas_01=0
@@ -2170,9 +2170,9 @@ main()
 	else
 		echo "${script_name}: the internal integer size is automatically determined."
 	fi
-	if [ "x${blas2blis_int_type_size}" = "x32" ]; then
+	if [ "x${blas_int_type_size}" = "x32" ]; then
 		echo "${script_name}: the BLAS/CBLAS interface integer size is 32-bit."
-	elif [ "x${blas2blis_int_type_size}" = "x64" ]; then
+	elif [ "x${blas_int_type_size}" = "x64" ]; then
 		echo "${script_name}: the BLAS/CBLAS interface integer size is 64-bit."
 	else
 		echo "${script_name}: the BLAS/CBLAS interface integer size is automatically determined."
@@ -2256,16 +2256,16 @@ main()
 		| sed -e "s/@CC@/${cc_esc}/g" \
 		| sed -e "s/@RANLIB@/${ranlib_esc}/g" \
 		| sed -e "s/@debug_type@/${debug_type}/g" \
+		| sed -e "s/@threading_model@/${threading_model}/g" \
 		| sed -e "s/@install_libdir@/${install_libdir_esc}/g" \
 		| sed -e "s/@install_incdir@/${install_incdir_esc}/g" \
 		| sed -e "s/@enable_verbose@/${enable_verbose}/g" \
+		| sed -e "s/@configured_oot@/${configured_oot}/g" \
 		| sed -e "s/@enable_static@/${enable_static}/g" \
 		| sed -e "s/@enable_shared@/${enable_shared}/g" \
-		| sed -e "s/@threading_model@/${threading_model}/g" \
-		| sed -e "s/@enable_blas2blis@/${enable_blas2blis}/g" \
+		| sed -e "s/@enable_blas@/${enable_blas}/g" \
 		| sed -e "s/@enable_cblas@/${enable_cblas}/g" \
 		| sed -e "s/@enable_memkind@/${enable_memkind}/g" \
-		| sed -e "s/@configured_oot@/${configured_oot}/g" \
 		> "${config_mk_out_path}"
 		
 
@@ -2283,8 +2283,8 @@ main()
 		| sed   -e "s/@enable_pthreads@/${enable_pthreads_01}/g" \
 		| sed   -e "s/@enable_packbuf_pools@/${enable_packbuf_pools_01}/g" \
 		| sed   -e "s/@int_type_size@/${int_type_size}/g" \
-		| sed   -e "s/@blas2blis_int_type_size@/${blas2blis_int_type_size}/g" \
-		| sed   -e "s/@enable_blas2blis@/${enable_blas2blis_01}/g" \
+		| sed   -e "s/@blas_int_type_size@/${blas_int_type_size}/g" \
+		| sed   -e "s/@enable_blas@/${enable_blas_01}/g" \
 		| sed   -e "s/@enable_cblas@/${enable_cblas_01}/g" \
 		| sed   -e "s/@enable_memkind@/${enable_memkind_01}/g" \
 		> "${bli_config_h_out_path}"

examples/oapi/Makefile

@@ -152,7 +152,7 @@ bin: $(TEST_BINS)
 # --Object file rules --
 
 $(TEST_OBJ_PATH)/%.o: $(TEST_SRC_PATH)/%.c $(LIBBLIS_LINK)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(CC) $(CFLAGS) -c $< -o $@
 else
 	@echo "Compiling $@"
@@ -163,7 +163,7 @@ endif
 # -- Executable file rules --
 
 %.x: %.o $(LIBBLIS_LINK)
-ifeq ($(BLIS_ENABLE_VERBOSE_MAKE_OUTPUT),yes)
+ifeq ($(ENABLE_VERBOSE),yes)
 	$(LINKER) $< $(LIBBLIS_LINK) $(LDFLAGS) -o $@
 else
 	@echo "Linking $@ against '$(LIBBLIS_LINK) $(LDFLAGS)'"

frame/base/bli_info.c

@@ -69,9 +69,9 @@ gint_t bli_info_get_enable_stay_auto_init( void )
 	return 0;
 #endif
 }
-gint_t bli_info_get_enable_blas2blis( void )
+gint_t bli_info_get_enable_blas( void )
 {
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 	return 1;
 #else
 	return 0;
@@ -85,7 +85,7 @@ gint_t bli_info_get_enable_cblas( void )
 	return 0;
 #endif
 }
-gint_t bli_info_get_blas2blis_int_type_size( void ) { return BLIS_BLAS2BLIS_INT_TYPE_SIZE; }
+gint_t bli_info_get_blas_int_type_size( void ) { return BLIS_BLAS_INT_TYPE_SIZE; }
 gint_t bli_info_get_enable_packbuf_pools( void )
 {
 #ifdef BLIS_ENABLE_PACKBUF_POOLS

frame/base/bli_info.h

@@ -54,9 +54,9 @@ gint_t bli_info_get_heap_addr_align_size( void );
 gint_t bli_info_get_heap_stride_align_size( void );
 gint_t bli_info_get_pool_addr_align_size( void );
 gint_t bli_info_get_enable_stay_auto_init( void );
-gint_t bli_info_get_enable_blas2blis( void );
+gint_t bli_info_get_enable_blas( void );
 gint_t bli_info_get_enable_cblas( void );
-gint_t bli_info_get_blas2blis_int_type_size( void );
+gint_t bli_info_get_blas_int_type_size( void );
 gint_t bli_info_get_enable_packbuf_pools( void );
 
 

frame/compat/attic/bla_gbmv.c

@@ -81,7 +81,7 @@ void PASTEF77(ch,blasname)( \
 	bli_check_error_code( BLIS_NOT_YET_IMPLEMENTED ); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNC_BLAS( gbmv, gbmv )
 #endif
 

frame/compat/attic/bla_gbmv.h

@@ -52,7 +52,7 @@ void PASTEF77(ch,blasname)( \
                             ftype*    y, f77_int* incy  \
                           );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROT_BLAS( gbmv )
 #endif
 

frame/compat/attic/bla_hbmv.c

@@ -73,7 +73,7 @@ void PASTEF77(ch,blasname)( \
 	bli_check_error_code( BLIS_NOT_YET_IMPLEMENTED ); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCCO_BLAS( hbmv, hbmv )
 #endif
 

frame/compat/attic/bla_hbmv.h

@@ -50,7 +50,7 @@ void PASTEF77(ch,blasname)( \
                             ftype*    y, f77_int* incy  \
                           );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTCO_BLAS( hbmv )
 #endif
 

frame/compat/attic/bla_hpmv.c

@@ -72,7 +72,7 @@ void PASTEF77(ch,blasname)( \
 	bli_check_error_code( BLIS_NOT_YET_IMPLEMENTED ); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCCO_BLAS( hpmv, hpmv )
 #endif
 

frame/compat/attic/bla_hpmv.h

@@ -49,7 +49,7 @@ void PASTEF77(ch,blasname)( \
                             ftype*    y, f77_int* incy  \
                           );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTCO_BLAS( hpmv )
 #endif
 

frame/compat/attic/bla_hpr.c

@@ -67,7 +67,7 @@ void PASTEF77(ch,blasname)( \
 	bli_check_error_code( BLIS_NOT_YET_IMPLEMENTED ); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCCO_BLAS( hpr, hpr )
 #endif
 

frame/compat/attic/bla_hpr.h

@@ -47,7 +47,7 @@ void PASTEF77(ch,blasname)( \
                             ftype*    a  \
                           );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTCO_BLAS( hpr )
 #endif
 

frame/compat/attic/bla_hpr2.c

@@ -71,7 +71,7 @@ void PASTEF77(ch,blasname)( \
 	bli_check_error_code( BLIS_NOT_YET_IMPLEMENTED ); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCCO_BLAS( hpr2, hpr2 )
 #endif
 

frame/compat/attic/bla_hpr2.h

@@ -48,7 +48,7 @@ void PASTEF77(ch,blasname)( \
                             ftype*    a  \
                           );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTCO_BLAS( hpr2 )
 #endif
 

frame/compat/attic/bla_rot.c

@@ -66,7 +66,7 @@ void PASTEF772(chxy,chr,blasname)( \
 	bli_check_error_code( BLIS_NOT_YET_IMPLEMENTED ); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCR2_BLAS( rot, ROT_KERNEL )
 #endif
 

frame/compat/attic/bla_rot.h

@@ -47,7 +47,7 @@ void PASTEF772(chxy,chr,blasname)( \
                                    ftype_r*  s  \
                                  );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTR2_BLAS( rot )
 #endif
 

frame/compat/attic/bla_rotg.c

@@ -51,7 +51,7 @@ void PASTEF77(chxy,blasname)( \
 	bli_check_error_code( BLIS_NOT_YET_IMPLEMENTED ); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCR_BLAS( rotg, rotg, ROTG_KERNEL )
 #endif
 

frame/compat/attic/bla_rotg.h

@@ -46,7 +46,7 @@ void PASTEF77(chxy,blasname)( \
                               ftype_r*   s  \
                             );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTR_BLAS( rotg, rotg )
 #endif
 

frame/compat/attic/bla_rotm.c

@@ -65,7 +65,7 @@ void PASTEF77(ch,blasname)( \
 	bli_check_error_code( BLIS_NOT_YET_IMPLEMENTED ); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCRO_BLAS( rotm, ROTM_KERNEL )
 #endif
 

frame/compat/attic/bla_rotm.h

@@ -46,7 +46,7 @@ void PASTEF77(ch,blasname)( \
                             ftype*   dparam  \
                           );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTRO_BLAS( rotm )
 #endif
 

frame/compat/attic/bla_rotmg.c

@@ -52,7 +52,7 @@ void PASTEF77(ch,blasname)( \
 	bli_check_error_code( BLIS_NOT_YET_IMPLEMENTED ); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCRO_BLAS( rotmg, ROTMG_KERNEL )
 #endif
 

frame/compat/attic/bla_rotmg.h

@@ -47,7 +47,7 @@ void PASTEF77(ch,blasname)( \
                             ftype*  dparam  \
                           );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTRO_BLAS( rotmg )
 #endif
 

frame/compat/attic/bla_sbmv.c

@@ -73,7 +73,7 @@ void PASTEF77(ch,blasname)( \
 	bli_check_error_code( BLIS_NOT_YET_IMPLEMENTED ); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCRO_BLAS( sbmv, sbmv )
 #endif
 

frame/compat/attic/bla_sbmv.h

@@ -50,7 +50,7 @@ void PASTEF77(ch,blasname)( \
                             ftype*    y, f77_int* incy  \
                           );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTRO_BLAS( sbmv )
 #endif
 

frame/compat/attic/bla_spmv.c

@@ -72,7 +72,7 @@ void PASTEF77(ch,blasname)( \
 	bli_check_error_code( BLIS_NOT_YET_IMPLEMENTED ); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCRO_BLAS( spmv, spmv )
 #endif
 

frame/compat/attic/bla_spmv.h

@@ -49,7 +49,7 @@ void PASTEF77(ch,blasname)( \
                             ftype*    y, f77_int* incy  \
                           );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTRO_BLAS( spmv )
 #endif
 

frame/compat/attic/bla_spr.c

@@ -67,7 +67,7 @@ void PASTEF77(ch,blasname)( \
 	bli_check_error_code( BLIS_NOT_YET_IMPLEMENTED ); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCRO_BLAS( spr, spr )
 #endif
 

frame/compat/attic/bla_spr.h

@@ -47,7 +47,7 @@ void PASTEF77(ch,blasname)( \
                             ftype*    a  \
                           );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTRO_BLAS( spr )
 #endif
 

frame/compat/attic/bla_spr2.c

@@ -71,7 +71,7 @@ void PASTEF77(ch,blasname)( \
 	bli_check_error_code( BLIS_NOT_YET_IMPLEMENTED ); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCRO_BLAS( spr2, spr2 )
 #endif
 

frame/compat/attic/bla_spr2.h

@@ -48,7 +48,7 @@ void PASTEF77(ch,blasname)( \
                             ftype*    a  \
                           );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTRO_BLAS( spr2 )
 #endif
 

frame/compat/attic/bla_tbmv.c

@@ -73,7 +73,7 @@ void PASTEF77(ch,blasname)( \
 	bli_check_error_code( BLIS_NOT_YET_IMPLEMENTED ); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNC_BLAS( tbmv, tbmv )
 #endif
 

frame/compat/attic/bla_tbmv.h

@@ -49,7 +49,7 @@ void PASTEF77(ch,blasname)( \
                             ftype*    x, f77_int* incx  \
                           );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROT_BLAS( tbmv )
 #endif
 

frame/compat/attic/bla_tbsv.c

@@ -73,7 +73,7 @@ void PASTEF77(ch,blasname)( \
 	bli_check_error_code( BLIS_NOT_YET_IMPLEMENTED ); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNC_BLAS( tbsv, tbsv )
 #endif
 

frame/compat/attic/bla_tbsv.h

@@ -49,7 +49,7 @@ void PASTEF77(ch,blasname)( \
                             ftype*    x, f77_int* incx  \
                           );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROT_BLAS( tbsv )
 #endif
 

frame/compat/attic/bla_tpmv.c

@@ -72,7 +72,7 @@ void PASTEF77(ch,blasname)( \
 	bli_check_error_code( BLIS_NOT_YET_IMPLEMENTED ); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNC_BLAS( tpmv, tpmv )
 #endif
 

frame/compat/attic/bla_tpmv.h

@@ -48,7 +48,7 @@ void PASTEF77(ch,blasname)( \
                             ftype*    x, f77_int* incx  \
                           );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROT_BLAS( tpmv )
 #endif
 

frame/compat/attic/bla_tpsv.c

@@ -72,7 +72,7 @@ void PASTEF77(ch,blasname)( \
 	bli_check_error_code( BLIS_NOT_YET_IMPLEMENTED ); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNC_BLAS( tpsv, tpsv )
 #endif
 

frame/compat/attic/bla_tpsv.h

@@ -48,7 +48,7 @@ void PASTEF77(ch,blasname)( \
                             ftype*    x, f77_int* incx  \
                           );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROT_BLAS( tpsv )
 #endif
 

frame/compat/bla_amax.c

@@ -89,7 +89,7 @@ f77_int PASTEF772(i,chx,blasname) \
 	return f77_index; \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNC_BLAS( amax, amaxv )
 #endif
 

frame/compat/bla_amax.h

@@ -45,7 +45,7 @@ f77_int PASTEF772(i,chx,blasname) \
        const ftype_x* x, const f77_int* incx  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROT_BLAS( amax )
 #endif
 

frame/compat/bla_asum.c

@@ -77,7 +77,7 @@ ftype_r PASTEF772(chr,chx,blasname) \
 	return asum; \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCR2_BLAS( asum, asumv )
 #endif
 

frame/compat/bla_asum.h

@@ -45,7 +45,7 @@ ftype_r PASTEF772(chr,chx,blasname) \
        const ftype_x* x, const f77_int* incx  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTR2_BLAS( asum )
 #endif
 

frame/compat/bla_axpy.c

@@ -81,7 +81,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNC_BLAS( axpy, axpyv )
 #endif
 

frame/compat/bla_axpy.h

@@ -47,7 +47,7 @@ void PASTEF77(ch,blasname) \
              ftype*   y, const f77_int* incy \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROT_BLAS( axpy )
 #endif
 

frame/compat/bla_copy.c

@@ -79,7 +79,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNC_BLAS( copy, copyv )
 #endif
 

frame/compat/bla_copy.h

@@ -46,7 +46,7 @@ void PASTEF77(ch,blasname) \
              ftype*   y, const f77_int* incy \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROT_BLAS( copy )
 #endif
 

frame/compat/bla_dot.c

@@ -84,7 +84,7 @@ ftype PASTEF772(ch,blasname,chc) \
 	return rho; \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCDOT_BLAS( dot, dotv )
 
 

frame/compat/bla_dot.h

@@ -46,7 +46,7 @@ ftype PASTEF772(ch,blasname,chc) \
        const ftype*   y, const f77_int* incy  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTDOT_BLAS( dot )
 
 

frame/compat/bla_gemm.c

@@ -117,7 +117,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNC_BLAS( gemm, gemm )
 #endif
 

frame/compat/bla_gemm.h

@@ -53,7 +53,7 @@ void PASTEF77(ch,blasname) \
              ftype*    c, const f77_int* ldc  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROT_BLAS( gemm )
 #endif
 

frame/compat/bla_gemv.c

@@ -135,7 +135,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNC_BLAS( gemv, gemv )
 #endif
 

frame/compat/bla_gemv.h

@@ -51,7 +51,7 @@ void PASTEF77(ch,blasname) \
              ftype*    y, const f77_int* incy  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROT_BLAS( gemv )
 #endif
 

frame/compat/bla_ger.c

@@ -105,7 +105,7 @@ void PASTEF772(ch,blasname,chc) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCDOT_BLAS( ger, ger )
 #endif
 

frame/compat/bla_ger.h

@@ -49,7 +49,7 @@ void PASTEF772(chxy,blasname,chc) \
              ftype*   a, const f77_int* lda  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTDOT_BLAS( ger )
 #endif
 

frame/compat/bla_hemm.c

@@ -115,7 +115,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCCO_BLAS( hemm, hemm )
 #endif
 

frame/compat/bla_hemm.h

@@ -52,7 +52,7 @@ void PASTEF77(ch,blasname) \
              ftype*    c, const f77_int* ldc  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTCO_BLAS( hemm )
 #endif
 

frame/compat/bla_hemv.c

@@ -109,7 +109,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCCO_BLAS( hemv, hemv )
 #endif
 

frame/compat/bla_hemv.h

@@ -50,7 +50,7 @@ void PASTEF77(ch,blasname) \
              ftype*    y, const f77_int* incy  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTCO_BLAS( hemv )
 #endif
 

frame/compat/bla_her.c

@@ -100,7 +100,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCCO_BLAS( her, her )
 #endif
 

frame/compat/bla_her.h

@@ -48,7 +48,7 @@ void PASTEF77(ch,blasname) \
              ftype*    a, const f77_int* lda  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTCO_BLAS( her )
 #endif
 

frame/compat/bla_her2.c

@@ -107,7 +107,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCCO_BLAS( her2, her2 )
 #endif
 

frame/compat/bla_her2.h

@@ -49,7 +49,7 @@ void PASTEF77(ch,blasname) \
              ftype*    a, const f77_int* lda  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTCO_BLAS( her2 )
 #endif
 

frame/compat/bla_her2k.c

@@ -131,7 +131,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCCO_BLAS( her2k, her2k )
 #endif
 

frame/compat/bla_her2k.h

@@ -52,7 +52,7 @@ void PASTEF77(ch,blasname) \
              ftype*    c, const f77_int* ldc  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTCO_BLAS( her2k )
 #endif
 

frame/compat/bla_herk.c

@@ -124,7 +124,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCCO_BLAS( herk, herk )
 #endif
 

frame/compat/bla_herk.h

@@ -51,7 +51,7 @@ void PASTEF77(ch,blasname) \
              ftype*    c, const f77_int* ldc  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTCO_BLAS( herk )
 #endif
 

frame/compat/bla_nrm2.c

@@ -77,7 +77,7 @@ ftype_r PASTEF772(chr,chx,blasname) \
 	return norm; \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCR2_BLAS( nrm2, normfv )
 #endif
 

frame/compat/bla_nrm2.h

@@ -45,7 +45,7 @@ ftype_r PASTEF772(chr,chx,blasname) \
        const ftype_x* x, const f77_int* incx  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTR2_BLAS( nrm2 )
 #endif
 

frame/compat/bla_scal.c

@@ -83,7 +83,7 @@ void PASTEF772(chx,cha,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCSCAL_BLAS( scal, scalv )
 #endif
 

frame/compat/bla_scal.h

@@ -46,7 +46,7 @@ void PASTEF772(chx,cha,blasname) \
        ftype_x* x, const f77_int* incx  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTSCAL_BLAS( scal )
 #endif
 

frame/compat/bla_swap.c

@@ -78,7 +78,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNC_BLAS( swap, swapv )
 #endif
 

frame/compat/bla_swap.h

@@ -46,7 +46,7 @@ void PASTEF77(ch,blasname) \
        ftype*   y, const f77_int* incy \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROT_BLAS( swap )
 #endif
 

frame/compat/bla_symm.c

@@ -115,7 +115,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNC_BLAS( symm, symm )
 #endif
 

frame/compat/bla_symm.h

@@ -52,7 +52,7 @@ void PASTEF77(ch,blasname) \
              ftype*    c, const f77_int* ldc  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROT_BLAS( symm )
 #endif
 

frame/compat/bla_symv.c

@@ -109,7 +109,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCRO_BLAS( symv, symv )
 #endif
 

frame/compat/bla_symv.h

@@ -50,7 +50,7 @@ void PASTEF77(ch,blasname) \
              ftype*    y, const f77_int* incy  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTRO_BLAS( symv )
 #endif
 

frame/compat/bla_syr.c

@@ -100,7 +100,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCRO_BLAS( syr, syr )
 #endif
 

frame/compat/bla_syr.h

@@ -48,7 +48,7 @@ void PASTEF77(ch,blasname) \
              ftype*    a, const f77_int* lda  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTRO_BLAS( syr )
 #endif
 

frame/compat/bla_syr2.c

@@ -108,7 +108,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNCRO_BLAS( syr2, syr2 )
 #endif
 

frame/compat/bla_syr2.h

@@ -49,7 +49,7 @@ void PASTEF77(ch,blasname) \
              ftype*    a, const f77_int* lda  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROTRO_BLAS( syr2 )
 #endif
 

frame/compat/bla_syr2k.c

@@ -123,7 +123,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNC_BLAS( syr2k, syr2k )
 #endif
 

frame/compat/bla_syr2k.h

@@ -52,7 +52,7 @@ void PASTEF77(ch,blasname) \
              ftype*    c, const f77_int* ldc  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROT_BLAS( syr2k )
 #endif
 

frame/compat/bla_syrk.c

@@ -116,7 +116,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNC_BLAS( syrk, syrk )
 #endif
 

frame/compat/bla_syrk.h

@@ -51,7 +51,7 @@ void PASTEF77(ch,blasname) \
              ftype*    c, const f77_int* ldc  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROT_BLAS( syrk )
 #endif
 

frame/compat/bla_trmm.c

@@ -115,7 +115,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNC_BLAS( trmm, trmm )
 #endif
 

frame/compat/bla_trmm.h

@@ -52,7 +52,7 @@ void PASTEF77(ch,blasname) \
              ftype*    b, const f77_int* ldb  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROT_BLAS( trmm )
 #endif
 

frame/compat/bla_trmv.c

@@ -112,7 +112,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNC_BLAS( trmv, trmv )
 #endif
 

frame/compat/bla_trmv.h

@@ -49,7 +49,7 @@ void PASTEF77(ch,blasname) \
              ftype*    x, const f77_int* incx  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROT_BLAS( trmv )
 #endif
 

frame/compat/bla_trsm.c

@@ -115,7 +115,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNC_BLAS( trsm, trsm )
 #endif
 

frame/compat/bla_trsm.h

@@ -52,7 +52,7 @@ void PASTEF77(ch,blasname) \
              ftype*    b, const f77_int* ldb  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROT_BLAS( trsm )
 #endif
 

frame/compat/bla_trsv.c

@@ -112,7 +112,7 @@ void PASTEF77(ch,blasname) \
 	bli_finalize_auto(); \
 }
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTFUNC_BLAS( trsv, trsv )
 #endif
 

frame/compat/bla_trsv.h

@@ -49,7 +49,7 @@ void PASTEF77(ch,blasname) \
              ftype*    x, const f77_int* incx  \
      );
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 INSERT_GENTPROT_BLAS( trsv )
 #endif
 

frame/compat/bli_blas.h

@@ -36,13 +36,13 @@
 
 // If the BLAS compatibility layer was not explicitly enabled, we must
 // enable it here.
-#ifndef BLIS_ENABLE_BLAS2BLIS
-#define BLIS_ENABLE_BLAS2BLIS
+#ifndef BLIS_ENABLE_BLAS
+#define BLIS_ENABLE_BLAS
 #endif
 
 #endif // BLIS_ENABLE_CBLAS
 
-#ifdef BLIS_ENABLE_BLAS2BLIS
+#ifdef BLIS_ENABLE_BLAS
 
 
 // -- System headers needed by BLAS compatibility layer --
@@ -174,4 +174,4 @@
 #include "bla_trsm_check.h"
 
 
-#endif // BLIS_ENABLE_BLAS2BLIS
+#endif // BLIS_ENABLE_BLAS