Commit ec4c153f authored by vijaysm's avatar vijaysm
Browse files

Configuration fixes for BG/Q.

* Tested on Vesta and make check passes (without actually running the tests) passes cleanly.

  Configuration Command:
    ./configure --enable-static --disable-shared --with-zlib=/soft/libraries/alcf/current/xl/ZLIB \
                --with-mpi --download-hdf5 --download-netcdf --download-metis
parent f9eae7cc
......@@ -183,8 +183,8 @@ EXTRA_INTEL_FCFLAGS="-C"
EXTRA_PGI_CXXFLAGS="-traceback -Mfree -C"
EXTRA_PGI_FCFLAGS="-traceback -Mfree -C -freeform -extend-source"
# XLC
EXTRA_BG_CXXFLAGS="-qarch=auto -qtune=auto -qpic=large -qdebug=except -qrtti=dyna"
EXTRA_BG_FCFLAGS="-qarch=auto -qtune=auto -qpic=large -qdebug=except"
EXTRA_BG_CXXFLAGS="-qarch=qp -qpic=large -qdebug=except"
EXTRA_BG_FCFLAGS="-qarch=qp -qpic=large -qdebug=except"
fi
if (test "x$enable_cxx_optimize" != "xno"); then # optimization flags
......@@ -198,8 +198,8 @@ EXTRA_INTEL_FCFLAGS="$EXTRA_INTEL_FCFLAGS -xHost -ip -no-prec-div" # -fast
EXTRA_PGI_CXXFLAGS="$EXTRA_PGI_CXXFLAGS -Munroll=5 -Mnoframe"
EXTRA_PGI_FCFLAGS="$EXTRA_PGI_FCFLAGS -Munroll=5 -Mnoframe -freeform -extend-source"
# XLC
EXTRA_BG_CXXFLAGS="$EXTRA_BG_CXXFLAGS -qarch=auto -qtune=auto -qpic=large -qipa=1 -qenablevmx -qrtti=dyna"
EXTRA_BG_FCFLAGS="$EXTRA_BG_FCFLAGS -qarch=auto -qtune=auto -qpic=large -qipa=1 -qenablevmx"
EXTRA_BG_CXXFLAGS="$EXTRA_BG_CXXFLAGS -qarch=qp -qtune=auto -qpic=large -qenablevmx"
EXTRA_BG_FCFLAGS="$EXTRA_BG_FCFLAGS -qarch=qp -qtune=auto -qpic=large -qenablevmx"
fi
if (test "x$GXX" = "xyes"); then # G++ specific flags
......@@ -344,8 +344,7 @@ AC_MSG_RESULT([$MB_BLUEGENE_CONF])
# Special overrides flags for BG/Q
if (test "x$enable_static" != "xno" && test "x$MB_BLUEGENE_CONF" != "xno"); then
LDFLAGS="$LDFLAGS -qnostaticlink -qnostaticlink=libgcc"
AC_MSG_ERROR([I am not supposed to be in BG/Q check])
LDFLAGS="$LDFLAGS -qnostaticlink=libgcc"
fi
# Check if we are using new Darwin kernels with Clang -- needs libc++ instead of libstdc++
......@@ -692,14 +691,14 @@ case "$cxx_compiler:$host_cpu" in
VisualAge:*)
FATHOM_CXX_32BIT=-q32
FATHOM_CXX_64BIT=-q64
FATHOM_CXX_SPECIAL="$EXTRA_BG_CXXFLAGS -qminimaltoc -qpic=large -qmaxmem=-1 -qlanglvl=variadictemplates"
FATHOM_CXX_SPECIAL="$EXTRA_BG_CXXFLAGS -qminimaltoc -qmaxmem=-1 -qlanglvl=variadictemplates"
AR="ar"
NM="nm -B -X 32_64"
;;
VisualAge8:*)
FATHOM_CXX_32BIT=-q32
FATHOM_CXX_64BIT=-q64
FATHOM_CXX_SPECIAL="$EXTRA_BG_CXXFLAGS -qminimaltoc -qpic=large -qmaxmem=-1 -qlanglvl=variadictemplates"
FATHOM_CXX_SPECIAL="$EXTRA_BG_CXXFLAGS -qminimaltoc -qmaxmem=-1 -qlanglvl=variadictemplates"
NM="nm -B -X 32_64"
;;
MIPSpro:mips)
......
......@@ -36,10 +36,6 @@ fi
#######################################################################################
AC_DEFUN([FATHOM_CHECK_HDF5],[
# Supported HDF5 versions: 1.8.10, 1.8.12, 1.8.14, 1.8.15
# Arguments: 1) Default Version Number, 2) Download by default ?
AUSCM_CONFIGURE_DOWNLOAD_HDF5([1.8.12],[no])
# CLI option for linking zlib
AC_ARG_WITH(zlib,
[AS_HELP_STRING([--with-zlib=DIR],[HDF5 requires zlib, and zlib can be found at...])],
......@@ -114,38 +110,42 @@ AC_MSG_CHECKING([if HDF5 support is enabled])
AC_ARG_WITH(hdf5,
[AS_HELP_STRING([--with-hdf5@<:@=DIR@:>@], [Specify HDF5 library to use for native file format])
AS_HELP_STRING([--without-hdf5], [Disable support for native HDF5 file format])],
[HDF5_ARG=$withval
[HDF5_DIR=$withval
DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --with-hdf5=\"${withval}\""
], [HDF5_ARG=$HDF5_DIR])
if test "x" = "x$HDF5_ARG"; then
], [HDF5_DIR=$HDF5_DIR])
if test "x" = "x$HDF5_DIR"; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes])
fi
# Supported HDF5 versions: 1.8.10, 1.8.12, 1.8.14, 1.8.15
# Arguments: 1) Default Version Number, 2) Download by default ?
AUSCM_CONFIGURE_DOWNLOAD_HDF5([1.8.12],[no])
HAVE_HDF5=no
if (test "x" != "x$HDF5_ARG" || test "xno" != "x$HDF5_ARG"); then
if (test "x" != "x$HDF5_DIR" || test "xno" != "x$HDF5_DIR"); then
HAVE_HDF5=yes
# if a path is specified, update LIBS and INCLUDES accordingly
if test "xyes" != "x$HDF5_ARG" && test "x" != "x$HDF5_ARG"; then
if test -d "${HDF5_ARG}/dll"; then
HDF5_LDFLAGS="$HDF5_LDFLAGS -L${HDF5_ARG}/dll"
if test "xyes" != "x$HDF5_DIR" && test "x" != "x$HDF5_DIR"; then
if test -d "${HDF5_DIR}/dll"; then
HDF5_LDFLAGS="$HDF5_LDFLAGS -L${HDF5_DIR}/dll"
HDF5_LIBNAME=hdf5dll
elif test -d "${HDF5_ARG}/lib"; then
HDF5_LDFLAGS="$HDF5_LDFLAGS -L${HDF5_ARG}/lib"
elif test -d "${HDF5_ARG}"; then
HDF5_LDFLAGS="$HDF5_LDFLAGS -L${HDF5_ARG}"
elif test -d "${HDF5_DIR}/lib"; then
HDF5_LDFLAGS="$HDF5_LDFLAGS -L${HDF5_DIR}/lib"
elif test -d "${HDF5_DIR}"; then
HDF5_LDFLAGS="$HDF5_LDFLAGS -L${HDF5_DIR}"
else
AC_MSG_ERROR("$HDF5_ARG is not a directory.")
AC_MSG_ERROR("$HDF5_DIR is not a directory.")
fi
if test -d "${HDF5_ARG}/include"; then
HDF5_CPPFLAGS="$HDF5_CPPFLAGS -I${HDF5_ARG}/include"
if test -d "${HDF5_DIR}/include"; then
HDF5_CPPFLAGS="$HDF5_CPPFLAGS -I${HDF5_DIR}/include"
if test "x$GXX" = "xyes" && test "x$GCC" = "xyes"; then
HDF5_CPPFLAGS="$HDF5_CPPFLAGS -isystem ${HDF5_ARG}/include"
HDF5_CPPFLAGS="$HDF5_CPPFLAGS -isystem ${HDF5_DIR}/include"
fi
else
HDF5_CPPFLAGS="$HDF5_CPPFLAGS -I${HDF5_ARG}"
HDF5_CPPFLAGS="$HDF5_CPPFLAGS -I${HDF5_DIR}"
fi
fi
......@@ -173,7 +173,7 @@ if (test "x" != "x$HDF5_ARG" || test "xno" != "x$HDF5_ARG"); then
fi
if test "x$HAVE_HDF5" = "xno"; then
if test "x" = "x$HDF5_ARG"; then
if test "x" = "x$HDF5_DIR"; then
AC_MSG_WARN([HDF5 library not found or not usable.])
else
AC_MSG_ERROR([HDF5 library not found or not usable.])
......
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