[cig-commits] r9217 - in cs/benchmark/cigma/trunk: . build build/m4 m4 src
luis at geodynamics.org
luis at geodynamics.org
Mon Feb 4 14:19:34 PST 2008
Author: luis
Date: 2008-02-04 14:19:34 -0800 (Mon, 04 Feb 2008)
New Revision: 9217
Added:
cs/benchmark/cigma/trunk/Makefile.am
cs/benchmark/cigma/trunk/TODO
cs/benchmark/cigma/trunk/configure.ac
cs/benchmark/cigma/trunk/m4/
cs/benchmark/cigma/trunk/m4/cigma_hdf5.m4
cs/benchmark/cigma/trunk/m4/cigma_python.m4
cs/benchmark/cigma/trunk/m4/cigma_vtk.m4
cs/benchmark/cigma/trunk/m4/cigma_zlib.m4
cs/benchmark/cigma/trunk/src/Makefile.am
cs/benchmark/cigma/trunk/variables.in
Removed:
cs/benchmark/cigma/trunk/build/Makefile.am
cs/benchmark/cigma/trunk/build/configure.ac
cs/benchmark/cigma/trunk/build/m4/cigma_hdf5.m4
cs/benchmark/cigma/trunk/build/m4/cigma_python.m4
cs/benchmark/cigma/trunk/build/m4/cigma_vtk.m4
cs/benchmark/cigma/trunk/build/m4/cigma_zlib.m4
cs/benchmark/cigma/trunk/build/variables.in
cs/benchmark/cigma/trunk/src/Makefile
Log:
Moved build files to the top level, and created TODO file
Copied: cs/benchmark/cigma/trunk/Makefile.am (from rev 9211, cs/benchmark/cigma/trunk/build/Makefile.am)
===================================================================
--- cs/benchmark/cigma/trunk/Makefile.am (rev 0)
+++ cs/benchmark/cigma/trunk/Makefile.am 2008-02-04 22:19:34 UTC (rev 9217)
@@ -0,0 +1 @@
+ACLOCAL_AMFLAGS = -I ./m4
Added: cs/benchmark/cigma/trunk/TODO
===================================================================
--- cs/benchmark/cigma/trunk/TODO (rev 0)
+++ cs/benchmark/cigma/trunk/TODO 2008-02-04 22:19:34 UTC (rev 9217)
@@ -0,0 +1,17 @@
+---high-----------------------------------------------------------------------
+Migrate to automake from custom makefiles
+Run strike-slip & reverse-slip benchmarks on the 250m resolution datasets
+
+---normal---------------------------------------------------------------------
+Test vtk.m4 autodetection
+Test hdf.m4 autodetection
+Use Leif's python.m4 (in /cs/autoconf/)
+
+---low------------------------------------------------------------------------
+Add class PointField (explicit set of values)
+Add class InterpolatedPointField (nearest-neighbor interpolation)
+Add method AnnLocator::initialize(Points *points)
+Move vtkls.cpp into 'cigma list' command
+Add --mesh-locator option (values: none,ann)
+Intercept --version in CommandSet::run()
+
Deleted: cs/benchmark/cigma/trunk/build/Makefile.am
===================================================================
--- cs/benchmark/cigma/trunk/build/Makefile.am 2008-02-04 20:40:45 UTC (rev 9216)
+++ cs/benchmark/cigma/trunk/build/Makefile.am 2008-02-04 22:19:34 UTC (rev 9217)
@@ -1 +0,0 @@
-ACLOCAL_AMFLAGS = -I ./m4
Deleted: cs/benchmark/cigma/trunk/build/configure.ac
===================================================================
--- cs/benchmark/cigma/trunk/build/configure.ac 2008-02-04 20:40:45 UTC (rev 9216)
+++ cs/benchmark/cigma/trunk/build/configure.ac 2008-02-04 22:19:34 UTC (rev 9217)
@@ -1,107 +0,0 @@
-AC_PREREQ(2.59)
-AC_INIT([Cigma], [0.9.1], [cig-cs at geodynamics.org], [cigma])
-AC_CONFIG_AUX_DIR([./aux-config])
-AC_CONFIG_HEADER([config.h])
-AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([foreign])
-
-
-
-CIGMA_OPTIONS_ZLIB
-CIGMA_OPTIONS_HDF5
-CIGMA_OPTIONS_VTK
-
-
-
-dnl Get the operating system name
-UNAME=`uname`
-
-dnl Check for default compilers
-AC_PROG_CC
-AC_PROG_CXX
-if test "x${CC}" = "x" -o "x${CXX}" = "x"; then
- AC_MSG_ERROR([Could not find required compilers, aborting.])
-fi
-LINKER="${CXX}"
-
-dnl Use C++ for all compilation tests
-AC_LANG(C++)
-
-dnl Set default flags
-FLAGS="-Wall"
-OPTIM="-g -O2"
-
-dnl Check for various programs
-AC_PROG_CPP
-
-dnl How to build static libraries?
-case "$UNAME" in
- Darwin*)
- AR="libtool -o"
- RANLIB=true
- ;;
- *)
- AC_PROG_RANLIB
- AC_PATH_PROG(AR, ar)
- if test "x${AR}" = "x"; then
- AC_MSG_ERROR([Could not find the library archiver, aborting.])
- fi
- AR="${AR} ruvs"
- ;;
-esac
-
-dnl See if we need a .exe extension on executables
-AC_EXEEXT
-
-
-dnl Check for standard math library
-AC_CHECK_LIB(m,main)
-
-
-dnl Check for the python include directories
-CIGMA_PATH_PYTHON
-
-dnl Check for zlib and hdf5
-CIGMA_PATH_ZLIB
-CIGMA_PATH_HDF5
-
-dnl Check for vtk-5.0
-AM_PATH_VTK
-
-
-
-dnl Write output
-AC_SUBST(UNAME)
-AC_SUBST(FLAGS)
-AC_SUBST(OPTIM)
-AC_SUBST(LINKER)
-AC_SUBST(CIGMA_DIRS)
-AC_SUBST(CIGMA_LIBS)
-AC_SUBST(AR)
-
-AC_SUBST(VTK_INCLUDES)
-AC_SUBST(VTK_LIBS)
-AC_SUBST(VTK_LDFLAGS)
-
-AC_SUBST(HDF5_INCLUDES)
-AC_SUBST(HDF5_LIBS)
-AC_SUBST(HDF5_LDFLAGS)
-
-AC_SUBST(PYTHON_INCLUDES)
-AC_SUBST(PYTHON_LIBS)
-AC_SUBST(PYTHON_LDFLAGS)
-
-AC_CONFIG_FILES([Makefile variables])
-
-AC_OUTPUT
-
-
-dnl Print some information
-echo "********************************************************************"
-echo "Cigma is configured for"
-echo "- OS : $UNAME"
-echo "- C compiler : $CC"
-echo "- C++ compiler : $CXX"
-echo "- Linker : $LINKER"
-echo "- Optimization : $OPTIM"
-echo "- Options : $FLAGS"
Deleted: cs/benchmark/cigma/trunk/build/m4/cigma_hdf5.m4
===================================================================
--- cs/benchmark/cigma/trunk/build/m4/cigma_hdf5.m4 2008-02-04 20:40:45 UTC (rev 9216)
+++ cs/benchmark/cigma/trunk/build/m4/cigma_hdf5.m4 2008-02-04 22:19:34 UTC (rev 9217)
@@ -1,75 +0,0 @@
-##############################################################################
-# -*- Autoconf -*-
-#
-#
-
-##############################################################################
-#
-# CIGMA_OPTIONS_HDF5
-#
-AC_DEFUN([CIGMA_OPTIONS_HDF5], [
- AC_ARG_VAR(HDF5_HOME, [home path to HDF5 library])
- AC_ARG_WITH([hdf5],
- [AC_HELP_STRING([--with-hdf5],
- [The prefix where HDF5 is installed @<:@default=/usr@:>@])],
- [with_hdf5="$withval"],
- [with_hdf5="/usr"])
-])
-
-##############################################################################
-#
-# CIGMA_PATH_HDF5([action-if-found], [action-if-not-found])
-#
-AC_DEFUN([CIGMA_PATH_HDF5],[
-
- # AC_REQUIRE([CIGMA_PATH_ZLIB])
-
-
- if [[ $with_hdf5 = "yes" ]]; then
- dnl In case user wrote --with-hdf5=yes
- with_hdf5="/usr"
- fi
-
-
- if [[ $with_hdf5 != "no" ]]; then
-
- HDF5_PREFIX="$with_hdf5"
-
- AC_CHECK_FILE([$HDF5_PREFIX/include/hdf5.h], [hdf5Found="OK"])
- AC_MSG_CHECKING([if HDF5 is installed in $HDF5_PREFIX])
-
- if [[ -z "$hdf5Found" ]]; then
-
- dnl HDF5 not found!
- AC_MSG_RESULT([no])
- $3
-
- else
-
- dnl HDF5 found!
-
- AC_MSG_RESULT([yes])
-
- AC_CHECK_LIB(hdf5,main,[hdf5lib="OK"])
-
- #HDF5_CFLAGS="-I$HDF5_PREFIX/include"
- #HDF5_CXXFLAGS="$HDF5_CFLAGS"
-
- HDF5_INCLUDES="-I$HDF5_PREFIX/include"
- HDF5_LIBS="-lhdf5"
- HDF5_LDFLAGS="-L$HDF5_PREFIX/lib $HDF5_LIBS -Wl,--rpath -Wl,$HDF5_PREFIX/lib"
- $2
-
- fi
-
- else
-
- dnl user specified --with-hdf5=no
- dnl nothing to do?
- /bin/false
-
- fi
-
-])
-
-# vim: syntax=config
Deleted: cs/benchmark/cigma/trunk/build/m4/cigma_python.m4
===================================================================
--- cs/benchmark/cigma/trunk/build/m4/cigma_python.m4 2008-02-04 20:40:45 UTC (rev 9216)
+++ cs/benchmark/cigma/trunk/build/m4/cigma_python.m4 2008-02-04 22:19:34 UTC (rev 9217)
@@ -1,42 +0,0 @@
-##############################################################################
-# -*- Autoconf -*-
-#
-#
-
-##############################################################################
-#
-# CIGMA_PATH_PYTHON
-#
-# Determine the directories containing <Python.h> and <numpy/arrayobject.h>
-#
-AC_DEFUN([CIGMA_PATH_PYTHON],[
-
- AC_REQUIRE([AM_PATH_PYTHON])
-
- AC_CACHE_CHECK([for $am_display_PYTHON include directory],
- [PYTHON_INCDIR],
- [PYTHON_INCDIR=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()" 2>/dev/null || echo "$PYTHON_PREFIX/include/python$PYTHON_VERSION"`])
-
- #AC_MSG_CHECKING([for $am_display_PYTHON numpy include directory])
-
- NUMPY_INCDIR=`$PYTHON -c "import numpy; print numpy.get_include()" 2>/dev/null`
- if [[ -n "$NUMPY_INCDIR" ]]; then
- AC_CHECK_FILE([$NUMPY_INCDIR/numpy/arrayobject.h])
- #AC_CHECK_FILE([$NUMPY_INCDIR/numpy/arrayobject.h], [numpyFound="OK"])
- #if [[ -n "$numpyFound" ]]; then
- # AC_MSG_RESULT([yes])
- #else
- # AC_MSG_RESULT([no])
- #fi
- #else
- # AC_MSG_RESULT([no])
- fi
-
- PYTHON_INCLUDES="-I${PYTHON_INCDIR} -I${NUMPY_INCDIR}"
- PYTHON_LIBS="-lpython${PYTHON_VERSION}"
- PYTHON_LDFLAGS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/config"
-
-])
-
-
-# vim: syntax=config
Deleted: cs/benchmark/cigma/trunk/build/m4/cigma_vtk.m4
===================================================================
--- cs/benchmark/cigma/trunk/build/m4/cigma_vtk.m4 2008-02-04 20:40:45 UTC (rev 9216)
+++ cs/benchmark/cigma/trunk/build/m4/cigma_vtk.m4 2008-02-04 22:19:34 UTC (rev 9217)
@@ -1,158 +0,0 @@
-##############################################################################
-# -*- Autoconf -*-
-#
-# Implements the AM_OPTIONS_VTK and AM_PATH_VTK macros.
-# The AM_OPTIONS_VTK macro adds the --with-vtk=path option,
-# and the AM_PATH_VTK macro is used to detect VTK presence,
-# location and version.
-#
-# Modified from http://www.vtk.org/Wiki/VTK_Autoconf
-# Originally by Francesco Montorsi
-#
-
-
-##############################################################################
-#
-# CIGMA_OPTIONS_VTK
-#
-# Adds the --with-vtk=PATH option to the configure options
-#
-AC_DEFUN([CIGMA_OPTIONS_VTK],[
- AC_ARG_WITH([vtk],
- [AC_HELP_STRING(
- [--with-vtk],
- [The prefix where VTK is installed (default is /usr)])],
- [with_vtk=$withval],
- [with_vtk="/usr"])
- AC_ARG_WITH([vtk-version],
- [AC_HELP_STRING(
- [--with-vtk-version],
- [VTK's include directory name is vtk-suffix, e.g., vtk-5.0/.
- What's the suffix? (Default -5.0)])],
- [vtk_suffix=$withval],
- [vtk_suffix="-5.0"])
-])
-
-##############################################################################
-#
-# AM_PATH_VTK([minimum-version], [action-if-found], [action-if-not-found])
-#
-# NOTE: [minimum-version] must be in the form [X.Y.Z]
-#
-AC_DEFUN([AM_PATH_VTK],[
-
- dnl do we want to check for VTK?
- if [[ $with_vtk = "yes" ]]; then
- dnl in case user wrote --with-vtk=yes
- with_vtk="/usr/local"
- fi
-
- if [[ $with_vtk != "no" ]]; then
-
- VTK_PREFIX="$with_vtk"
-
- AC_CHECK_FILE([$VTK_PREFIX/include/vtk$vtk_suffix/vtkCommonInstantiator.h],
- [vtkFound="OK"])
- AC_MSG_CHECKING([if VTK is installed in $VTK_PREFIX])
-
- if [[ -z "$vtkFound" ]]; then
-
- dnl VTK not found!
- AC_MSG_RESULT([no])
- $3
-
- else
-
- dnl VTK found!
- AC_MSG_RESULT([yes])
-
- dnl these are the VTK libraries of a default build
- VTK_LIBS="-lvtkCommon -lvtkIO -lvtkFiltering"
-
- dnl set VTK c,cpp,ld flags
- VTK_CFLAGS="-I$VTK_PREFIX/include/vtk$vtk_suffix"
- VTK_CXXFLAGS="$VTK_CFLAGS"
- VTK_INCLUDES="-I$VTK_PREFIX/include/vtk$vtk_suffix"
- VTK_LDFLAGS="-L$VTK_PREFIX/lib/vtk $VTK_LIBS"
-
- dnl now, eventually check version
- if [[ -n "$1" ]]; then
-
- dnl the version of VTK we need
- maj=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- min=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- rel=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- AC_MSG_CHECKING([if VTK version is at least $maj.$min.$rel])
-
- dnl in order to be able to compile the following test program,
- dnl we need to add to the current flags, the VTK settings...
- OLD_CFLAGS=$CFLAGS
- OLD_CXXFLAGS=$CXXFLAGS
- OLD_LDFLAGS=$LDFLAGS
- CFLAGS="$VTK_CFLAGS $CFLAGS"
- CXXFLAGS="$VTK_CXXFLAGS $CXXFLAGS"
- LDFLAGS="$VTK_LDFLAGS $LDFLAGS"
-
- dnl check if the installed VTK is greater or not
- AC_COMPILE_IFELSE([
- AC_LANG_PROGRAM([
- #include <vtk/vtkConfigure.h>
- #include <stdio.h>
- ],[
- printf("VTK version is: %d.%d.%d",
- VTK_MAJOR_VERSION,
- VTK_MINOR_VERSION,
- VTK_BUILD_VERSION);
-
- #if VTK_MAJOR_VERSION < $maj
- #error Installed VTK is too old!
- #endif
-
- #if VTK_MINOR_VERSION < $min
- #error Installed VTK is too old!
- #endif
-
- #if VTK_BUILD_VERSION < $rel
- #error Installed VTK is too old!
- #endif
- ])
- ], [vtkVersion="OK"])
-
- if [[ "$vtkVersion" = "OK" ]]; then
-
- AC_MSG_RESULT([yes])
-
- $2
-
- else
-
- AC_MSG_RESULT([no])
-
- dnl restore all flags without VTK values
- CFLAGS=$OLD_CFLAGS
- CXXFLAGS=$OLD_CXXFLAGS
- LDFLAGS=$OLD_LDFLAGS
-
- $3
- fi # if [[ $vtkVersion = "OK ]];
-
- else
-
- dnl if we don't have to check for minimum version
- dnl (because the user did not set that option),
- dnl then we can execute here the block action-if-found
- CFLAGS="$VTK_CFLAGS $CFLAGS"
- CXXFLAGS="$VTK_CXXFLAGS $CXXFLAGS"
- LDFLAGS="$VTK_LDFLAGS $LDFLAGS"
-
- $2
-
- fi #if [[ -n "$1" ]];
-
- fi # if [[ -z "$vtkFound" ]];
- fi # $with_vtk != "no"
-])
-
-
-
-# vim: syntax=config
Deleted: cs/benchmark/cigma/trunk/build/m4/cigma_zlib.m4
===================================================================
--- cs/benchmark/cigma/trunk/build/m4/cigma_zlib.m4 2008-02-04 20:40:45 UTC (rev 9216)
+++ cs/benchmark/cigma/trunk/build/m4/cigma_zlib.m4 2008-02-04 22:19:34 UTC (rev 9217)
@@ -1,56 +0,0 @@
-##############################################################################
-# -*- Autoconf -*-
-#
-# ZLIB is needed for compiling HDF5
-#
-
-##############################################################################
-#
-# CIGMA_OPTIONS_ZLIB
-#
-AC_DEFUN([CIGMA_OPTIONS_ZLIB], [
- AC_ARG_WITH([zlib],
- [AC_HELP_STRING([--with-zlib],
- [The prefix where zlib is installed @<:@default=/usr@:>@])],
- [with_zlib="$withval"],
- [with_zlib="/usr"])
-])
-
-##############################################################################
-#
-# CIGMA_PATH_ZLIB([action-if-found], [action-if-not-found])
-#
-AC_DEFUN([CIGMA_PATH_ZLIB],[
-
-
- dnl Check for zlib
-
- if [[ $with_zlib = "yes" ]]; then
- dnl In case user wrote --with-zlib=yes
- with_zlib="/usr"
- fi
-
- if [[ $with_zlib="no" ]]; then
-
- ZLIB_PREFIX="$with_zlib"
-
- AC_CHECK_LIB(z,main,[zlibFound="OK"])
-
- if [[ -n "$zlibFound" ]]; then
- ZLIB_LIBS="-lz"
- ZLIB_CFLAGS="-I$ZLIB_PREFIX/include -I$ZLIB_PREFIX"
- ZLIB_LDFLAGS="-L$ZLIB_PREFIX/lib -L$ZLIB_PREFIX"
- fi
-
- else
- dnl ZLIB not specified...fail?
- /bin/false
- fi
-
- AC_SUBST(ZLIB_LIBS)
- AC_SUBST(ZLIB_CFLAGS)
- AC_SUBST(ZLIB_LDFLAGS)
-
-])
-
-# vim: syntax=config
Deleted: cs/benchmark/cigma/trunk/build/variables.in
===================================================================
--- cs/benchmark/cigma/trunk/build/variables.in 2008-02-04 20:40:45 UTC (rev 9216)
+++ cs/benchmark/cigma/trunk/build/variables.in 2008-02-04 22:19:34 UTC (rev 9217)
@@ -1,59 +0,0 @@
-# OS
-UNAME=@UNAME@
-
-# The names of the C and C++ compilers
-CC=@CC@
-CXX=@CXX@
-
-# If you need to link to dynamic libraries installed in non-standard
-# locations and are using the GNU linker, you may want to add
-# '-Wl,--rpath,/path/to/dynamic/library' to the 'LINKER' variable
-# below. Alternatively, you could edit the 'LD_LIBRARY_PATH'
-# environment variable or use the 'ldconfig' program.
-LINKER=@LINKER@
-
-# All compiler flags except optimization flags
-FLAGS=@FLAGS@
-
-# Compiler optimization flags
-OPTIM=@OPTIM@
-
-# Cigma subdirectories and libraries
-CIGMA_DIRS=@CIGMA_DIRS@
-CIGMA_LIBS=@CIGMA_LIBS@
-
-# Python
-PYTHON_INCLUDES = @PYTHON_INCLUDES@
-PYTHON_LIBS = @PYTHON_LIBS@
-PYTHON_LDFLAGS = @PYTHON_LDFLAGS@
-
-# VTK
-VTK_INCLUDES = @VTK_INCLUDES@
-VTK_LIBS = @VTK_LIBS@
-VTK_LDFLAGS = @VTK_LDFLAGS@
-
-# HDF5
-HDF5_INCLUDES = @HDF5_INCLUDES@
-HDF5_LIBS = @HDF5_LIBS@
-HDF5_LDFLAGS = @HDF5_LDFLAGS@
-
-
-# How you create a static library on this machine
-AR=@AR@
-RANLIB=@RANLIB@
-
-# The extension to use for executables...
-EXEEXT=@EXEEXT@
-
-# Installation directories
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-datarootdir=@datarootdir@
-datadir=@datadir@
-includedir=@includedir@
-libdir=@libdir@
-mandir=@mandir@
-infodir=@infodir@
-
-# vim:syntax=make
Copied: cs/benchmark/cigma/trunk/configure.ac (from rev 9211, cs/benchmark/cigma/trunk/build/configure.ac)
===================================================================
--- cs/benchmark/cigma/trunk/configure.ac (rev 0)
+++ cs/benchmark/cigma/trunk/configure.ac 2008-02-04 22:19:34 UTC (rev 9217)
@@ -0,0 +1,107 @@
+AC_PREREQ(2.59)
+AC_INIT([Cigma], [0.9.1], [cig-cs at geodynamics.org], [cigma])
+AC_CONFIG_AUX_DIR([./aux-config])
+AC_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE([foreign])
+
+
+
+CIGMA_OPTIONS_ZLIB
+CIGMA_OPTIONS_HDF5
+CIGMA_OPTIONS_VTK
+
+
+
+dnl Get the operating system name
+UNAME=`uname`
+
+dnl Check for default compilers
+AC_PROG_CC
+AC_PROG_CXX
+if test "x${CC}" = "x" -o "x${CXX}" = "x"; then
+ AC_MSG_ERROR([Could not find required compilers, aborting.])
+fi
+LINKER="${CXX}"
+
+dnl Use C++ for all compilation tests
+AC_LANG(C++)
+
+dnl Set default flags
+FLAGS="-Wall"
+OPTIM="-g -O2"
+
+dnl Check for various programs
+AC_PROG_CPP
+
+dnl How to build static libraries?
+case "$UNAME" in
+ Darwin*)
+ AR="libtool -o"
+ RANLIB=true
+ ;;
+ *)
+ AC_PROG_RANLIB
+ AC_PATH_PROG(AR, ar)
+ if test "x${AR}" = "x"; then
+ AC_MSG_ERROR([Could not find the library archiver, aborting.])
+ fi
+ AR="${AR} ruvs"
+ ;;
+esac
+
+dnl See if we need a .exe extension on executables
+AC_EXEEXT
+
+
+dnl Check for standard math library
+AC_CHECK_LIB(m,main)
+
+
+dnl Check for the python include directories
+CIGMA_PATH_PYTHON
+
+dnl Check for zlib and hdf5
+CIGMA_PATH_ZLIB
+CIGMA_PATH_HDF5
+
+dnl Check for vtk-5.0
+AM_PATH_VTK
+
+
+
+dnl Write output
+AC_SUBST(UNAME)
+AC_SUBST(FLAGS)
+AC_SUBST(OPTIM)
+AC_SUBST(LINKER)
+AC_SUBST(CIGMA_DIRS)
+AC_SUBST(CIGMA_LIBS)
+AC_SUBST(AR)
+
+AC_SUBST(VTK_INCLUDES)
+AC_SUBST(VTK_LIBS)
+AC_SUBST(VTK_LDFLAGS)
+
+AC_SUBST(HDF5_INCLUDES)
+AC_SUBST(HDF5_LIBS)
+AC_SUBST(HDF5_LDFLAGS)
+
+AC_SUBST(PYTHON_INCLUDES)
+AC_SUBST(PYTHON_LIBS)
+AC_SUBST(PYTHON_LDFLAGS)
+
+AC_CONFIG_FILES([Makefile variables])
+
+AC_OUTPUT
+
+
+dnl Print some information
+echo "********************************************************************"
+echo "Cigma is configured for"
+echo "- OS : $UNAME"
+echo "- C compiler : $CC"
+echo "- C++ compiler : $CXX"
+echo "- Linker : $LINKER"
+echo "- Optimization : $OPTIM"
+echo "- Options : $FLAGS"
Copied: cs/benchmark/cigma/trunk/m4/cigma_hdf5.m4 (from rev 9211, cs/benchmark/cigma/trunk/build/m4/cigma_hdf5.m4)
===================================================================
--- cs/benchmark/cigma/trunk/m4/cigma_hdf5.m4 (rev 0)
+++ cs/benchmark/cigma/trunk/m4/cigma_hdf5.m4 2008-02-04 22:19:34 UTC (rev 9217)
@@ -0,0 +1,75 @@
+##############################################################################
+# -*- Autoconf -*-
+#
+#
+
+##############################################################################
+#
+# CIGMA_OPTIONS_HDF5
+#
+AC_DEFUN([CIGMA_OPTIONS_HDF5], [
+ AC_ARG_VAR(HDF5_HOME, [home path to HDF5 library])
+ AC_ARG_WITH([hdf5],
+ [AC_HELP_STRING([--with-hdf5],
+ [The prefix where HDF5 is installed @<:@default=/usr@:>@])],
+ [with_hdf5="$withval"],
+ [with_hdf5="/usr"])
+])
+
+##############################################################################
+#
+# CIGMA_PATH_HDF5([action-if-found], [action-if-not-found])
+#
+AC_DEFUN([CIGMA_PATH_HDF5],[
+
+ # AC_REQUIRE([CIGMA_PATH_ZLIB])
+
+
+ if [[ $with_hdf5 = "yes" ]]; then
+ dnl In case user wrote --with-hdf5=yes
+ with_hdf5="/usr"
+ fi
+
+
+ if [[ $with_hdf5 != "no" ]]; then
+
+ HDF5_PREFIX="$with_hdf5"
+
+ AC_CHECK_FILE([$HDF5_PREFIX/include/hdf5.h], [hdf5Found="OK"])
+ AC_MSG_CHECKING([if HDF5 is installed in $HDF5_PREFIX])
+
+ if [[ -z "$hdf5Found" ]]; then
+
+ dnl HDF5 not found!
+ AC_MSG_RESULT([no])
+ $3
+
+ else
+
+ dnl HDF5 found!
+
+ AC_MSG_RESULT([yes])
+
+ AC_CHECK_LIB(hdf5,main,[hdf5lib="OK"])
+
+ #HDF5_CFLAGS="-I$HDF5_PREFIX/include"
+ #HDF5_CXXFLAGS="$HDF5_CFLAGS"
+
+ HDF5_INCLUDES="-I$HDF5_PREFIX/include"
+ HDF5_LIBS="-lhdf5"
+ HDF5_LDFLAGS="-L$HDF5_PREFIX/lib $HDF5_LIBS -Wl,--rpath -Wl,$HDF5_PREFIX/lib"
+ $2
+
+ fi
+
+ else
+
+ dnl user specified --with-hdf5=no
+ dnl nothing to do?
+ /bin/false
+
+ fi
+
+])
+
+# vim: syntax=config
Copied: cs/benchmark/cigma/trunk/m4/cigma_python.m4 (from rev 9211, cs/benchmark/cigma/trunk/build/m4/cigma_python.m4)
===================================================================
--- cs/benchmark/cigma/trunk/m4/cigma_python.m4 (rev 0)
+++ cs/benchmark/cigma/trunk/m4/cigma_python.m4 2008-02-04 22:19:34 UTC (rev 9217)
@@ -0,0 +1,42 @@
+##############################################################################
+# -*- Autoconf -*-
+#
+#
+
+##############################################################################
+#
+# CIGMA_PATH_PYTHON
+#
+# Determine the directories containing <Python.h> and <numpy/arrayobject.h>
+#
+AC_DEFUN([CIGMA_PATH_PYTHON],[
+
+ AC_REQUIRE([AM_PATH_PYTHON])
+
+ AC_CACHE_CHECK([for $am_display_PYTHON include directory],
+ [PYTHON_INCDIR],
+ [PYTHON_INCDIR=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()" 2>/dev/null || echo "$PYTHON_PREFIX/include/python$PYTHON_VERSION"`])
+
+ #AC_MSG_CHECKING([for $am_display_PYTHON numpy include directory])
+
+ NUMPY_INCDIR=`$PYTHON -c "import numpy; print numpy.get_include()" 2>/dev/null`
+ if [[ -n "$NUMPY_INCDIR" ]]; then
+ AC_CHECK_FILE([$NUMPY_INCDIR/numpy/arrayobject.h])
+ #AC_CHECK_FILE([$NUMPY_INCDIR/numpy/arrayobject.h], [numpyFound="OK"])
+ #if [[ -n "$numpyFound" ]]; then
+ # AC_MSG_RESULT([yes])
+ #else
+ # AC_MSG_RESULT([no])
+ #fi
+ #else
+ # AC_MSG_RESULT([no])
+ fi
+
+ PYTHON_INCLUDES="-I${PYTHON_INCDIR} -I${NUMPY_INCDIR}"
+ PYTHON_LIBS="-lpython${PYTHON_VERSION}"
+ PYTHON_LDFLAGS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/config"
+
+])
+
+
+# vim: syntax=config
Copied: cs/benchmark/cigma/trunk/m4/cigma_vtk.m4 (from rev 9211, cs/benchmark/cigma/trunk/build/m4/cigma_vtk.m4)
===================================================================
--- cs/benchmark/cigma/trunk/m4/cigma_vtk.m4 (rev 0)
+++ cs/benchmark/cigma/trunk/m4/cigma_vtk.m4 2008-02-04 22:19:34 UTC (rev 9217)
@@ -0,0 +1,158 @@
+##############################################################################
+# -*- Autoconf -*-
+#
+# Implements the AM_OPTIONS_VTK and AM_PATH_VTK macros.
+# The AM_OPTIONS_VTK macro adds the --with-vtk=path option,
+# and the AM_PATH_VTK macro is used to detect VTK presence,
+# location and version.
+#
+# Modified from http://www.vtk.org/Wiki/VTK_Autoconf
+# Originally by Francesco Montorsi
+#
+
+
+##############################################################################
+#
+# CIGMA_OPTIONS_VTK
+#
+# Adds the --with-vtk=PATH option to the configure options
+#
+AC_DEFUN([CIGMA_OPTIONS_VTK],[
+ AC_ARG_WITH([vtk],
+ [AC_HELP_STRING(
+ [--with-vtk],
+ [The prefix where VTK is installed (default is /usr)])],
+ [with_vtk=$withval],
+ [with_vtk="/usr"])
+ AC_ARG_WITH([vtk-version],
+ [AC_HELP_STRING(
+ [--with-vtk-version],
+ [VTK's include directory name is vtk-suffix, e.g., vtk-5.0/.
+ What's the suffix? (Default -5.0)])],
+ [vtk_suffix=$withval],
+ [vtk_suffix="-5.0"])
+])
+
+##############################################################################
+#
+# AM_PATH_VTK([minimum-version], [action-if-found], [action-if-not-found])
+#
+# NOTE: [minimum-version] must be in the form [X.Y.Z]
+#
+AC_DEFUN([AM_PATH_VTK],[
+
+ dnl do we want to check for VTK?
+ if [[ $with_vtk = "yes" ]]; then
+ dnl in case user wrote --with-vtk=yes
+ with_vtk="/usr/local"
+ fi
+
+ if [[ $with_vtk != "no" ]]; then
+
+ VTK_PREFIX="$with_vtk"
+
+ AC_CHECK_FILE([$VTK_PREFIX/include/vtk$vtk_suffix/vtkCommonInstantiator.h],
+ [vtkFound="OK"])
+ AC_MSG_CHECKING([if VTK is installed in $VTK_PREFIX])
+
+ if [[ -z "$vtkFound" ]]; then
+
+ dnl VTK not found!
+ AC_MSG_RESULT([no])
+ $3
+
+ else
+
+ dnl VTK found!
+ AC_MSG_RESULT([yes])
+
+ dnl these are the VTK libraries of a default build
+ VTK_LIBS="-lvtkCommon -lvtkIO -lvtkFiltering"
+
+ dnl set VTK c,cpp,ld flags
+ VTK_CFLAGS="-I$VTK_PREFIX/include/vtk$vtk_suffix"
+ VTK_CXXFLAGS="$VTK_CFLAGS"
+ VTK_INCLUDES="-I$VTK_PREFIX/include/vtk$vtk_suffix"
+ VTK_LDFLAGS="-L$VTK_PREFIX/lib/vtk $VTK_LIBS"
+
+ dnl now, eventually check version
+ if [[ -n "$1" ]]; then
+
+ dnl the version of VTK we need
+ maj=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ min=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ rel=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ AC_MSG_CHECKING([if VTK version is at least $maj.$min.$rel])
+
+ dnl in order to be able to compile the following test program,
+ dnl we need to add to the current flags, the VTK settings...
+ OLD_CFLAGS=$CFLAGS
+ OLD_CXXFLAGS=$CXXFLAGS
+ OLD_LDFLAGS=$LDFLAGS
+ CFLAGS="$VTK_CFLAGS $CFLAGS"
+ CXXFLAGS="$VTK_CXXFLAGS $CXXFLAGS"
+ LDFLAGS="$VTK_LDFLAGS $LDFLAGS"
+
+ dnl check if the installed VTK is greater or not
+ AC_COMPILE_IFELSE([
+ AC_LANG_PROGRAM([
+ #include <vtk/vtkConfigure.h>
+ #include <stdio.h>
+ ],[
+ printf("VTK version is: %d.%d.%d",
+ VTK_MAJOR_VERSION,
+ VTK_MINOR_VERSION,
+ VTK_BUILD_VERSION);
+
+ #if VTK_MAJOR_VERSION < $maj
+ #error Installed VTK is too old!
+ #endif
+
+ #if VTK_MINOR_VERSION < $min
+ #error Installed VTK is too old!
+ #endif
+
+ #if VTK_BUILD_VERSION < $rel
+ #error Installed VTK is too old!
+ #endif
+ ])
+ ], [vtkVersion="OK"])
+
+ if [[ "$vtkVersion" = "OK" ]]; then
+
+ AC_MSG_RESULT([yes])
+
+ $2
+
+ else
+
+ AC_MSG_RESULT([no])
+
+ dnl restore all flags without VTK values
+ CFLAGS=$OLD_CFLAGS
+ CXXFLAGS=$OLD_CXXFLAGS
+ LDFLAGS=$OLD_LDFLAGS
+
+ $3
+ fi # if [[ $vtkVersion = "OK ]];
+
+ else
+
+ dnl if we don't have to check for minimum version
+ dnl (because the user did not set that option),
+ dnl then we can execute here the block action-if-found
+ CFLAGS="$VTK_CFLAGS $CFLAGS"
+ CXXFLAGS="$VTK_CXXFLAGS $CXXFLAGS"
+ LDFLAGS="$VTK_LDFLAGS $LDFLAGS"
+
+ $2
+
+ fi #if [[ -n "$1" ]];
+
+ fi # if [[ -z "$vtkFound" ]];
+ fi # $with_vtk != "no"
+])
+
+
+
+# vim: syntax=config
Copied: cs/benchmark/cigma/trunk/m4/cigma_zlib.m4 (from rev 9211, cs/benchmark/cigma/trunk/build/m4/cigma_zlib.m4)
===================================================================
--- cs/benchmark/cigma/trunk/m4/cigma_zlib.m4 (rev 0)
+++ cs/benchmark/cigma/trunk/m4/cigma_zlib.m4 2008-02-04 22:19:34 UTC (rev 9217)
@@ -0,0 +1,56 @@
+##############################################################################
+# -*- Autoconf -*-
+#
+# ZLIB is needed for compiling HDF5
+#
+
+##############################################################################
+#
+# CIGMA_OPTIONS_ZLIB
+#
+AC_DEFUN([CIGMA_OPTIONS_ZLIB], [
+ AC_ARG_WITH([zlib],
+ [AC_HELP_STRING([--with-zlib],
+ [The prefix where zlib is installed @<:@default=/usr@:>@])],
+ [with_zlib="$withval"],
+ [with_zlib="/usr"])
+])
+
+##############################################################################
+#
+# CIGMA_PATH_ZLIB([action-if-found], [action-if-not-found])
+#
+AC_DEFUN([CIGMA_PATH_ZLIB],[
+
+
+ dnl Check for zlib
+
+ if [[ $with_zlib = "yes" ]]; then
+ dnl In case user wrote --with-zlib=yes
+ with_zlib="/usr"
+ fi
+
+ if [[ $with_zlib="no" ]]; then
+
+ ZLIB_PREFIX="$with_zlib"
+
+ AC_CHECK_LIB(z,main,[zlibFound="OK"])
+
+ if [[ -n "$zlibFound" ]]; then
+ ZLIB_LIBS="-lz"
+ ZLIB_CFLAGS="-I$ZLIB_PREFIX/include -I$ZLIB_PREFIX"
+ ZLIB_LDFLAGS="-L$ZLIB_PREFIX/lib -L$ZLIB_PREFIX"
+ fi
+
+ else
+ dnl ZLIB not specified...fail?
+ /bin/false
+ fi
+
+ AC_SUBST(ZLIB_LIBS)
+ AC_SUBST(ZLIB_CFLAGS)
+ AC_SUBST(ZLIB_LDFLAGS)
+
+])
+
+# vim: syntax=config
Deleted: cs/benchmark/cigma/trunk/src/Makefile
===================================================================
--- cs/benchmark/cigma/trunk/src/Makefile 2008-02-04 20:40:45 UTC (rev 9216)
+++ cs/benchmark/cigma/trunk/src/Makefile 2008-02-04 22:19:34 UTC (rev 9217)
@@ -1,99 +0,0 @@
-include ../build/variables
-
-FLAGS = -Wall -Wno-deprecated
-FLAGS += -g
-
-INCLUDES += $(PYTHON_INCLUDES)
-INCLUDES += $(VTK_INCLUDES)
-INCLUDES += $(HDF5_INCLUDES)
-INCLUDES += -I./h5io
-INCLUDES += -I./ann/include
-
-FLAGS += $(INCLUDES)
-
-LDFLAGS += $(VTK_LDFLAGS) $(VTK_LIBS)
-LDFLAGS += $(PYTHON_LDFLAGS) $(PYTHON_LIBS)
-LDFLAGS += $(HDF5_LDFLAGS) $(HDF5_LIBS)
-
-ANNLIB = ../lib/libann.a
-H5IOLIB = ../lib/libh5io.a
-TARGETLIB = ../lib/libcigma.a
-TESTLIB = ../lib/libcigma_d.a
-
-OBJS = \
- Numeric.o \
- Cell.o \
- Tri.o \
- Quad.o \
- Tet.o \
- Hex.o \
- Points.o \
- Quadrature.o \
- FiatProxy.o \
- MeshPart.o \
- CubeMeshPart.o \
- DofHandler.o \
- FE.o \
- Field.o \
- FE_Field.o \
- ExternalField.o \
- Reader.o \
- HdfReader.o \
- TextReader.o \
- VtkReader.o \
- Writer.o \
- HdfWriter.o \
- TextWriter.o \
- VtkWriter.o \
- AnyOption.o \
- StringUtils.o \
- Command.o \
- CommandSet.o \
- SkelCmd.o \
- HelpCmd.o \
- ExtractCmd.o \
- EvalCmd.o \
- CompareCmd.o \
- CubeCmd.o \
- Misc.o \
- Locator.o \
- AnnLocator.o \
-
-
-default: libann libh5io testlib cigma vtkls tests
-
-%.o: %.cpp
- $(CXX) $(FLAGS) -c $^
-
-testlib: $(TESTLIB)
-
-libh5io:
- cd h5io && make
-
-libann:
- cd ann && make
-
-$(TESTLIB): $(OBJS)
- rm -f $@
- $(AR) $@ $(OBJS)
- $(RANLIB) $@
-
-cigma: cigma.o $(TESTLIB) $(H5IOLIB) $(ANNLIB)
- $(CXX) $(LDFLAGS) $^ -o $@
-
-vtkls: vtkls.o $(TESTLIB)
- $(CXX) $(LDFLAGS) $^ -o $@
-
-tests: $(TESTLIB)
- cd tests/ && make
-
-clean:
- rm -f $(OBJS) cigma.o vtkls.o
- cd tests && make clean
-
-purge: clean
- cd ../lib && make clean
- cd h5io && make clean
- cd ann && make clean
-
-.PHONY: clean purge tests libann libh5io
Copied: cs/benchmark/cigma/trunk/src/Makefile.am (from rev 9211, cs/benchmark/cigma/trunk/src/Makefile)
===================================================================
--- cs/benchmark/cigma/trunk/src/Makefile.am (rev 0)
+++ cs/benchmark/cigma/trunk/src/Makefile.am 2008-02-04 22:19:34 UTC (rev 9217)
@@ -0,0 +1,99 @@
+include ../build/variables
+
+FLAGS = -Wall -Wno-deprecated
+FLAGS += -g
+
+INCLUDES += $(PYTHON_INCLUDES)
+INCLUDES += $(VTK_INCLUDES)
+INCLUDES += $(HDF5_INCLUDES)
+INCLUDES += -I./h5io
+INCLUDES += -I./ann/include
+
+FLAGS += $(INCLUDES)
+
+LDFLAGS += $(VTK_LDFLAGS) $(VTK_LIBS)
+LDFLAGS += $(PYTHON_LDFLAGS) $(PYTHON_LIBS)
+LDFLAGS += $(HDF5_LDFLAGS) $(HDF5_LIBS)
+
+ANNLIB = ../lib/libann.a
+H5IOLIB = ../lib/libh5io.a
+TARGETLIB = ../lib/libcigma.a
+TESTLIB = ../lib/libcigma_d.a
+
+OBJS = \
+ Numeric.o \
+ Cell.o \
+ Tri.o \
+ Quad.o \
+ Tet.o \
+ Hex.o \
+ Points.o \
+ Quadrature.o \
+ FiatProxy.o \
+ MeshPart.o \
+ CubeMeshPart.o \
+ DofHandler.o \
+ FE.o \
+ Field.o \
+ FE_Field.o \
+ ExternalField.o \
+ Reader.o \
+ HdfReader.o \
+ TextReader.o \
+ VtkReader.o \
+ Writer.o \
+ HdfWriter.o \
+ TextWriter.o \
+ VtkWriter.o \
+ AnyOption.o \
+ StringUtils.o \
+ Command.o \
+ CommandSet.o \
+ SkelCmd.o \
+ HelpCmd.o \
+ ExtractCmd.o \
+ EvalCmd.o \
+ CompareCmd.o \
+ CubeCmd.o \
+ Misc.o \
+ Locator.o \
+ AnnLocator.o \
+
+
+default: libann libh5io testlib cigma vtkls tests
+
+%.o: %.cpp
+ $(CXX) $(FLAGS) -c $^
+
+testlib: $(TESTLIB)
+
+libh5io:
+ cd h5io && make
+
+libann:
+ cd ann && make
+
+$(TESTLIB): $(OBJS)
+ rm -f $@
+ $(AR) $@ $(OBJS)
+ $(RANLIB) $@
+
+cigma: cigma.o $(TESTLIB) $(H5IOLIB) $(ANNLIB)
+ $(CXX) $(LDFLAGS) $^ -o $@
+
+vtkls: vtkls.o $(TESTLIB)
+ $(CXX) $(LDFLAGS) $^ -o $@
+
+tests: $(TESTLIB)
+ cd tests/ && make
+
+clean:
+ rm -f $(OBJS) cigma.o vtkls.o
+ cd tests && make clean
+
+purge: clean
+ cd ../lib && make clean
+ cd h5io && make clean
+ cd ann && make clean
+
+.PHONY: clean purge tests libann libh5io
Copied: cs/benchmark/cigma/trunk/variables.in (from rev 9211, cs/benchmark/cigma/trunk/build/variables.in)
===================================================================
--- cs/benchmark/cigma/trunk/variables.in (rev 0)
+++ cs/benchmark/cigma/trunk/variables.in 2008-02-04 22:19:34 UTC (rev 9217)
@@ -0,0 +1,59 @@
+# OS
+UNAME=@UNAME@
+
+# The names of the C and C++ compilers
+CC=@CC@
+CXX=@CXX@
+
+# If you need to link to dynamic libraries installed in non-standard
+# locations and are using the GNU linker, you may want to add
+# '-Wl,--rpath,/path/to/dynamic/library' to the 'LINKER' variable
+# below. Alternatively, you could edit the 'LD_LIBRARY_PATH'
+# environment variable or use the 'ldconfig' program.
+LINKER=@LINKER@
+
+# All compiler flags except optimization flags
+FLAGS=@FLAGS@
+
+# Compiler optimization flags
+OPTIM=@OPTIM@
+
+# Cigma subdirectories and libraries
+CIGMA_DIRS=@CIGMA_DIRS@
+CIGMA_LIBS=@CIGMA_LIBS@
+
+# Python
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_LIBS = @PYTHON_LIBS@
+PYTHON_LDFLAGS = @PYTHON_LDFLAGS@
+
+# VTK
+VTK_INCLUDES = @VTK_INCLUDES@
+VTK_LIBS = @VTK_LIBS@
+VTK_LDFLAGS = @VTK_LDFLAGS@
+
+# HDF5
+HDF5_INCLUDES = @HDF5_INCLUDES@
+HDF5_LIBS = @HDF5_LIBS@
+HDF5_LDFLAGS = @HDF5_LDFLAGS@
+
+
+# How you create a static library on this machine
+AR=@AR@
+RANLIB=@RANLIB@
+
+# The extension to use for executables...
+EXEEXT=@EXEEXT@
+
+# Installation directories
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+datarootdir=@datarootdir@
+datadir=@datadir@
+includedir=@includedir@
+libdir=@libdir@
+mandir=@mandir@
+infodir=@infodir@
+
+# vim:syntax=make
More information about the cig-commits
mailing list