cgma-dev

Download

[email protected]

November 2009

5 participants
22 discussions

r3264 - in cgm/trunk: . m4
by kraftche＠cae.wisc.edu 02 Nov '09

02 Nov '09

Author: kraftche Date: 2009-11-02 16:23:19 -0600 (Mon, 02 Nov 2009) New Revision: 3264 Modified: cgm/trunk/configure.ac cgm/trunk/m4/acis.m4 cgm/trunk/m4/boost.m4 cgm/trunk/m4/compiler.m4 cgm/trunk/m4/cplusplus.m4 cgm/trunk/m4/hdf5.m4 cgm/trunk/m4/makevar.m4 cgm/trunk/m4/netcdf.m4 Log: s/SNL_/FATHOM_/ in autoconf macros Modified: cgm/trunk/configure.ac =================================================================== --- cgm/trunk/configure.ac 2009-11-02 22:18:42 UTC (rev 3263) +++ cgm/trunk/configure.ac 2009-11-02 22:23:19 UTC (rev 3264) @@ -9,13 +9,13 @@ AC_DISABLE_SHARED EXTRA_GNU_FLAGS="-Wall -pipe -pedantic" -SNL_CHECK_COMPILERS +FATHOM_CHECK_COMPILERS AC_PROG_LIBTOOL LIBS="-lm" AC_PROG_SED AC_C_BIGENDIAN( [LITTLE_ENDIAN=], [LITTLE_ENDIAN=-DLITTLE_ENDIAN=BYTE_ORDER] ) AC_SUBST(LITTLE_ENDIAN) -SNL_COMPILER_FLAGS +FATHOM_COMPILER_FLAGS ################################################################################ # Fortran Stuff for ITAPS C bindings @@ -65,8 +65,8 @@ # CGM-specific Checks ################################################################################ -SNL_CANT_USE_STD -SNL_TEMPLATE_DEFS_INCLUDED +FATHOM_CANT_USE_STD +FATHOM_TEMPLATE_DEFS_INCLUDED AC_SUBST(CANT_USE_STD) AC_SUBST(CANT_USE_STD_IO) AC_SUBST(TEMPLATE_DEFS_INCLUDED) @@ -209,9 +209,9 @@ [AC_MSG_ERROR([ACIS source not present. Checkout ACIS_SRC and move to ACIS])] ) if test "$ACIS_DIR" == "yes"; then ACIS_DIR=.; fi - SNL_ACIS_ENV + FATHOM_ACIS_ENV - SNL_ACIS_TRANSLATOR + FATHOM_ACIS_TRANSLATOR if test x$ACIS_STEP_TRANSLATOR != x; then ACIS_LIBS="$ACIS_LIBS $ACIS_STEP_LIBS" ACIS_XLIBS="$ACIS_XLATE_LIBS" Modified: cgm/trunk/m4/acis.m4 =================================================================== --- cgm/trunk/m4/acis.m4 2009-11-02 22:18:42 UTC (rev 3263) +++ cgm/trunk/m4/acis.m4 2009-11-02 22:23:19 UTC (rev 3264) @@ -11,7 +11,7 @@ # If ACIS_VERSION is set, the corresponding test # will be skipped. ####################################################################################### -AC_DEFUN([SNL_ACIS_ENV], [ +AC_DEFUN([FATHOM_ACIS_ENV], [ AC_CHECK_FILE([$ACIS_DIR/include/acis.hxx], [], [AC_MSG_ERROR("Invalid ACIS path")]) @@ -32,13 +32,13 @@ *_debug) ;; *) - SNL_ACIS_LIBDIR( [$dir] ) + FATHOM_ACIS_LIBDIR( [$dir] ) ;; esac # next try debug libraries case "$dir" in *_debug) - SNL_ACIS_LIBDIR( [$dir] ) + FATHOM_ACIS_LIBDIR( [$dir] ) ;; esac done @@ -104,8 +104,8 @@ ####################################################################################### # Macro to check for ACIS translators. ####################################################################################### -AC_DEFUN([SNL_ACIS_TRANSLATOR], [ -AC_REQUIRE([SNL_ACIS_ENV]) +AC_DEFUN([FATHOM_ACIS_TRANSLATOR], [ +AC_REQUIRE([FATHOM_ACIS_ENV]) case "$ACIS_VERSION" in 11??) ACIS_XLATE_LIBS='-lxacis2k -lxcore2k -lxutil' @@ -143,7 +143,7 @@ # If ACIS_VERSION is alreay set, it will NOT be modified by # this function. ####################################################################################### -AC_DEFUN([SNL_ACIS_LIBDIR], [ +AC_DEFUN([FATHOM_ACIS_LIBDIR], [ AC_REQUIRE([AC_PROG_LIBTOOL]) AC_LANG_PUSH([C++]) snl_acis_libdir=$1 @@ -185,4 +185,4 @@ fi ], [snl_acis_link_success=no]) AC_LANG_POP -]) # SNL_ACIS_LIBDIR +]) # FATHOM_ACIS_LIBDIR Modified: cgm/trunk/m4/boost.m4 =================================================================== --- cgm/trunk/m4/boost.m4 2009-11-02 22:18:42 UTC (rev 3263) +++ cgm/trunk/m4/boost.m4 2009-11-02 22:23:19 UTC (rev 3264) @@ -4,9 +4,9 @@ # Unless user specified --without-boost, will check for any passed headers. # For any found headers, -DHAVE_[header] will be added to DEFINES ####################################################################################### -AC_DEFUN([SNL_CHECK_BOOST],[ +AC_DEFUN([FATHOM_CHECK_BOOST],[ AC_MSG_CHECKING([if boost library is enabled]) -SNL_BOOST_OPT_HEADER_LIST="$1" +FATHOM_BOOST_OPT_HEADER_LIST="$1" AC_ARG_WITH(boost, [AC_HELP_STRING([--with-boost=DIR], [Specify directory where boost is installed]) AC_HELP_STRING([--without-boost], [Disable support for boost libraries])], @@ -27,4 +27,4 @@ AC_CHECK_HEADERS( [$SNL_BOOST_OPT_HEADER_LIST],[def=`echo "$ac_header" | $as_tr_cpp`; DEFINES="$DEFINES -DHAVE_$def"] ) AC_LANG_RESTORE fi -]) # SNL_CHECK_BOOST +]) # FATHOM_CHECK_BOOST Modified: cgm/trunk/m4/compiler.m4 =================================================================== --- cgm/trunk/m4/compiler.m4 2009-11-02 22:18:42 UTC (rev 3263) +++ cgm/trunk/m4/compiler.m4 2009-11-02 22:23:19 UTC (rev 3264) @@ -30,7 +30,7 @@ # - test for C++ compiler # - test for Fortran compiler ####################################################################################### -AC_DEFUN([SNL_CHECK_COMPILERS], [ +AC_DEFUN([FATHOM_CHECK_COMPILERS], [ CHECK_CC="$1" CHECK_CXX="$2" @@ -123,7 +123,7 @@ AC_PROG_F77( [$F77_LIST] ) fi -]) # SNL_CHECK_COMPILERS +]) # FATHOM_CHECK_COMPILERS @@ -134,14 +134,14 @@ # CXXFLAGS - C++ compiler flags # ####################################################################################### -AC_DEFUN([SNL_COMPILER_FLAGS], [ +AC_DEFUN([FATHOM_COMPILER_FLAGS], [ if test "xno" != "x$CHECK_CC"; then - SNL_CC_FLAGS + FATHOM_CC_FLAGS fi if test "xno" != "x$CHECK_CXX"; then - SNL_CXX_FLAGS + FATHOM_CXX_FLAGS fi @@ -206,7 +206,7 @@ fi # Check for 32/64 bit. - # This requires SNL_CXX_FLAGS and SNL_CC_FLAGS to have been called first + # This requires FATHOM_CXX_FLAGS and FATHOM_CC_FLAGS to have been called first AC_ARG_ENABLE( 32bit, AC_HELP_STRING([--enable-32bit],[Force 32-bit objects]), [ if test "xyes" != "x$enableval"; then @@ -220,7 +220,7 @@ CFLAGS="$CFLAGS $SNL_CC_32BIT" enable_32bit=yes ]) -# This requires SNL_CXX_FLAGS and SNL_CC_FLAGS to have been called first +# This requires FATHOM_CXX_FLAGS and FATHOM_CC_FLAGS to have been called first AC_ARG_ENABLE( 64bit, AC_HELP_STRING([--enable-64bit],[Force 64-bit objects]), [ if test "xyes" != "x$enableval"; then @@ -236,7 +236,7 @@ CFLAGS="$CFLAGS $SNL_CC_64BIT" ]) -]) # SNL_COMPILER_FLAGS +]) # FATHOM_COMPILER_FLAGS ####################################################################################### # ******************************************************************************* @@ -251,7 +251,7 @@ # - action upon success # - action upon failure ################################################################################# -AC_DEFUN([SNL_TRY_COMPILER_DEFINE], [ +AC_DEFUN([FATHOM_TRY_COMPILER_DEFINE], [ AC_COMPILE_IFELSE([ AC_LANG_PROGRAM( [[#ifndef $1 choke me @@ -263,11 +263,11 @@ ####################################################################################### # Check for compiler-specific flags. # Sets the following environmental variables: -# SNL_CXX_SPECIAL : Any compiler-specific flags which must be specified -# SNL_CXX_32BIT : Flag to force compilation of 32-bit code -# SNL_CXX_64BIT : Flag to force compilation of 64-bit code +# FATHOM_CXX_SPECIAL : Any compiler-specific flags which must be specified +# FATHOM_CXX_32BIT : Flag to force compilation of 32-bit code +# FATHOM_CXX_64BIT : Flag to force compilation of 64-bit code ####################################################################################### -AC_DEFUN([SNL_CXX_FLAGS], [ +AC_DEFUN([FATHOM_CXX_FLAGS], [ AC_LANG_PUSH([C++]) # Detect compiler @@ -276,41 +276,41 @@ if test x$GXX = xyes; then cxx_compiler=GNU # Intel claims to be GCC, check for it here - SNL_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cxx_compiler=Intel]) + FATHOM_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cxx_compiler=Intel]) # Search for other compiler types # For efficiency, limit checks to relevant OSs else cxx_compiler=unknown case "$target_os" in aix*) - SNL_TRY_COMPILER_DEFINE([__IBMCPP__],[cxx_compiler=VisualAge]) + FATHOM_TRY_COMPILER_DEFINE([__IBMCPP__],[cxx_compiler=VisualAge]) ;; solaris*|sunos*) - SNL_TRY_COMPILER_DEFINE([__SUNPRO_CC],[cxx_compiler=SunWorkshop]) + FATHOM_TRY_COMPILER_DEFINE([__SUNPRO_CC],[cxx_compiler=SunWorkshop]) ;; irix*) - SNL_TRY_COMPILER_DEFINE([__sgi],[cxx_compiler=MIPSpro]) + FATHOM_TRY_COMPILER_DEFINE([__sgi],[cxx_compiler=MIPSpro]) ;; linux*) - SNL_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cxx_compiler=Intel]) - SNL_TRY_COMPILER_DEFINE([__IBMCPP__],[cxx_compiler=VisualAge]) - SNL_TRY_COMPILER_DEFINE([__DECCXX_VER],[cxx_compiler=Compaq]) - SNL_TRY_COMPILER_DEFINE([__SUNPRO_CC],[cxx_compiler=SunWorkshop]) - SNL_TRY_COMPILER_DEFINE([__PGI],[cxx_cmopiler=PortlandGroup]) + FATHOM_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cxx_compiler=Intel]) + FATHOM_TRY_COMPILER_DEFINE([__IBMCPP__],[cxx_compiler=VisualAge]) + FATHOM_TRY_COMPILER_DEFINE([__DECCXX_VER],[cxx_compiler=Compaq]) + FATHOM_TRY_COMPILER_DEFINE([__SUNPRO_CC],[cxx_compiler=SunWorkshop]) + FATHOM_TRY_COMPILER_DEFINE([__PGI],[cxx_cmopiler=PortlandGroup]) ;; hpux*) - SNL_TRY_COMPILER_DEFINE([__HP_aCC],[cxx_compiler=HP]) + FATHOM_TRY_COMPILER_DEFINE([__HP_aCC],[cxx_compiler=HP]) ;; windows*) - SNL_TRY_COMPILER_DEFINE([__MSC_VER],[cxx_compiler=VisualStudio]) - SNL_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cxx_compiler=Intel]) - SNL_TRY_COMPILER_DEFINE([__DECCXX_VER],[cxx_compiler=Compaq]) - SNL_TRY_COMPILER_DEFINE([__BORLANDC__],[cxx_compiler=Borland]) - SNL_TRY_COMPILER_DEFINE([__CYGWIN__],[cxx_compiler=Cygwin]) - SNL_TRY_COMPILER_DEFINE([__MINGW32__],[cxx_compiler=MinGW]) + FATHOM_TRY_COMPILER_DEFINE([__MSC_VER],[cxx_compiler=VisualStudio]) + FATHOM_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cxx_compiler=Intel]) + FATHOM_TRY_COMPILER_DEFINE([__DECCXX_VER],[cxx_compiler=Compaq]) + FATHOM_TRY_COMPILER_DEFINE([__BORLANDC__],[cxx_compiler=Borland]) + FATHOM_TRY_COMPILER_DEFINE([__CYGWIN__],[cxx_compiler=Cygwin]) + FATHOM_TRY_COMPILER_DEFINE([__MINGW32__],[cxx_compiler=MinGW]) ;; *) - SNL_TRY_COMPILER_DEFINE([__PGI],[cc_cmopiler=PortlandGroup]) + FATHOM_TRY_COMPILER_DEFINE([__PGI],[cc_cmopiler=PortlandGroup]) ;; esac fi @@ -325,80 +325,80 @@ AC_MSG_CHECKING([for known compiler/OS combinations]) case "$cxx_compiler:$host_cpu" in GNU:sparc*) - SNL_CXX_32BIT=-m32 - SNL_CXX_64BIT=-m64 - SNL_CXX_SPECIAL="$EXTRA_GNU_FLAGS" + FATHOM_CXX_32BIT=-m32 + FATHOM_CXX_64BIT=-m64 + FATHOM_CXX_SPECIAL="$EXTRA_GNU_FLAGS" ;; GNU:powerpc*) - SNL_CXX_32BIT=-m32 - SNL_CXX_64BIT=-m64 - SNL_CXX_SPECIAL="$EXTRA_GNU_FLAGS" + FATHOM_CXX_32BIT=-m32 + FATHOM_CXX_64BIT=-m64 + FATHOM_CXX_SPECIAL="$EXTRA_GNU_FLAGS" ;; GNU:i?86|GNU:x86_64) - SNL_CXX_32BIT=-m32 - SNL_CXX_64BIT=-m64 - SNL_CXX_SPECIAL="$EXTRA_GNU_FLAGS" + FATHOM_CXX_32BIT=-m32 + FATHOM_CXX_64BIT=-m64 + FATHOM_CXX_SPECIAL="$EXTRA_GNU_FLAGS" ;; GNU:mips*) - SNL_CXX_32BIT="-mips32 -mabi=32" - SNL_CXX_64BIT="-mips64 -mabi=64" - SNL_CXX_SPECIAL="$EXTRA_GNU_FLAGS" + FATHOM_CXX_32BIT="-mips32 -mabi=32" + FATHOM_CXX_64BIT="-mips64 -mabi=64" + FATHOM_CXX_SPECIAL="$EXTRA_GNU_FLAGS" ;; GNU:*) - SNL_CXX_SPECIAL="$EXTRA_GNU_FLAGS" + FATHOM_CXX_SPECIAL="$EXTRA_GNU_FLAGS" ;; Intel:*) - SNL_CXX_32BIT=-m32 - SNL_CXX_64BIT=-m64 - SNL_CXX_SPECIAL="$EXTRA_GNU_FLAGS -wd981 -wd383" + FATHOM_CXX_32BIT=-m32 + FATHOM_CXX_64BIT=-m64 + FATHOM_CXX_SPECIAL="$EXTRA_GNU_FLAGS -wd981 -wd383" ;; VisualAge:*) - SNL_CXX_32BIT=-q32 - SNL_CXX_64BIT=-q64 + FATHOM_CXX_32BIT=-q32 + FATHOM_CXX_64BIT=-q64 # Do V5.0 namemangling for compatibility with ACIS, and enable RTTI case "$target_vendor" in bgp) - SNL_CXX_SPECIAL="" + FATHOM_CXX_SPECIAL="" AR="ar" NM="nm -B" ;; *) - SNL_CXX_SPECIAL="-qrtti=all -qnamemangling=v5" + FATHOM_CXX_SPECIAL="-qrtti=all -qnamemangling=v5" AR="ar" NM="nm -B -X 32_64" ;; esac ;; MIPSpro:mips) - SNL_CXX_32BIT=-n32 - SNL_CXX_64BIT=-64 - SNL_CXX_SPECIAL=-LANG:std + FATHOM_CXX_32BIT=-n32 + FATHOM_CXX_64BIT=-64 + FATHOM_CXX_SPECIAL=-LANG:std ;; MIPSpro:*) - SNL_CXX_SPECIAL=-LANG:std + FATHOM_CXX_SPECIAL=-LANG:std ;; SunWorkshop:sparc*) - SNL_CXX_32BIT=-xarch=generic - SNL_CXX_64BIT=-xarch=generic64 + FATHOM_CXX_32BIT=-xarch=generic + FATHOM_CXX_64BIT=-xarch=generic64 ;; SunWorkshop:i?86|SunWorkshop:x86_64) - SNL_CXX_32BIT=-m32 - SNL_CXX_64BIT=-m64 + FATHOM_CXX_32BIT=-m32 + FATHOM_CXX_64BIT=-m64 ;; *) ;; esac AC_MSG_RESULT([$cxx_compiler:$host_cpu]) -]) # end SNL_CXX_FLAGS +]) # end FATHOM_CXX_FLAGS ####################################################################################### # Check for compiler-specific flags. # Sets the following environmental variables: -# SNL_CC_SPECIAL : Any compiler-specific flags which must be specified -# SNL_CC_32BIT : Flag to force compilation of 32-bit code -# SNL_CC_64BIT : Flag to force compilation of 64-bit code +# FATHOM_CC_SPECIAL : Any compiler-specific flags which must be specified +# FATHOM_CC_32BIT : Flag to force compilation of 32-bit code +# FATHOM_CC_64BIT : Flag to force compilation of 64-bit code ####################################################################################### -AC_DEFUN([SNL_CC_FLAGS], [ +AC_DEFUN([FATHOM_CC_FLAGS], [ AC_LANG_PUSH([C]) # Detect compiler @@ -408,42 +408,42 @@ if test x$GCC = xyes; then cc_compiler=GNU # Intel claims to be GCC, check for it here - SNL_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cc_compiler=Intel]) + FATHOM_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cc_compiler=Intel]) # Search for other compiler types # For efficiency, limit checks to relevant OSs else cc_compiler=unknown case "$target_os" in aix*) - SNL_TRY_COMPILER_DEFINE([__IBMC__],[cc_compiler=VisualAge]) + FATHOM_TRY_COMPILER_DEFINE([__IBMC__],[cc_compiler=VisualAge]) ;; solaris*|sunos*) - SNL_TRY_COMPILER_DEFINE([__SUNPRO_C],[cc_compiler=SunWorkshop]) + FATHOM_TRY_COMPILER_DEFINE([__SUNPRO_C],[cc_compiler=SunWorkshop]) ;; irix*) - SNL_TRY_COMPILER_DEFINE([__sgi],[cc_compiler=MIPSpro]) + FATHOM_TRY_COMPILER_DEFINE([__sgi],[cc_compiler=MIPSpro]) ;; linux*) - SNL_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cc_compiler=Intel]) - SNL_TRY_COMPILER_DEFINE([__IBMC__],[cc_compiler=VisualAge]) - SNL_TRY_COMPILER_DEFINE([__DECC_VER],[cc_compiler=Compaq]) - SNL_TRY_COMPILER_DEFINE([__SUNPRO_C],[cc_compiler=SunWorkshop]) - SNL_TRY_COMPILER_DEFINE([__PGI],[cc_cmopiler=PortlandGroup]) + FATHOM_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cc_compiler=Intel]) + FATHOM_TRY_COMPILER_DEFINE([__IBMC__],[cc_compiler=VisualAge]) + FATHOM_TRY_COMPILER_DEFINE([__DECC_VER],[cc_compiler=Compaq]) + FATHOM_TRY_COMPILER_DEFINE([__SUNPRO_C],[cc_compiler=SunWorkshop]) + FATHOM_TRY_COMPILER_DEFINE([__PGI],[cc_cmopiler=PortlandGroup]) ;; hpux*) - SNL_TRY_COMPILER_DEFINE([__HP_cc],[cc_compiler=HP]) + FATHOM_TRY_COMPILER_DEFINE([__HP_cc],[cc_compiler=HP]) ;; windows*) - SNL_TRY_COMPILER_DEFINE([__MSC_VER],[cc_compiler=VisualStudio]) - SNL_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cc_compiler=Intel]) - SNL_TRY_COMPILER_DEFINE([__DECC_VER],[cc_compiler=Compaq]) - SNL_TRY_COMPILER_DEFINE([__BORLANDC__],[cc_compiler=Borland]) - SNL_TRY_COMPILER_DEFINE([__TURBOC__],[cc_compiler=TurboC]) - SNL_TRY_COMPILER_DEFINE([__CYGWIN__],[cc_compiler=Cygwin]) - SNL_TRY_COMPILER_DEFINE([__MINGW32__],[cc_compiler=MinGW]) + FATHOM_TRY_COMPILER_DEFINE([__MSC_VER],[cc_compiler=VisualStudio]) + FATHOM_TRY_COMPILER_DEFINE([__INTEL_COMPILER],[cc_compiler=Intel]) + FATHOM_TRY_COMPILER_DEFINE([__DECC_VER],[cc_compiler=Compaq]) + FATHOM_TRY_COMPILER_DEFINE([__BORLANDC__],[cc_compiler=Borland]) + FATHOM_TRY_COMPILER_DEFINE([__TURBOC__],[cc_compiler=TurboC]) + FATHOM_TRY_COMPILER_DEFINE([__CYGWIN__],[cc_compiler=Cygwin]) + FATHOM_TRY_COMPILER_DEFINE([__MINGW32__],[cc_compiler=MinGW]) ;; *) - SNL_TRY_COMPILER_DEFINE([__PGI],[cc_cmopiler=PortlandGroup]) + FATHOM_TRY_COMPILER_DEFINE([__PGI],[cc_cmopiler=PortlandGroup]) ;; esac fi @@ -457,67 +457,67 @@ AC_MSG_CHECKING([for known compiler/OS combinations]) case "$cc_compiler:$host_cpu" in GNU:sparc*) - SNL_CC_32BIT=-m32 - SNL_CC_64BIT=-m64 - SNL_CC_SPECIAL="$EXTRA_GNU_FLAGS" + FATHOM_CC_32BIT=-m32 + FATHOM_CC_64BIT=-m64 + FATHOM_CC_SPECIAL="$EXTRA_GNU_FLAGS" ;; GNU:powerpc*) - SNL_CC_32BIT=-m32 - SNL_CC_64BIT=-m64 - SNL_CC_SPECIAL="$EXTRA_GNU_FLAGS" + FATHOM_CC_32BIT=-m32 + FATHOM_CC_64BIT=-m64 + FATHOM_CC_SPECIAL="$EXTRA_GNU_FLAGS" ;; GNU:i?86|GNU:x86_64) - SNL_CC_32BIT=-m32 - SNL_CC_64BIT=-m64 - SNL_CC_SPECIAL="$EXTRA_GNU_FLAGS" + FATHOM_CC_32BIT=-m32 + FATHOM_CC_64BIT=-m64 + FATHOM_CC_SPECIAL="$EXTRA_GNU_FLAGS" ;; Intel:*) - SNL_CC_32BIT=-m32 - SNL_CC_64BIT=-m64 - SNL_CC_SPECIAL="$EXTRA_GNU_FLAGS -wd981 -wd383" + FATHOM_CC_32BIT=-m32 + FATHOM_CC_64BIT=-m64 + FATHOM_CC_SPECIAL="$EXTRA_GNU_FLAGS -wd981 -wd383" ;; GNU:mips*) - SNL_CC_32BIT="-mips32 -mabi=32" - SNL_CC_64BIT="-mips64 -mabi=64" - SNL_CC_SPECIAL="$EXTRA_GNU_FLAGS" + FATHOM_CC_32BIT="-mips32 -mabi=32" + FATHOM_CC_64BIT="-mips64 -mabi=64" + FATHOM_CC_SPECIAL="$EXTRA_GNU_FLAGS" ;; GNU:*) - SNL_CC_SPECIAL="$EXTRA_GNU_FLAGS" + FATHOM_CC_SPECIAL="$EXTRA_GNU_FLAGS" ;; VisualAge:*) case "$target_vendor" in bgp) - SNL_CC_32BIT=-q32 - SNL_CC_64BIT=-q64 + FATHOM_CC_32BIT=-q32 + FATHOM_CC_64BIT=-q64 AR="ar" NM="nm -B" ;; *) - SNL_CC_32BIT=-q32 - SNL_CC_64BIT=-q64 + FATHOM_CC_32BIT=-q32 + FATHOM_CC_64BIT=-q64 AR="ar -X 32_64" NM="nm -B -X 32_64" ;; esac ;; MIPSpro:mips) - SNL_CC_32BIT=-n32 - SNL_CC_64BIT=-64 - SNL_CC_SPECIAL=-LANG:std + FATHOM_CC_32BIT=-n32 + FATHOM_CC_64BIT=-64 + FATHOM_CC_SPECIAL=-LANG:std ;; MIPSpro:*) - SNL_CC_SPECIAL=-LANG:std + FATHOM_CC_SPECIAL=-LANG:std ;; SunWorkshop:sparc*) - SNL_CC_32BIT=-xarch=generic - SNL_CC_64BIT=-xarch=generic64 + FATHOM_CC_32BIT=-xarch=generic + FATHOM_CC_64BIT=-xarch=generic64 ;; SunWorkshop:i?86|SunWorkshop:x86_64) - SNL_CC_32BIT=-m32 - SNL_CC_64BIT=-m64 + FATHOM_CC_32BIT=-m32 + FATHOM_CC_64BIT=-m64 ;; *) ;; esac AC_MSG_RESULT([$cc_compiler:$host_cpu]) -]) # end SNL_CC_FLAGS +]) # end FATHOM_CC_FLAGS Modified: cgm/trunk/m4/cplusplus.m4 =================================================================== --- cgm/trunk/m4/cplusplus.m4 2009-11-02 22:18:42 UTC (rev 3263) +++ cgm/trunk/m4/cplusplus.m4 2009-11-02 22:23:19 UTC (rev 3264) @@ -44,7 +44,7 @@ # exist or do not define symbols to be in the "std" namespace. # For example: if this is defined, #include <iostrea.h> rather than <iostream> ####################################################################################### -AC_DEFUN([SNL_CANT_USE_STD], [ +AC_DEFUN([FATHOM_CANT_USE_STD], [ AC_CACHE_CHECK([for C++-standard library in std:: namespace], [snl_cv_cxx_stl_in_std], @@ -85,7 +85,7 @@ CANT_USE_STD_IO= fi -]) # SNL_CANT_USE_STD +]) # FATHOM_CANT_USE_STD @@ -95,7 +95,7 @@ # included (in the .hpp files). # Sets TEMPLATE_DEFS_INCLUDED=-DTEMPLATE_DEFS_INCLUDED ####################################################################################### -AC_DEFUN([SNL_TEMPLATE_DEFS_INCLUDED], [ +AC_DEFUN([FATHOM_TEMPLATE_DEFS_INCLUDED], [ AC_CACHE_CHECK([if C++ template definitions should be included], [snl_cv_cxx_template_defs_included], @@ -125,13 +125,13 @@ TEMPLATE_DEFS_INCLUDED= fi -]) # SNL_TEMPLATE_DEFS_INCLUDED +]) # FATHOM_TEMPLATE_DEFS_INCLUDED ####################################################################################### # Check if compiler supports template class specialization. # Sets TEMPLATE_SPECIALIZATION=-DTEMPLATE_SPECIALIZATION ####################################################################################### -AC_DEFUN([SNL_TEMPLATE_SPECIALIZATION], [ +AC_DEFUN([FATHOM_TEMPLATE_SPECIALIZATION], [ AC_CACHE_CHECK([if C++ compiler supports template class specialization], [snl_cv_template_specialization], [AC_LANG_SAVE @@ -148,13 +148,13 @@ TEMPLATE_SPECIALIZATION=-DTEMPLATE_SPECIALIZATION fi -]) # SNL_TEMPLATE_SPECIALIZATION +]) # FATHOM_TEMPLATE_SPECIALIZATION ####################################################################################### # Check if compiler supports template function specialization. # Sets TEMPLATE_FUNC_SPECIALIZATION=-DTEMPLATE_FUNC_SPECIALIZATION ####################################################################################### -AC_DEFUN([SNL_TEMPLATE_FUNC_SPECIALIZATION], [ +AC_DEFUN([FATHOM_TEMPLATE_FUNC_SPECIALIZATION], [ AC_CACHE_CHECK([if C++ compiler supports template function specialization], [snl_cv_template_func_specialization], [AC_LANG_SAVE @@ -172,4 +172,4 @@ TEMPLATE_FUNC_SPECIALIZATION=-DTEMPLATE_FUNC_SPECIALIZATION fi -]) # SNL_TEMPLATE_FUNC_SPECIALIZATION +]) # FATHOM_TEMPLATE_FUNC_SPECIALIZATION Modified: cgm/trunk/m4/hdf5.m4 =================================================================== --- cgm/trunk/m4/hdf5.m4 2009-11-02 22:18:42 UTC (rev 3263) +++ cgm/trunk/m4/hdf5.m4 2009-11-02 22:23:19 UTC (rev 3264) @@ -6,7 +6,7 @@ # HDF5_LDFLAGS # HDF5_LIBS ####################################################################################### -AC_DEFUN([SNL_CHECK_HDF5],[ +AC_DEFUN([FATHOM_CHECK_HDF5],[ # CLI option for linking zlib AC_ARG_WITH(zlib, @@ -184,4 +184,4 @@ fi -]) # SNL_CHECK_HDF5 +]) # FATHOM_CHECK_HDF5 Modified: cgm/trunk/m4/makevar.m4 =================================================================== --- cgm/trunk/m4/makevar.m4 2009-11-02 22:18:42 UTC (rev 3263) +++ cgm/trunk/m4/makevar.m4 2009-11-02 22:23:19 UTC (rev 3264) @@ -7,7 +7,7 @@ # of the variable) # - Action on failure ####################################################################################### -AC_DEFUN([SNL_MAKE_INC_VAR], [ +AC_DEFUN([FATHOM_MAKE_INC_VAR], [ make_val= snl_makefile="snl_check.mak" rm -f $snl_makefile @@ -16,12 +16,12 @@ AC_MSG_WARN([File not found: $1]) $4 else -cat >$snl_makefile <<SNL_END_OF_MAKEFILE +cat >$snl_makefile <<FATHOM_END_OF_MAKEFILE default: @echo "\$($2)" include $1 -SNL_END_OF_MAKEFILE +FATHOM_END_OF_MAKEFILE if make -f $snl_makefile > /dev/null 2>&1; then make_val=`make -s -f $snl_makefile` rm -f $snl_makefile Modified: cgm/trunk/m4/netcdf.m4 =================================================================== --- cgm/trunk/m4/netcdf.m4 2009-11-02 22:18:42 UTC (rev 3263) +++ cgm/trunk/m4/netcdf.m4 2009-11-02 22:23:19 UTC (rev 3264) @@ -6,7 +6,7 @@ # NETCDF_LDFLAGS # NETCDF_LIBS ####################################################################################### -AC_DEFUN([SNL_CHECK_NETCDF],[ +AC_DEFUN([FATHOM_CHECK_NETCDF],[ AC_MSG_CHECKING([if NetCDF support is enabled]) AC_ARG_WITH(netcdf, @@ -110,4 +110,4 @@ fi fi -]) # SNL_HAVE_NETCDF +]) # FATHOM_HAVE_NETCDF

