[cig-commits] r20064 - short/3D/PyLith/pylith_installer/trunk
brad at geodynamics.org
brad at geodynamics.org
Thu May 10 11:19:04 PDT 2012
Author: brad
Date: 2012-05-10 11:19:04 -0700 (Thu, 10 May 2012)
New Revision: 20064
Modified:
short/3D/PyLith/pylith_installer/trunk/INSTALL
short/3D/PyLith/pylith_installer/trunk/Makefile.am
short/3D/PyLith/pylith_installer/trunk/README
short/3D/PyLith/pylith_installer/trunk/TODO
short/3D/PyLith/pylith_installer/trunk/configure.ac
Log:
Added h5py and cmake. Updated versions of many dependencies.
Modified: short/3D/PyLith/pylith_installer/trunk/INSTALL
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/INSTALL 2012-05-10 17:21:42 UTC (rev 20063)
+++ short/3D/PyLith/pylith_installer/trunk/INSTALL 2012-05-10 18:19:04 UTC (rev 20064)
@@ -23,7 +23,7 @@
yourself. Additionally, the installer provides the option of checking
out the PyLith and PETSc source code from the Subversion and Mercurial
repositories (requires subversion and mercurial be installed); only
-use this option if you want the bleeding edge versions and are willing
+use this option if you need the bleeding edge versions and are willing
to rebuild frequently.
@@ -118,14 +118,14 @@
Download the installer.
- http://www.geodynamics.org/cig/software/pylith/pylith-installer-1.6.3-2.tgz
+ http://www.geodynamics.org/cig/software/pylith/pylith-installer-1.7.0-0.tgz
Untar the source code for the installer:
mkdir -p $HOME/src/pylith
cd $HOME/src/pylith
- mv $HOME/Downloads/pylith-installer-1.6.3-2.tgz
- tar -zxf pylith-installer-1.6.3-2.tgz
+ mv $HOME/Downloads/pylith-installer-1.7.0-0.tgz
+ tar -zxf pylith-installer-1.7.0-0.tgz
----------------------------------------------------------------------
@@ -146,7 +146,7 @@
Run configure with --help to see all of the command line arguments.
- $HOME/src/pylith/pylith-installer-1.6.3-2/configure --help
+ $HOME/src/pylith/pylith-installer-1.7.0-0/configure --help
-------
DEFAULT
@@ -154,11 +154,11 @@
The default installation assumes you have
* C, C++, and Fortran compilers
- * Python 2.4 or later
+ * Python 2.6 or later
* MPI
mkdir -p $HOME/build/pylith
- $HOME/src/pylith/pylith-installer-1.6.3-2/configure \
+ $HOME/src/pylith/pylith-installer-1.7.0-0/configure \
--with-make-threads=2 \
--prefix=$HOME/pylith
@@ -168,11 +168,11 @@
The default installation assumes you have
* C, C++, and Fortran compilers
- * Python 2.4 or later
+ * Python 2.6 or later
* MPI
mkdir -p $HOME/build/pylith
- $HOME/src/pylith/pylith-installer-1.6.3-2/configure \
+ $HOME/src/pylith/pylith-installer-1.7.0-0/configure \
--with-fortran=no \
--with-make-threads=2 \
--petsc_options="--download-chaco=1 --download-c-blas-lapack=1" \
@@ -188,7 +188,7 @@
We assume you have
* C, C++, Fortran compilers
- * Python 2.4 or later
+ * Python 2.6 or later
* MPI
* NetCDF 3.6.2 or 4.1.1
* Proj4
@@ -196,7 +196,7 @@
* cppunit
mkdir -p $HOME/build/pylith
- $HOME/src/pylith/pylith-installer-1.6.3-2/configure \
+ $HOME/src/pylith/pylith-installer-1.7.0-0/configure \
--disable-cppunit \
--disable-numpy \
--disable-proj4 \
@@ -213,10 +213,10 @@
We assume you have
* C, C++, Fortran compilers
- * Python 2.4 or later
+ * Python 2.6 or later
mkdir -p $HOME/build/pylith
- $HOME/src/pylith/pylith-installer-1.6.3-2/configure \
+ $HOME/src/pylith/pylith-installer-1.7.0-0/configure \
--enable-mpi=openmpi \
--with-make-threads=2 \
--prefix=$HOME/pylith
@@ -236,10 +236,10 @@
We assume you have
* C/C++ compilers
- * Python 2.4 or later
+ * Python 2.6 or later
mkdir -p $HOME/build/pylith
- $HOME/src/pylith/pylith-installer-1.6.3-2/configure \
+ $HOME/src/pylith/pylith-installer-1.7.0-0/configure \
--enable-gcc=fortran \
--enable-mpi=openmpi \
--with-fetch=curl \
@@ -258,7 +258,7 @@
* MPI
mkdir -p $HOME/build/pylith
- $HOME/src/pylith/pylith-installer-1.6.3-2/configure \
+ $HOME/src/pylith/pylith-installer-1.7.0-0/configure \
--enable-python \
--with-make-threads=2 \
--prefix=$HOME/pylith
@@ -274,17 +274,17 @@
stable tree. To use another the development trunk, use
--with-pylith-svn=trunk; to specify another branch or tree use
--with-pylith-svn=BRANCH where BRANCH is the name of the branch
- (e.g., branches/v1.5-stable) in the SVN repository.
+ (e.g., branches/v1.7-stable) in the SVN repository.
We assume you have
* C, C++, Fortran compilers
- * Python 2.4 or later
+ * Python 2.6 or later
* MPI
* Subversion
* Mercurial
mkdir -p $HOME/build/pylith
- $HOME/src/pylith/pylith-installer-1.6.3-2/configure \
+ $HOME/src/pylith/pylith-installer-1.7.0-0/configure \
--with-pylith-svn=stable \
--with-make-threads=2 \
--prefix=$HOME/pylith
Modified: short/3D/PyLith/pylith_installer/trunk/Makefile.am
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/Makefile.am 2012-05-10 17:21:42 UTC (rev 20063)
+++ short/3D/PyLith/pylith_installer/trunk/Makefile.am 2012-05-10 18:19:04 UTC (rev 20064)
@@ -20,28 +20,28 @@
# ----------------------------------------------------------------------
# Package Versions
# ----------------------------------------------------------------------
-GCC_VER=4.5.2
+GCC_VER=4.6.3
MPC_VER=0.8.2
GMP_VER=4.3.2
MPFR_VER=2.4.2
-PYTHON_VER=2.6.6
+PYTHON_VER=2.7.3
-MPICH2_VER=1.3.2p1
-OPENMPI_VER=1.4.3
+MPICH2_VER=1.4.1p1
+OPENMPI_VER=1.4.5
CPPUNIT_VER=1.12.1
PCRE_VER=8.12
-SWIG_VER=2.0.2
+SWIG_VER=2.0.6
MERCURIAL_VER=1.8
NUMPY_VER=1.6.1-patched
-PROJ4_VER=4.7.0
+PROJ4_VER=4.8.0
NETCDF_VER=4.1.1
-HDF5_VER=1.8.6
+HDF5_VER=1.8.8
SCIENTIFICPYTHON_VER=2.9.1
FIAT_VER=0.9.9
@@ -49,12 +49,15 @@
PYTHIA_VER=0.8.1.14
NEMESIS_VER=1.0.2
+CMAKE_VER=2.8.8
+H5PY_VER=2.0.1
+
if USE_PYLITH_SVN
SPATIALDATA_VER=dev
PYLITH_VER=dev
else
SPATIALDATA_VER=1.8.1
-PYLITH_VER=1.6.3
+PYLITH_VER=1.7.0
endif
@@ -83,10 +86,12 @@
installed_proj \
installed_netcdf \
installed_hdf5 \
+ installed_h5py \
installed_fiat \
installed_pythia \
installed_nemesis \
installed_spatialdata \
+ installed_cmake \
installed_petsc \
installed_pylith
@@ -116,9 +121,11 @@
proj-$(PROJ4_VER) \
netcdf-$(NETCDF_VER) \
hdf5-$(HDF5_VER) \
+ h5py-$(H5PY_VER) \
spatialdata-$(SPATIALDATA_VER) \
pythia-$(PYTHIA_VER) \
nemesis-$(NEMESIS_VER) \
+ cmake-$(CMAKE_VER) \
pylith-$(PYLITH_VER)
@@ -141,9 +148,9 @@
# ----------------------------------------------------------------------
# Targets
# ----------------------------------------------------------------------
-all: installed_pylith
+all: installed_pylith installed_h5py
-rebuild-all: finished_mkdest compilers python mpi cppunit swig numpy proj4 netcdf hdf5 fiat nemesis spatialdata petsc pylith
+rebuild-all: finished_mkdest compilers python mpi cppunit swig numpy proj4 netcdf hdf5 h5py fiat nemesis spatialdata petsc pylith
# ----------------------------------------------------------------------
# Note on configure invocations
@@ -462,7 +469,6 @@
make -j $(make_threads) && \
make install && \
touch ../installed_hdf5
-
else
if WITH_HDF5
@echo "$@ already installed. Skipping installation."
@@ -479,6 +485,31 @@
# ----------------------------------------------------------------------
+# h5py
+# ----------------------------------------------------------------------
+h5py: installed_hdf5
+if INSTALL_H5PY
+ $(FETCH_SCRIPT) "$(downloader)" h5py-$(H5PY_VER).tar.gz http://geodynamics.org/~buildbot/deps
+ $(TAR) -zxf h5py-$(H5PY_VER).tar.gz
+ cd h5py-$(H5PY_VER) && \
+ CC=mpicc python setup.py build --hdf5=$(prefix) && \
+ python setup.py install --prefix=$(prefix)
+ touch ../installed_h5py
+else
+if WITH_H5PY
+ @echo "$@ already installed. Skipping installation."
+else
+ @echo "h5py option not requested. To enable h5py option, "
+ @echo "reconfigure with --enable-h5py (to install H5PY)."
+endif
+ touch installed_h5py
+endif
+
+installed_h5py:
+ $(MAKE) $(AM_MAKEFLAGS) h5py
+
+
+# ----------------------------------------------------------------------
# fiat
# ----------------------------------------------------------------------
fiat: installed_numpy
@@ -599,9 +630,28 @@
# ----------------------------------------------------------------------
+# cmake
+# ----------------------------------------------------------------------
+cmake:
+if INSTALL_CMAKE
+ $(FETCH_SCRIPT) "$(downloader)" cmake-$(CMAKE_VER).tar.gz http://geodynamics.org/~buildbot/deps
+ $(TAR) -zxf cmake-$(CMAKE_VER).tar.gz
+ cd cmake-$(CMAKE_VER) && \
+ ./bootstrap --prefix=$(prefix) && make && make install && \
+ touch ../installed_cmake
+else
+ @echo "Skipping $@ installation."
+ touch installed_cmake
+endif
+
+installed_cmake:
+ $(MAKE) $(AM_MAKEFLAGS) cmake
+
+
+# ----------------------------------------------------------------------
# petsc
# ----------------------------------------------------------------------
-petsc: installed_mpi installed_hdf5 installed_mercurial
+petsc: installed_mpi installed_hdf5 installed_mercurial installed_cmake
if INSTALL_PETSC
if WITH_HDF5
petsc_options += --with-hdf5=1
Modified: short/3D/PyLith/pylith_installer/trunk/README
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/README 2012-05-10 17:21:42 UTC (rev 20063)
+++ short/3D/PyLith/pylith_installer/trunk/README 2012-05-10 18:19:04 UTC (rev 20064)
@@ -1,4 +1,4 @@
-We are pleased to announce release of PyLith Installer version 1.6.3-2.
+We are pleased to announce release of PyLith Installer version 1.7.0-0.
Please submit bug reports via the World Wide Web at:
http://geodynamics.org/roundup
Modified: short/3D/PyLith/pylith_installer/trunk/TODO
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/TODO 2012-05-10 17:21:42 UTC (rev 20063)
+++ short/3D/PyLith/pylith_installer/trunk/TODO 2012-05-10 18:19:04 UTC (rev 20064)
@@ -1,4 +0,0 @@
-configure
-
- add ability to use cmake for building PETSc
-
Modified: short/3D/PyLith/pylith_installer/trunk/configure.ac
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/configure.ac 2012-05-10 17:21:42 UTC (rev 20063)
+++ short/3D/PyLith/pylith_installer/trunk/configure.ac 2012-05-10 18:19:04 UTC (rev 20064)
@@ -17,7 +17,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([PyLith Installer], [1.6.3-2], [cig-short at geodynamics.org])
+AC_INIT([PyLith Installer], [1.7.0-0], [cig-short at geodynamics.org])
AC_CONFIG_AUX_DIR([./aux-config])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign])
@@ -105,6 +105,22 @@
[install_hdf5=yes])
AM_CONDITIONAL([INSTALL_HDF5], [test "$install_hdf5" = yes])
+# H5PY
+AC_ARG_ENABLE([h5py],
+ [AC_HELP_STRING([--enable-h5py],
+ [install HDF5 @<:@default=yes@:>@])],
+ [if test "$enableval" = yes ; then install_h5py=yes; else install_h5py=no; fi],
+ [install_h5py=yes])
+AM_CONDITIONAL([INSTALL_H5PY], [test "$install_h5py" = yes])
+
+# CMAKE
+AC_ARG_ENABLE([cmake],
+ [AC_HELP_STRING([--enable-cmake],
+ [install CMAKE @<:@default=yes@:>@])],
+ [if test "$enableval" = yes ; then install_cmake=yes; else install_cmake=no; fi],
+ [install_cmake=yes])
+AM_CONDITIONAL([INSTALL_CMAKE], [test "$install_cmake" = yes])
+
# PETSC
AC_ARG_ENABLE([petsc],
[AC_HELP_STRING([--enable-petsc],
@@ -217,11 +233,24 @@
fi
AC_ARG_WITH([hdf5],
[AC_HELP_STRING([--with-hdf5],
- [enable HDF5 options for PyLith @<:@default=no@:>@])],
+ [enable HDF5 options for PyLith @<:@default=yes@:>@])],
[if test "$withval" = yes; then with_hdf5=yes; else with_hdf5=no; fi],
- [with_hdf5=no])
+ [with_hdf5=yes])
AM_CONDITIONAL([WITH_HDF5], [test "$with_hdf5" = yes])
+# H5PY
+if test "$install_h5py" = "yes"; then
+ with_h5py=yes
+else
+ with_h5py=no
+fi
+AC_ARG_WITH([h5py],
+ [AC_HELP_STRING([--with-h5py],
+ [enable H5PY options for PyLith @<:@default=yes@:>@])],
+ [if test "$withval" = yes; then with_h5py=yes; else with_h5py=no; fi],
+ [with_h5py=no])
+AM_CONDITIONAL([WITH_H5PY], [test "$with_h5py" = yes])
+
# PETSC options
AC_ARG_WITH([petsc-options],
[AC_HELP_STRING([--with-petsc-options],
@@ -237,7 +266,7 @@
[pylith_svn=$withval],
[pylith_svn=no])
if test "$pylith_svn" = yes ; then pylith_svn="trunk"; fi
-if test "$pylith_svn" = stable ; then pylith_svn="branches/v1.6-stable"; fi
+if test "$pylith_svn" = stable ; then pylith_svn="branches/v1.7-stable"; fi
AC_SUBST(pylith_svn)
AM_CONDITIONAL([USE_PYLITH_SVN], [test "$pylith_svn" != no])
@@ -465,6 +494,23 @@
fi
fi
+# H5PY
+if test "$install_h5py" = yes ; then
+ if test "$install_hdf5" = yes; then
+ echo "do nothing" >& /dev/null
+ else
+ if test "$with_hdf5" = yes; then
+ echo "do nothing" >& /dev/null
+ else
+ AC_MSG_ERROR([h5py requires HDF5.])
+ fi
+ fi
+else
+ if test "$with_h5py" = yes ; then
+ CIT_PYTHON_MODULE([h5py],[2.0.0])
+ fi
+fi
+
# PETSC
if test "$install_petsc" = yes ; then
PETSC_DIR=$prefix
@@ -565,6 +611,7 @@
echo " proj4: $install_proj4"
echo " netcdf: $install_netcdf"
echo " hdf5: $install_hdf5"
+echo " h5py: $install_h5py"
echo " pcre: $install_pcre"
echo " swig: $install_swig"
echo " nemesis: $install_nemesis"
@@ -572,6 +619,7 @@
echo " fiat: $install_fiat"
echo " spatialdata: $install_spatialdata"
echo " mercurial: $install_mercurial"
+echo " cmake: $install_cmake"
echo " petsc: $install_petsc, options: $petsc_options"
echo ""
if test "$pylith_svn" != no ; then
More information about the CIG-COMMITS
mailing list