Skip to content
Snippets Groups Projects
Commit 37e1da82 authored by Mark OLESEN's avatar Mark OLESEN
Browse files

CONFIG: add ARM64 nvidia rules

CONFIG: revise Pstream/OpenFOAM linkage (nvidia)

- double-pass linkage seems to be unnecessary
parent 8081fc72
No related merge requests found
......@@ -30,7 +30,7 @@ OpenFOAM/Alltouch -check 2>/dev/null
OSspecific/"${WM_OSTYPE:-POSIX}"/Allwmake $targetType $*
case "$WM_COMPILER" in
(Mingw* | Nvidia*)
(Mingw*)
# Pstream/OpenFOAM cyclic dependency
# 1st pass: link as Pstream as single .o object
WM_MPLIB=dummy Pstream/Allwmake libo
......
#------------------------------------------------------------------------------
include $(GENERAL_RULES)/Nvidia/c
cARCH =
# Compile option is non-mandatory, but must be non-empty
sinclude $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(cARCH) $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
include $(GENERAL_RULES)/Nvidia/link-c
#------------------------------------------------------------------------------
#------------------------------------------------------------------------------
include $(GENERAL_RULES)/Nvidia/c++
c++ARCH =
include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
c++FLAGS = $(c++ARCH) $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@
cctoo = $(Ctoo)
cpptoo = $(Ctoo)
cxxtoo = $(Ctoo)
include $(GENERAL_RULES)/Nvidia/link-c++
#------------------------------------------------------------------------------
c++DBUG = -g -DFULLDEBUG
c++OPT = -O0
c++DBUG =
c++OPT = -O3
c++DBUG = -pg
c++OPT = -O2
cDBUG = -g -DFULLDEBUG
cOPT = -O0
cDBUG =
cOPT = -O3
cDBUG = -pg
cOPT = -O2
CPP = cpp -traditional-cpp $(GFLAGS)
include $(GENERAL_RULES)/standard
## include $(GENERAL_RULES)/Pgi/openmp
ifneq (,$(findstring ~openmp,$(WM_COMPILE_CONTROL)))
include $(GENERAL_RULES)/no-openmp
endif
include $(DEFAULT_RULES)/c
include $(DEFAULT_RULES)/c++
# -----------------------------------------------------------------------------
PFLAGS = -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX
PINC = -I$(MPI_ARCH_PATH)/include
PLIBS = -L$(MPI_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) -L$(MPI_ARCH_PATH)/lib -lmpi
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