Commit 96b5fda5 authored by FELŠÖCI Marek's avatar FELŠÖCI Marek
Browse files

hacky/pastix-mkl: switch to parallel MKL, fix line length and add synopsis

parent 4d72a52d
...@@ -222,7 +222,8 @@ EXTRALIB := $(EXTRALIB) -L$(HWLOC_LIB) -lhwloc ...@@ -222,7 +222,8 @@ EXTRALIB := $(EXTRALIB) -L$(HWLOC_LIB) -lhwloc
# Uncomment following lines for marcel thread support # Uncomment following lines for marcel thread support
#VERSIONSMP := $(VERSIONSMP)_marcel #VERSIONSMP := $(VERSIONSMP)_marcel
#CCPASTIX := $(CCPASTIX) `pm2-config --cflags` -I${PM2_ROOT}/marcel/include/pthread #CCPASTIX := $(CCPASTIX) `pm2-config --cflags`
#CCPASTIX += -I${PM2_ROOT}/marcel/include/pthread
#EXTRALIB := $(EXTRALIB) `pm2-config --libs` #EXTRALIB := $(EXTRALIB) `pm2-config --libs`
# ---- Thread Posix ------ # ---- Thread Posix ------
EXTRALIB := $(EXTRALIB) -lpthread EXTRALIB := $(EXTRALIB) -lpthread
...@@ -244,10 +245,8 @@ EXTRALIB := $(EXTRALIB) -lpthread ...@@ -244,10 +245,8 @@ EXTRALIB := $(EXTRALIB) -lpthread
#---- Gotoblas ---- #---- Gotoblas ----
#BLASLIB = -L${BLAS_HOME} -lgoto #BLASLIB = -L${BLAS_HOME} -lgoto
#---- MKL ---- #---- MKL ----
#Uncomment the correct line
BLASLIB = -L${MKLROOT}/lib/intel64 -Wl,--no-as-needed -lmkl_intel_lp64 BLASLIB = -L${MKLROOT}/lib/intel64 -Wl,--no-as-needed -lmkl_intel_lp64
BLASLIB += -lmkl_sequential -lmkl_core -lpthread -lm -ldl BLASLIB += -lmkl_gnu_thread -lmkl_core -lgomp -lpthread -lm -ldl
#BLASLIB = -L$(BLAS_HOME) -lmkl_intel -lmkl_sequential -lmkl_core
#---- Acml ---- #---- Acml ----
#BLASLIB = -L$(BLAS_HOME) -lacml #BLASLIB = -L$(BLAS_HOME) -lacml
...@@ -282,4 +281,6 @@ FFLAGS = $(CCFOPT) ...@@ -282,4 +281,6 @@ FFLAGS = $(CCFOPT)
LDFLAGS = $(EXTRALIB) $(BLASLIB) LDFLAGS = $(EXTRALIB) $(BLASLIB)
CTAGS = $(CTAGSPROG) CTAGS = $(CTAGSPROG)
" "
))) #t)))))))) ))) #t))))))
(synopsis "Sparse matrix direct solver (using Intel® MKL instead of
OpenBLAS)")))
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment