From 58bede146018acef8952abd360dac3d838c11348 Mon Sep 17 00:00:00 2001 From: "Field G. Van Zee" Date: Tue, 26 Mar 2019 19:10:59 -0500 Subject: [PATCH] Link to Eigen BLAS for non-gemm drivers in test/3. Details: - Adjusted test/3/Makefile so that the test drivers are linked against Eigen's BLAS library for hemm, herk, trmm, and trsm. We have to do this since Eigen's headers don't define implementations to the standard BLAS APIs. - Simplified #included headers in hemm, herk, trmm, and trsm source driver files, since nothing specific to Eigen is needed at compile-time for those operations. --- test/3/Makefile | 7 ++++--- test/3/test_hemm.c | 10 +--------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/test/3/Makefile b/test/3/Makefile index 0dad11053..7be45c5a5 100644 --- a/test/3/Makefile +++ b/test/3/Makefile @@ -358,6 +358,7 @@ get-bl-cpp = $(strip \ $(STR_VEN) $(BLA_DEF)))))) + # Rules for BLIS and BLAS libraries. define make-st-rule test_$(1)$(2)_$(PS_MAX)_$(3)_st.o: test_$(op).c Makefile @@ -443,13 +444,13 @@ test_%_$(P2_MAX)_openblas_2s.x: test_%_$(P2_MAX)_openblas_2s.o $(LIBBLIS_LINK) test_%_$(PS_MAX)_eigen_st.x: test_%_$(PS_MAX)_eigen_st.o $(LIBBLIS_LINK) - $(CXX) $(strip $< $(LIBBLIS_LINK) $(LDFLAGS) -o $@) + $(CXX) $(strip $< $(EIGEN_LIB) $(LIBBLIS_LINK) $(LDFLAGS) -o $@) test_%_$(P1_MAX)_eigen_1s.x: test_%_$(P1_MAX)_eigen_1s.o $(LIBBLIS_LINK) - $(CXX) $(strip $< $(LIBBLIS_LINK) $(LDFLAGS) -o $@) + $(CXX) $(strip $< $(EIGENP_LIB) $(LIBBLIS_LINK) $(LDFLAGS) -o $@) test_%_$(P2_MAX)_eigen_2s.x: test_%_$(P2_MAX)_eigen_2s.o $(LIBBLIS_LINK) - $(CXX) $(strip $< $(LIBBLIS_LINK) $(LDFLAGS) -o $@) + $(CXX) $(strip $< $(EIGENP_LIB) $(LIBBLIS_LINK) $(LDFLAGS) -o $@) test_%_$(PS_MAX)_vendor_st.x: test_%_$(PS_MAX)_vendor_st.o $(LIBBLIS_LINK) diff --git a/test/3/test_hemm.c b/test/3/test_hemm.c index 6d0b9e524..e69a1ec57 100644 --- a/test/3/test_hemm.c +++ b/test/3/test_hemm.c @@ -33,15 +33,7 @@ */ #include -#ifdef EIGEN - #define BLIS_DISABLE_BLAS_DEFS - #include "blis.h" - #include - #include - using namespace Eigen; -#else - #include "blis.h" -#endif +#include "blis.h" //#define PRINT