[cig-commits] r5955 - in cs/benchmark/trunk: . benchmark benchmark/discretize benchmark/short/applications

[brad at geodynamics.org]

Author: brad
Date: 2007-02-02 14:54:56 -0800 (Fri, 02 Feb 2007)
New Revision: 5955

Modified:
   cs/benchmark/trunk/
   cs/benchmark/trunk/Makefile.am
   cs/benchmark/trunk/benchmark/CompareApp.py
   cs/benchmark/trunk/benchmark/ProjectionQuadPts.py
   cs/benchmark/trunk/benchmark/discretize/Tet4.py
   cs/benchmark/trunk/benchmark/short/applications/bm_create_projection.py
   cs/benchmark/trunk/benchmark/short/applications/femlabtoh5.py
   cs/benchmark/trunk/benchmark/short/applications/geofesttoh5.py
   cs/benchmark/trunk/benchmark/short/applications/okadaelastictoh5.py
   cs/benchmark/trunk/benchmark/short/applications/pylithtoh5.py
   cs/benchmark/trunk/configure.ac
Log:
Updated to use pythia egg.


Property changes on: cs/benchmark/trunk
___________________________________________________________________
Name: svn:externals
   + m4 http://geodynamics.org/svn/cig/cs/autoconf/trunk
archimedes  http://geodynamics.org/svn/cig/cs/merlin/branches/v1/merlin/archimedes


Modified: cs/benchmark/trunk/Makefile.am
===================================================================
--- cs/benchmark/trunk/Makefile.am	2007-02-02 21:21:04 UTC (rev 5954)
+++ cs/benchmark/trunk/Makefile.am	2007-02-02 22:54:56 UTC (rev 5955)
@@ -10,7 +10,16 @@
 # ----------------------------------------------------------------------
 #
 
+ACLOCAL_AMFLAGS = -I ./m4
+
 SUBDIRS = \
 	benchmark
 
+install-data-hook:
+	top_builddir=`$(am__cd) $(top_builddir) && pwd` && \
+		cd $(top_srcdir) && \
+		$(PYTHON) setup.py install_deps -H None -f $$top_builddir/deps --prefix=$(prefix) && \
+		$(PYTHON) setup.py egg_info -e $(pythondir)
+
+
 # End of file 

Modified: cs/benchmark/trunk/benchmark/CompareApp.py
===================================================================
--- cs/benchmark/trunk/benchmark/CompareApp.py	2007-02-02 21:21:04 UTC (rev 5954)
+++ cs/benchmark/trunk/benchmark/CompareApp.py	2007-02-02 22:54:56 UTC (rev 5955)
@@ -14,6 +14,9 @@
 
 ## @brief Python application to compare projected solutions.
 
+from pkg_resources import require
+require("pythia>=0.8")
+
 from pyre.applications.Script import Script
 
 # CompareApp class

Modified: cs/benchmark/trunk/benchmark/ProjectionQuadPts.py
===================================================================
--- cs/benchmark/trunk/benchmark/ProjectionQuadPts.py	2007-02-02 21:21:04 UTC (rev 5954)
+++ cs/benchmark/trunk/benchmark/ProjectionQuadPts.py	2007-02-02 22:54:56 UTC (rev 5955)
@@ -15,6 +15,9 @@
 ## @brief Python object for projecting solutions to element quadrature
 ## points. Projected solutions are stored in an HDF5 file.
 
+from pkg_resources import require
+require("pythia>=0.8")
+
 from pyre.components.Component import Component
 
 import numpy

Modified: cs/benchmark/trunk/benchmark/discretize/Tet4.py
===================================================================
--- cs/benchmark/trunk/benchmark/discretize/Tet4.py	2007-02-02 21:21:04 UTC (rev 5954)
+++ cs/benchmark/trunk/benchmark/discretize/Tet4.py	2007-02-02 22:54:56 UTC (rev 5955)
@@ -15,6 +15,9 @@
 ## @brief Python object describing interpolation and quadrature
 ## information for linear tetrahedral finite-element.
 
+from pkg_resources import require
+require("pythia>=0.8")
+
 from pyre.components.Component import Component
 
 # Tet4 class

Modified: cs/benchmark/trunk/benchmark/short/applications/bm_create_projection.py
===================================================================
--- cs/benchmark/trunk/benchmark/short/applications/bm_create_projection.py	2007-02-02 21:21:04 UTC (rev 5954)
+++ cs/benchmark/trunk/benchmark/short/applications/bm_create_projection.py	2007-02-02 22:54:56 UTC (rev 5955)
@@ -15,6 +15,9 @@
 ## @brief Python application to create projection and dump projection
 ## quadrature points to file.
 
+from pkg_resources import require
+require("pythia>=0.8")
+
 from pyre.applications.Script import Script
 
 # Creator class

Modified: cs/benchmark/trunk/benchmark/short/applications/femlabtoh5.py
===================================================================
--- cs/benchmark/trunk/benchmark/short/applications/femlabtoh5.py	2007-02-02 21:21:04 UTC (rev 5954)
+++ cs/benchmark/trunk/benchmark/short/applications/femlabtoh5.py	2007-02-02 22:54:56 UTC (rev 5955)
@@ -15,6 +15,9 @@
 ## @brief Python application to translate Femlab solution computed
 ## at projection quadrature points to HDF5 file.
 
+from pkg_resources import require
+require("pythia>=0.8")
+
 from pyre.applications.Script import Script
 import numpy
 from benchmark.tablewaiter import createGroup

Modified: cs/benchmark/trunk/benchmark/short/applications/geofesttoh5.py
===================================================================
--- cs/benchmark/trunk/benchmark/short/applications/geofesttoh5.py	2007-02-02 21:21:04 UTC (rev 5954)
+++ cs/benchmark/trunk/benchmark/short/applications/geofesttoh5.py	2007-02-02 22:54:56 UTC (rev 5955)
@@ -15,6 +15,9 @@
 ## @brief Python application to translate GeoFEST output from UCD
 ## format to HDF5.
 
+from pkg_resources import require
+require("pythia>=0.8")
+
 from pyre.applications.Script import Script
 import numpy
 

Modified: cs/benchmark/trunk/benchmark/short/applications/okadaelastictoh5.py
===================================================================
--- cs/benchmark/trunk/benchmark/short/applications/okadaelastictoh5.py	2007-02-02 21:21:04 UTC (rev 5954)
+++ cs/benchmark/trunk/benchmark/short/applications/okadaelastictoh5.py	2007-02-02 22:54:56 UTC (rev 5955)
@@ -15,6 +15,9 @@
 ## @brief Python application to translate analytical elastic solution computed
 ## using Okada at projection quadrature points to HDF5 file.
 
+from pkg_resources import require
+require("pythia>=0.8")
+
 from pyre.applications.Script import Script
 import numpy
 from benchmark.tablewaiter import createGroup

Modified: cs/benchmark/trunk/benchmark/short/applications/pylithtoh5.py
===================================================================
--- cs/benchmark/trunk/benchmark/short/applications/pylithtoh5.py	2007-02-02 21:21:04 UTC (rev 5954)
+++ cs/benchmark/trunk/benchmark/short/applications/pylithtoh5.py	2007-02-02 22:54:56 UTC (rev 5955)
@@ -15,6 +15,9 @@
 ## @brief Python application to translate PyLith output from UCD
 ## format to HDF5.
 
+from pkg_resources import require
+require("pythia>=0.8")
+
 from pyre.applications.Script import Script
 import numpy
 

Modified: cs/benchmark/trunk/configure.ac
===================================================================
--- cs/benchmark/trunk/configure.ac	2007-02-02 21:21:04 UTC (rev 5954)
+++ cs/benchmark/trunk/configure.ac	2007-02-02 22:54:56 UTC (rev 5955)
@@ -28,15 +28,10 @@
 
 # ----------------------------------------------------------------------
 # 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_SUBST([PYTHON_INCDIR], [$PYTHON_INCDIR])
+CIT_PYTHON_INCDIR
 
 # PYTHIA
-# TODO: Add test for Pythia components. We only use Python Pyre stuff,
-# so perhaps just try to import journal?
+CIT_PYTHON_EGG_SETUP
 
 # ----------------------------------------------------------------------
 AC_CONFIG_FILES([Makefile
@@ -45,7 +40,4 @@
 AC_OUTPUT
 
 
-# version
-# $Id$
-
 # End of file