1 0

r3263 - in cgm/trunk: . geom/parallel m4
by kraftche＠cae.wisc.edu 02 Nov '09

02 Nov '09

Author: kraftche Date: 2009-11-02 16:18:42 -0600 (Mon, 02 Nov 2009) New Revision: 3263 Added: cgm/trunk/geom/parallel/CGMmpi.h cgm/trunk/geom/parallel/CGMmpi_config.h.in cgm/trunk/m4/macro_val.m4 cgm/trunk/m4/mpi.m4 Modified: cgm/trunk/configure.ac cgm/trunk/geom/parallel/CGMParallelComm.cpp cgm/trunk/geom/parallel/CGMParallelComm.hpp cgm/trunk/geom/parallel/Makefile.am cgm/trunk/geom/parallel/ProcData.hpp Log: copy MPI config from MOAB Modified: cgm/trunk/configure.ac =================================================================== --- cgm/trunk/configure.ac 2009-11-02 22:13:26 UTC (rev 3262) +++ cgm/trunk/configure.ac 2009-11-02 22:18:42 UTC (rev 3263) @@ -11,7 +11,6 @@ EXTRA_GNU_FLAGS="-Wall -pipe -pedantic" SNL_CHECK_COMPILERS AC_PROG_LIBTOOL -AM_CONDITIONAL(build_parallel, [test "x$WITH_MPI" != "xno"]) LIBS="-lm" AC_PROG_SED AC_C_BIGENDIAN( [LITTLE_ENDIAN=], [LITTLE_ENDIAN=-DLITTLE_ENDIAN=BYTE_ORDER] ) @@ -40,6 +39,9 @@ # MPI OPTIONS ################################################################################ +AM_CONDITIONAL(build_parallel, [test "x$WITH_MPI" != "xno"]) +FATHOM_CHECK_MPI +FATHOM_CONFIG_MPI_EXEC if test "x$WITH_MPI" != "xno"; then CXXFLAGS="$CXXFLAGS -DUSE_MPI" CGM_PARALLEL_INCLUDE='-I${CGM_DIR}/geom/parallel' @@ -50,6 +52,14 @@ AC_SUBST(CGM_PARALLEL_INCLUDE) AC_SUBST(CGM_PARALLEL_LIB) AC_SUBST(CGM_PARALLEL_LIB_FILE) +# Used to generate CGMmpi.h +if test "xyes" = "x$MPI_CXX_HELP_NEEDED"; then + AC_DEFINE( [CGM_MPI_CXX_CONFLICT], [1], + [MPICH_IGNORE_CXX_SEEK is not sufficient to avoid conflicts] ) + AC_DEFINE_UNQUOTED([CGM_SEEK_SET],[$SEEK_SET],["Value of C SEEK_SET"]) + AC_DEFINE_UNQUOTED([CGM_SEEK_CUR],[$SEEK_CUR],["Value of C SEEK_CUR"]) + AC_DEFINE_UNQUOTED([CGM_SEEK_END],[$SEEK_END],["Value of C SEEK_END"]) +fi ################################################################################ # CGM-specific Checks @@ -423,6 +433,7 @@ dnl AC_OUTPUT_COMMANDS( [if test -f util/CubitUtilConfigure.h; then true; else echo "#define CUBIT_UTIL_EXPORT" > util/CubitUtilConfigure.h; fi], dnl [if test -f geom/CubitGeomConfigure.h; then true; else echo "#define CUBIT_GEOM_EXPORT" > geom/CubitGeomConfigure.h; fi] ) AC_CONFIG_HEADERS(config.h) +AC_CONFIG_HEADERS([geom/parallel/CGMmpi_config.h]) AC_CONFIG_HEADERS(itaps/iBase_FCDefs.h) AC_CONFIG_FILES(Makefile util/Makefile Modified: cgm/trunk/geom/parallel/CGMParallelComm.cpp =================================================================== --- cgm/trunk/geom/parallel/CGMParallelComm.cpp 2009-11-02 22:13:26 UTC (rev 3262) +++ cgm/trunk/geom/parallel/CGMParallelComm.cpp 2009-11-02 22:18:42 UTC (rev 3263) @@ -9,7 +9,7 @@ #include <sstream> #ifdef USE_MPI -#include "mpi.h" +#include "CGMmpi.h" #endif #define INITIAL_BUFF_SIZE 1024 Modified: cgm/trunk/geom/parallel/CGMParallelComm.hpp =================================================================== --- cgm/trunk/geom/parallel/CGMParallelComm.hpp 2009-11-02 22:13:26 UTC (rev 3262) +++ cgm/trunk/geom/parallel/CGMParallelComm.hpp 2009-11-02 22:18:42 UTC (rev 3263) @@ -19,37 +19,9 @@ #include <set> #include <vector> #include "math.h" +#include "CGMmpi.h" -#ifdef SEEK_SET -# define SEEK_SET_OLD SEEK_SET -# undef SEEK_SET -#endif -#ifdef SEEK_CUR -# define SEEK_CUR_OLD SEEK_CUR -# undef SEEK_CUR -#endif -#ifdef SEEK_END -# define SEEK_END_OLD SEEK_END -# undef SEEK_END -#endif -#include "mpi.h" -#ifdef SEEK_SET_OLD -# undef SEEK_SET -# define SEEK_SET SEEK_SET_OLD -# undef SEEK_SET_OLD -#endif -#ifdef SEEK_CUR_OLD -# undef SEEK_CUR -# define SEEK_CUR SEEK_CUR_OLD -# undef SEEK_CUR_OLD -#endif -#ifdef SEEK_END_OLD -# undef SEEK_END -# define SEEK_END SEEK_END_OLD -# undef SEEK_END_OLD -#endif - extern "C" { struct tuple_list; } Added: cgm/trunk/geom/parallel/CGMmpi.h =================================================================== --- cgm/trunk/geom/parallel/CGMmpi.h (rev 0) +++ cgm/trunk/geom/parallel/CGMmpi.h 2009-11-02 22:18:42 UTC (rev 3263) @@ -0,0 +1,48 @@ +#ifndef CGM_MPI_H +#define CGM_MPI_H +#include "CGMmpi_config.h" + +#ifndef __cplusplus +# include <mpi.h> +#elif !defined(CGM_MPI_CXX_CONFLICT) +# ifndef MPICH_IGNORE_CXX_SEEK +# define MPICH_IGNORE_CXX_SEEK +# endif +# include <mpi.h> +#else +# include <stdio.h> +# ifdef SEEK_SET +# undef SEEK_SET +# ifdef CGM_SEEK_SET +# define CGM_RESTORE_SEEK_SET +# endif +# endif +# ifdef SEEK_CUR +# undef SEEK_CUR +# ifdef CGM_SEEK_CUR +# define CGM_RESTORE_SEEK_CUR +# endif +# endif +# ifdef SEEK_END +# undef SEEK_END +# ifdef CGM_SEEK_END +# define CGM_RESTORE_SEEK_END +# endif +# endif +# include <mpi.h> +# ifdef CGM_RESTORE_SEEK_SET +# undef CGM_RESTORE_SEEK_SET +# define SEEK_SET CGM_SEEK_SET +# endif +# ifdef CGM_RESTORE_SEEK_CUR +# undef CGM_RESTORE_SEEK_CUR +# define SEEK_CUR CGM_SEEK_CUR +# endif +# ifdef CGM_RESTORE_SEEK_END +# undef CGM_RESTORE_SEEK_END +# define SEEK_END CGM_SEEK_END +# endif +#endif + + +#endif Property changes on: cgm/trunk/geom/parallel/CGMmpi.h ___________________________________________________________________ Added: svn:mergeinfo + Added: cgm/trunk/geom/parallel/CGMmpi_config.h.in =================================================================== --- cgm/trunk/geom/parallel/CGMmpi_config.h.in (rev 0) +++ cgm/trunk/geom/parallel/CGMmpi_config.h.in 2009-11-02 22:18:42 UTC (rev 3263) @@ -0,0 +1,11 @@ +/* MPICH_IGNORE_CXX_SEEK is not sufficient to avoid conflicts */ +#undef CGM_MPI_CXX_CONFLICT + +/* "Value of C SEEK_CUR" */ +#undef CGM_SEEK_CUR + +/* "Value of C SEEK_END" */ +#undef CGM_SEEK_END + +/* "Value of C SEEK_SET" */ +#undef CGM_SEEK_SET Property changes on: cgm/trunk/geom/parallel/CGMmpi_config.h.in ___________________________________________________________________ Added: svn:mergeinfo + Modified: cgm/trunk/geom/parallel/Makefile.am =================================================================== --- cgm/trunk/geom/parallel/Makefile.am 2009-11-02 22:13:26 UTC (rev 3262) +++ cgm/trunk/geom/parallel/Makefile.am 2009-11-02 22:18:42 UTC (rev 3263) @@ -30,6 +30,8 @@ # If any of these do not need to be installed, move them # to the _SOURCES list above. libcubit_parallel_la_include_HEADERS = \ + CGMmpi.h \ + CGMmpi_config.h \ CGMProcConfig.hpp \ CGMParallelComm.hpp \ FileOptions.hpp \ Modified: cgm/trunk/geom/parallel/ProcData.hpp =================================================================== --- cgm/trunk/geom/parallel/ProcData.hpp 2009-11-02 22:13:26 UTC (rev 3262) +++ cgm/trunk/geom/parallel/ProcData.hpp 2009-11-02 22:18:42 UTC (rev 3263) @@ -2,7 +2,7 @@ #define PROBDATA_HPP #ifdef USE_MPI -#include "mpi.h" +#include "CGMmpi.h" #endif class ProcData Added: cgm/trunk/m4/macro_val.m4 =================================================================== --- cgm/trunk/m4/macro_val.m4 (rev 0) +++ cgm/trunk/m4/macro_val.m4 2009-11-02 22:18:42 UTC (rev 3263) @@ -0,0 +1,38 @@ +# Macro to determine the unsigned integer value of a +# preprocessor macro. Arguments are: +# header, macro, variable, upper bound +# where 'header' is the header in which the macro value +# is defined, 'macro' is the name of the preprocessor macro +# for which the value is to be determined, 'variable' is the +# name of the shell variable in which to store the value, +# and 'upper bound' is the largest value up to which to search +AC_DEFUN([FATHOM_MACRO_VALUE],[ + header="$1" + macro="$2" + upper="$4" + lower="0" + while test "$lower" -lt "$upper"; do + curr=$(( ($lower + $upper)/2 )) + AC_PREPROC_IFELSE( + [AC_LANG_PROGRAM([#include <${header}> + #if $macro >= $curr + # error choke me + #endif],[])], + [upper=$curr], + [AC_PREPROC_IFELSE( + [AC_LANG_PROGRAM([#include <${header}> + #if $macro < $curr + # error choke me + #endif],[])], + [break], + [lower=$curr])]) + done + AC_PREPROC_IFELSE( + [AC_LANG_PROGRAM([#include <${header}> + #if $curr != $macro + # error choke me + #endif],[])], + [$3=$curr], + [AC_MSG_ERROR([Unable to determine value of $macro defined in $header])]) +]) + Added: cgm/trunk/m4/mpi.m4 =================================================================== --- cgm/trunk/m4/mpi.m4 (rev 0) +++ cgm/trunk/m4/mpi.m4 2009-11-02 22:18:42 UTC (rev 3263) @@ -0,0 +1,79 @@ +# Macros for MPI configuration. + +# NOTE: The macro to enable/disable MPI support entirely is +# in compilers.m4, as it also affects the choice of compiler. +# That code is expected to have set WITH_MPI to either 'yes', +# 'no' or the directory where MPI is installed BEFORE these +# macros are called. + +# Options and configuration for mpiexec. Sets +# the following variables: +# USE_MPIEXEC - AM_CONDITIONAL, true if MPIEXEC is valid +# MPIEXEC - mpiexec binary +# MPIEXEC_NP - mpiexec CLI flag to specify number of procs (e.g. '-np') +# NP - number of procs to use during testing +AC_DEFUN([FATHOM_CONFIG_MPI_EXEC],[ + AC_ARG_VAR(MPIEXEC,[Program to use to run parallel tests (default: mpiexec or mpirun)]) + AC_ARG_VAR(MPIEXEC_NP,[Command line flag to specify number of processors to use (default: -np)]) + AC_ARG_VAR(NP,[Number of processors to on which to run parallel tests (default: 2)]) + if test "x$WITH_MPI" != "xno"; then + if test "x$MPIEXEC" = "x"; then + if test "x$WITH_MPI" != "xyes"; then + AC_CHECK_PROGS([MPIEXEC],[mpiexec mpirun],[true],[${WITH_MPI}:${WITH_MPI}/bin]) + else + AC_CHECK_PROGS([MPIEXEC],[mpiexec mpirun],[true]) + fi + fi + if test "x$MPIEXEC_NP" = "x"; then + MPIEXEC_NP="-np" + fi + if test "x$NP" = "x"; then + NP=2 + fi + fi + AM_CONDITIONAL(USE_MPIEXEC, [test "xtrue" != "x$MPIEXEC"]) +]) + +# Check for MPI library and MPI.h +# Error if not found. +# Defines MPI_CXX_HELP_NEEDED to yes if, when parsed with a c++ compiler, +# mpi.h conflicts with the C standard library for the definition of SEEK_SET, +# etc. and defining MPICH_IGNORE_CXX_SEEK is not sufficient to work around +# the problem. +AC_DEFUN([FATHOM_CHECK_MPI], [ + if test "x$WITH_MPI" != "xno"; then + AC_LANG_PUSH([C]) + AC_CHECK_HEADER([mpi.h],[],[AC_MSG_ERROR([mpi.h not found or not working])]) + AC_LANG_POP([C]) + + AC_MSG_CHECKING([If mpi.h conflicts with C headers in C++]) + AC_LANG_PUSH([C++]) + AC_PREPROC_IFELSE( + [AC_LANG_PROGRAM([#include <stdio.h> + #include <mpi.h>],[])], + [MPI_CXX_HELP_NEEDED=no; AC_MSG_RESULT([no])], + [AC_PREPROC_IFELSE( + [AC_LANG_PROGRAM([#include <stdio.h> + #define MPICH_IGNORE_CXX_SEEK + #include <mpi.h>],[])], + [MPI_CXX_HELP_NEEDED=no; AC_MSG_RESULT([MPICH_IGNORE_CXX_SEEK])], + [MPI_CXX_HELP_NEEDED=yes + AC_MSG_RESULT([yes]) + + AC_MSG_CHECKING([value of SEEK_SET]) + FATHOM_MACRO_VALUE([stdio.h],[SEEK_SET],[SEEK_SET],[16]) + AC_MSG_RESULT([$SEEK_SET]) + + AC_MSG_CHECKING([value of SEEK_CUR]) + FATHOM_MACRO_VALUE([stdio.h],[SEEK_CUR],[SEEK_CUR],[16]) + AC_MSG_RESULT([$SEEK_CUR]) + + AC_MSG_CHECKING([value of SEEK_END]) + FATHOM_MACRO_VALUE([stdio.h],[SEEK_END],[SEEK_END],[16]) + AC_MSG_RESULT([$SEEK_END]) + ]) + ]) + AC_LANG_POP([C++]) + fi +]) +

1 0