Skip to content
Snippets Groups Projects
Commit 4a1bf74b authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Add USE_OPENMP compile option

parent 7b796792
Branches
Tags
No related merge requests found
...@@ -10,8 +10,10 @@ endif ...@@ -10,8 +10,10 @@ endif
ifndef LIBNPTM ifndef LIBNPTM
ifdef STATIC_NPTM ifdef STATIC_NPTM
override LIBNPTM=$(BUILDDIR_NPTM)/libnptm.a override LIBNPTM=$(BUILDDIR_NPTM)/libnptm.a
override STATICFLAG="-lsz -lz -laec -static"
else else
override LIBNPTM=$(BUILDDIR_NPTM)/libnptm.so override LIBNPTM=$(BUILDDIR_NPTM)/libnptm.so
override STATICFLAG=""
endif endif
endif endif
DOCSDIR=$(SRCDIR)/../doc DOCSDIR=$(SRCDIR)/../doc
...@@ -30,7 +32,7 @@ $(LIBNPTM): ...@@ -30,7 +32,7 @@ $(LIBNPTM):
BUILDDIR=$(BUILDDIR) BUILDDIR_NPTM=$(BUILDDIR_NPTM) LIBNPTM=$(LIBNPTM) $(MAKE) -C libnptm $@ BUILDDIR=$(BUILDDIR) BUILDDIR_NPTM=$(BUILDDIR_NPTM) LIBNPTM=$(LIBNPTM) $(MAKE) -C libnptm $@
$(SUBDIRS): $(BUILDDIR) $(LIBNPTM) $(SUBDIRS): $(BUILDDIR) $(LIBNPTM)
BUILDDIR=$(BUILDDIR) BUILDDIR_NPTM=$(BUILDDIR_NPTM) LIBNPTM=$(LIBNPTM) $(MAKE) -C $@ BUILDDIR=$(BUILDDIR) BUILDDIR_NPTM=$(BUILDDIR_NPTM) LIBNPTM=$(LIBNPTM) STATICFLAG=$(STATICFLAG) $(MAKE) -C $@
clean: $(BUILDDIR) clean: $(BUILDDIR)
BUILDDIR=$(BUILDDIR) $(MAKE) -C cluster clean BUILDDIR=$(BUILDDIR) $(MAKE) -C cluster clean
......
...@@ -379,7 +379,7 @@ void tqr( ...@@ -379,7 +379,7 @@ void tqr(
/*! \brief Calculate the single-centered inversion of the M-matrix. /*! \brief Calculate the single-centered inversion of the M-matrix.
* *
* This function computes the single-centered inverrted M-matrix appearing in Eq. (5.28) * This function computes the single-centered inverted M-matrix appearing in Eq. (5.28)
* of Borghese, Denti & Saija (2007). * of Borghese, Denti & Saija (2007).
* *
* \param am: `complex double **` * \param am: `complex double **`
......
...@@ -79,6 +79,9 @@ override CXXFLAGS+= -DUSE_LAPACK -DLAPACK_ILP64 ...@@ -79,6 +79,9 @@ override CXXFLAGS+= -DUSE_LAPACK -DLAPACK_ILP64
ifdef USE_MKL ifdef USE_MKL
override CXXFLAGS+= -DMKL_ILP64 -DUSE_MKL -I$(MKLROOT)/include override CXXFLAGS+= -DMKL_ILP64 -DUSE_MKL -I$(MKLROOT)/include
endif endif
ifdef USE_OPENMP
override CXXFLAGS+= -fopenmp
endif
endif endif
endif endif
...@@ -88,9 +91,12 @@ ifndef CXXLDFLAGS ...@@ -88,9 +91,12 @@ ifndef CXXLDFLAGS
ifndef HDF5_LIB ifndef HDF5_LIB
override HDF5_LIB=/usr/lib/x86_64-linux-gnu/hdf5/serial override HDF5_LIB=/usr/lib/x86_64-linux-gnu/hdf5/serial
endif endif
override CXXLDFLAGS=-L/usr/lib64 -L$(HDF5_LIB) -lhdf5 override CXXLDFLAGS=-L/usr/lib64 -L$(HDF5_LIB) -lhdf5 $(STATICFLAG)
ifdef USE_LAPACK ifdef USE_LAPACK
override CXXLDFLAGS+= $(LAPACK_LDFLAGS) override CXXLDFLAGS+= $(LAPACK_LDFLAGS)
ifdef USE_OPENMP
override CXXLDFLAGS+= -lopenblas64
endif
endif endif
override CXXLDFLAGS+= $(LDFLAGS) override CXXLDFLAGS+= $(LDFLAGS)
endif endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment