Commit 9de516d3 authored by Mark Olesen's avatar Mark Olesen

CONFIG: incremental improvement for scotch + mingw

- linkage errors for ptscotch not yet solved

CONFIG: add -I. for ThirdParty wmake Make/options

- some <headers> might otherwise be missed with the change to
  '-iquote' for general wmake rules
parent 69de80cd
...@@ -8,6 +8,7 @@ EXE_INC = \ ...@@ -8,6 +8,7 @@ EXE_INC = \
${c++LESSWARN} \ ${c++LESSWARN} \
${COMP_OPENMP} \ ${COMP_OPENMP} \
-DNDEBUG -DMODE_NODESEP \ -DNDEBUG -DMODE_NODESEP \
-I. \
-I$(KAHIP_LIB_SRC) \ -I$(KAHIP_LIB_SRC) \
-I$(KAHIP_LIB_SRC)/partition \ -I$(KAHIP_LIB_SRC)/partition \
-I$(KAHIP_LIB_SRC)/partition/uncoarsening/refinement/quotient_graph_refinement/flow_refinement -I$(KAHIP_LIB_SRC)/partition/uncoarsening/refinement/quotient_graph_refinement/flow_refinement
......
/* NOTE: make any changes to this file in etc/makeFiles/ */ /* NOTE: make any changes to this file in etc/makeFiles/ */
EXE_INC = EXE_INC = -I.
LIB_LIBS = LIB_LIBS =
PROJECT_LIBS = PROJECT_LIBS =
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# - wmake -show-cflags : with -m32 / -m64 # - wmake -show-cflags : with -m32 / -m64
# - wmake -show-cflags-arch : with -m32 / -m64 # - wmake -show-cflags-arch : with -m32 / -m64
# #
# Pass these in via the enviroment since using '$(shell ...)' here does not # Pass these in via the environment since using '$(shell ...)' here does not
# always work well. # always work well.
# #
# Notes: # Notes:
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# - wmake -show-cflags : with -m32 / -m64 # - wmake -show-cflags : with -m32 / -m64
# - wmake -show-cflags-arch : with -m32 / -m64 # - wmake -show-cflags-arch : with -m32 / -m64
# #
# Pass these in via the enviroment since using '$(shell ...)' here does not # Pass these in via the environment since using '$(shell ...)' here does not
# always work well. # always work well.
# #
# Notes: # Notes:
...@@ -28,12 +28,17 @@ OBJ = .o ...@@ -28,12 +28,17 @@ OBJ = .o
CFLAGS_CROSS = -DCOMMON_WINDOWS -DCOMMON_STUB_FORK CFLAGS_CROSS = -DCOMMON_WINDOWS -DCOMMON_STUB_FORK
# Flags for including windows MPI information (MSMPI)
CFLAGS_WINMPI = -I$(MPI_ARCH_PATH)/include \
-DMSMPI_NO_SAL -DMSMPI_NO_DEPRECATE_20 \
-D_MPICH_DLL_
AR = x86_64-w64-mingw32-gcc AR = x86_64-w64-mingw32-gcc
ARFLAGS = $(CFLAGS) -shared -Wl,--output-def,libscotch.def,--out-implib,libscotch.a,--enable-auto-import,--strip-all -o ARFLAGS = $(CFLAGS) -shared -Wl,--output-def,libscotch.def,--out-implib,libscotch.a,--enable-auto-import,--strip-all -o
CC = x86_64-w64-mingw32-gcc $(CFLAGS_CROSS) CC = x86_64-w64-mingw32-gcc $(CFLAGS_CROSS)
CCS = x86_64-w64-mingw32-gcc CCS = x86_64-w64-mingw32-gcc $(CFLAGS_WINMPI)
CCP = x86_64-w64-mingw32-gcc CCP = x86_64-w64-mingw32-gcc $(CFLAGS_WINMPI)
CCD = gcc CCD = gcc $(CFLAGS_WINMPI)
CFLAGS = $(WM_CFLAGS) -fPIC -O3 \ CFLAGS = $(WM_CFLAGS) -fPIC -O3 \
-DCOMMON_PTHREAD_FILE \ -DCOMMON_PTHREAD_FILE \
-UCOMMON_FILE_COMPRESS \ -UCOMMON_FILE_COMPRESS \
...@@ -48,6 +53,10 @@ ifeq ($(WM_LABEL_SIZE),64) ...@@ -48,6 +53,10 @@ ifeq ($(WM_LABEL_SIZE),64)
CFLAGS += -DINTSIZE64 CFLAGS += -DINTSIZE64
endif endif
# Non-standard "__stdcall" in MSMPI <mpi.h>
CCDFLAGS = $(CFLAGS) -D__stdcall=''
CLIBFLAGS = -shared CLIBFLAGS = -shared
LDFLAGS = LDFLAGS =
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# - wmake -show-cflags : with -m32 / -m64 # - wmake -show-cflags : with -m32 / -m64
# - wmake -show-cflags-arch : with -m32 / -m64 # - wmake -show-cflags-arch : with -m32 / -m64
# #
# Pass these in via the enviroment since using '$(shell ...)' here does not # Pass these in via the environment since using '$(shell ...)' here does not
# always work well. # always work well.
# #
# Notes: # Notes:
......
...@@ -211,9 +211,9 @@ then ...@@ -211,9 +211,9 @@ then
includedir="$incDIR" \ includedir="$incDIR" \
install install
rmdir "$binDIR" 2>/dev/null || true # Remove empty bin/ rmdir "$binDIR" 2>/dev/null || true # Remove empty bin/
rmdir "${binDIR%/*}" 2>/dev/null || true # ... and empty parent rmdir "${binDIR%/*}" 2>/dev/null || true # ... and empty parent
make realclean 2>/dev/null || true # Failed cleanup is uncritical make realclean 2>/dev/null || true # Failed cleanup is uncritical
) || warnBuildIssues SCOTCH ) || warnBuildIssues SCOTCH
else else
warnNotFound SCOTCH warnNotFound SCOTCH
...@@ -222,11 +222,13 @@ fi ...@@ -222,11 +222,13 @@ fi
# Build ptscotch when MPI (ThirdParty or system) is available # Build ptscotch when MPI (ThirdParty or system) is available
[ "${withMPI}" = true ] || { if [ "${withMPI}" != true ]
then
# Report that the above tests failed and pass-through the failure # Report that the above tests failed and pass-through the failure
echo "Skipping pt-scotch (no mpi)" echo "Skipping pt-scotch (no mpi)"
exit 0 exit 0
} fi
# Build ptscotch if normal scotch was built (has include and library) # Build ptscotch if normal scotch was built (has include and library)
# (reuse prefix/include/lib dirs set above) # (reuse prefix/include/lib dirs set above)
...@@ -306,9 +308,9 @@ else ...@@ -306,9 +308,9 @@ else
includedir="$incDIR" \ includedir="$incDIR" \
install install
rmdir "$binDIR" 2>/dev/null || true # Remove empty bin/ rmdir "$binDIR" 2>/dev/null || true # Remove empty bin/
rmdir "${binDIR%/*}" 2>/dev/null || true # ... and empty parent rmdir "${binDIR%/*}" 2>/dev/null || true # ... and empty parent
make realclean 2>/dev/null || true # Failed cleanup is uncritical make realclean 2>/dev/null || true # Failed cleanup is uncritical
) || warnBuildIssues PTSCOTCH ) || warnBuildIssues PTSCOTCH
fi fi
......
Markdown is supported
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