Skip to content

FDS Build: Remove commented lines #14561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cxp484 merged 1 commit into from
Apr 24, 2025
Merged

FDS Build: Remove commented lines #14561

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Build/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ FFLAGSMKL =
LFLAGSMKL_INTEL =
LFLAGSMKL_INTEL_OPENMP =
LFLAGSMKL_GNU_OPENMP =
LFLAGSMKL_OMPI_INTEL_LINUX =
LFLAGSMKL_CUSTOM =
LFLAGSMKL_CUSTOM_OPENMP =

Expand All @@ -80,18 +81,16 @@ $(info MKLLIBDIR = $(MKLLIBDIR))

ifeq ($(shell echo "check_quotes"),"check_quotes")
# windows
#MKLLIBDIR = $(MKLROOT)\lib
FFLAGSMKL = -DWITH_MKL /I"$(MKLROOT)\include"
COMMON_MKL_LIBS = "$(MKLLIBDIR)\mkl_intel_lp64.lib" "$(MKLLIBDIR)\mkl_core.lib" "$(MKLLIBDIR)\mkl_blacs_intelmpi_lp64.lib"
LFLAGSMKL_INTEL = $(COMMON_MKL_LIBS) "$(MKLLIBDIR)\mkl_sequential.lib"
LFLAGSMKL_INTEL_OPENMP = $(COMMON_MKL_LIBS) "$(MKLLIBDIR)\mkl_intel_thread.lib"
else
# linux
#MKLLIBDIR = $(MKLROOT)/lib
FFLAGSMKL = -DWITH_MKL -I$(MKLROOT)/include
COMMON_MKL_LIBS = ${MKLLIBDIR}/libmkl_intel_lp64.a ${MKLLIBDIR}/libmkl_core.a -lpthread -lm -ldl

# impi_intel_linux targets
COMMON_MKL_LIBS = ${MKLLIBDIR}/libmkl_intel_lp64.a ${MKLLIBDIR}/libmkl_core.a -lpthread -lm -ldl
COMMON_MKL_INTEL_LIBS = ${COMMON_MKL_LIBS} ${MKLLIBDIR}/libmkl_blacs_intelmpi_lp64.a
LFLAGSMKL_INTEL = -Wl,--start-group ${COMMON_MKL_INTEL_LIBS} ${MKLLIBDIR}/libmkl_sequential.a -Wl,--end-group
LFLAGSMKL_INTEL_OPENMP = -Wl,--start-group ${COMMON_MKL_INTEL_LIBS} ${MKLLIBDIR}/libmkl_intel_thread.a -liomp5 -Wl,--end-group
Expand Down
Loading