Skip to content

Commit

Permalink
link openblas in makefile
Browse files Browse the repository at this point in the history
so it's used in both build and test
  • Loading branch information
minrk committed Sep 7, 2024
1 parent 7c46b04 commit ff5be2a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 13 deletions.
11 changes: 9 additions & 2 deletions recipe/Makefile.conda.PAR
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ RANLIB = ranlib

# DEFINE HERE YOUR LAPACK LIBRARY

LAPACK ?= -L$(PREFIX)/lib -llapack -lblas
LAPACK = -L$(PREFIX)/lib -llapack -lblas

# SCALAP should define the SCALAPACK and BLACS libraries.
SCALAP = -L$(PREFIX)/lib -lscalapack
Expand All @@ -141,7 +141,7 @@ LIBSEQ = $(LAPACK) -L$(topdir)/libseq -lmpiseq$(PLAT)

# DEFINE HERE YOUR BLAS LIBRARY

LIBBLAS ?= -L$(PREFIX)/lib -lblas
LIBBLAS = -L$(PREFIX)/lib -lblas

# DEFINE HERE YOUR PTHREAD LIBRARY
LIBOTHERS = -lpthread
Expand All @@ -165,6 +165,13 @@ OPTF = $(OMP_OPT) $(FFLAGS) -DALLOW_NON_INIT
OPTC = $(OMP_OPT) $(CFLAGS)
OPTL = $(OMP_OPT) $(LDFLAGS)

# (conda) enable GEMMT if using openblas
ifeq ($(blas_impl),openblas)
OPTF := $(OPTF) -DGEMMT_AVAILABLE
LAPACK = -L$(PREFIX)/lib -lopenblas
LIBBLAS = -L$(PREFIX)/lib -lopenblas
endif

# CHOOSE BETWEEN USING THE SEQUENTIAL OR THE PARALLEL VERSION.

#Sequential:
Expand Down
11 changes: 0 additions & 11 deletions recipe/build-mumps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,6 @@ else
export PLAT=""
fi

if [[ "${blas_impl}" != "netlib" ]]; then
echo "Enabling DGEMMT"
export FFLAGS="${FFLAGS} -DGEMMT_AVAILABLE"
if [[ "${blas_impl}" == "openblas" ]]; then
export LIBBLAS="-L$PREFIX/lib -lopenblas"
export LAPACK="-L$PREFIX/lib -lopenblas"
else
echo "unexpected blas_impl=${blas_impl}"
exit 1
fi
fi
cp -v $MAKEFILE_INC ./Makefile.inc


Expand Down

0 comments on commit ff5be2a

Please sign in to comment.