[cig-commits] r6850 - in cs/Exchanger/trunk: . lib
leif at geodynamics.org
leif at geodynamics.org
Thu May 10 18:48:00 PDT 2007
Author: leif
Date: 2007-05-10 18:47:59 -0700 (Thu, 10 May 2007)
New Revision: 6850
Removed:
cs/Exchanger/trunk/PKG-INFO.in
Modified:
cs/Exchanger/trunk/
cs/Exchanger/trunk/Makefile.am
cs/Exchanger/trunk/configure.ac
cs/Exchanger/trunk/lib/exchangers.cc
cs/Exchanger/trunk/setup.py
Log:
Dusted-off Exchanger.
Property changes on: cs/Exchanger/trunk
___________________________________________________________________
Name: svn:externals
- m4 http://geodynamics.org/svn/cig/cs/autoconf/trunk
+ m4 http://geodynamics.org/svn/cig/cs/autoconf/trunk
archimedes http://geodynamics.org/svn/cig/cs/merlin/branches/v1/merlin/archimedes
Modified: cs/Exchanger/trunk/Makefile.am
===================================================================
--- cs/Exchanger/trunk/Makefile.am 2007-05-11 00:57:13 UTC (rev 6849)
+++ cs/Exchanger/trunk/Makefile.am 2007-05-11 01:47:59 UTC (rev 6850)
@@ -8,9 +8,7 @@
doc/Exchanger.doxyconf
# lib
-CXX = $(MPICXX)
-CXXLD = @CXX@
-INCLUDES = $(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) $(MPIINCLUDES)
+AM_CPPFLAGS = $(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) $(MPIINCLUDES)
pkginclude_HEADERS = \
lib/Array2D.h \
lib/Array2D.cc \
@@ -52,16 +50,13 @@
libExchanger_la_LIBADD = $(PYTHON_EGG_LDFLAGS)
# pyre
-nobase_pythonegg_PYTHON = \
+nobase_python_PYTHON = \
Exchanger/CoupledApp.py \
Exchanger/Coupler.py \
Exchanger/Exchanger.py \
Exchanger/Layout.py \
Exchanger/__init__.py
-pythonegginfo_PYTHON = \
- requires.txt
nodist_pythonegginfo_PYTHON = \
- PKG-INFO \
config.cfg
do_subst = sed \
-e 's|[@]PACKAGE[@]|$(PACKAGE)|g' \
@@ -70,14 +65,13 @@
-e 's|[@]exec_prefix[@]|$(exec_prefix)|g' \
-e 's|[@]includedir[@]|$(includedir)|g' \
-e 's|[@]libdir[@]|$(libdir)|g'
-PKG-INFO: $(srcdir)/PKG-INFO.in
- $(do_subst) < $(srcdir)/PKG-INFO.in > $@ || (rm -f $@ && exit 1)
config.cfg: $(srcdir)/config.cfg.in
$(do_subst) < $(srcdir)/config.cfg.in > $@ || (rm -f $@ && exit 1)
CLEANFILES = $(nodist_pythonegginfo_PYTHON)
EXTRA_DIST += \
- PKG-INFO.in \
- config.cfg.in
+ config.cfg.in \
+ setup.py \
+ archimedes/__init__.py
# export
export_incdir = $(top_builddir)/include
@@ -90,4 +84,10 @@
clean-pkgincludeHEADERS:
$(MAKE) $(AM_MAKEFLAGS) includedir=$(export_incdir) uninstall-pkgincludeHEADERS
+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 Makefile.am
Deleted: cs/Exchanger/trunk/PKG-INFO.in
===================================================================
--- cs/Exchanger/trunk/PKG-INFO.in 2007-05-11 00:57:13 UTC (rev 6849)
+++ cs/Exchanger/trunk/PKG-INFO.in 2007-05-11 01:47:59 UTC (rev 6850)
@@ -1,10 +0,0 @@
-Metadata-Version: 1.0
-Name: @PACKAGE@
-Version: @PACKAGE_VERSION@
-Summary: Exchanger module.
-Home-page: http://www.geodynamics.org/
-Author: Eh Tan
-Author-email: cig-all at geodynamics.org
-License: GPL
-Description: UNKNOWN
-Platform: UNKNOWN
Modified: cs/Exchanger/trunk/configure.ac
===================================================================
--- cs/Exchanger/trunk/configure.ac 2007-05-11 00:57:13 UTC (rev 6849)
+++ cs/Exchanger/trunk/configure.ac 2007-05-11 01:47:59 UTC (rev 6850)
@@ -6,7 +6,7 @@
AC_INIT([Exchanger], [1.0.0], [cig-mc at geodynamics.org], [Exchanger])
AC_CONFIG_AUX_DIR([./aux-config])
AC_CONFIG_SRCDIR([Exchanger/Exchanger.py])
-AC_CONFIG_HEADER([portinfo])
+AC_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign])
@@ -16,23 +16,24 @@
# Check for Python.
AM_PATH_PYTHON([2.3])
-CIT_PYTHON_INCDIR
+CIT_PYTHON_SYSCONFIG
-# Checks for Python modules and packages.
-CIT_CHECK_PYTHON_EGG([pythia >= 0.8-1.0dev-r4617, < 0.8-2.0a, == dev])
-CIT_PYTHON_EGG_FLAGS
-CIT_PYTHON_EGG_REQUIRES
+# Check for Python modules and packages.
+CIT_PYTHON_EGG_SETUP
+AC_SUBST([pythonegginfodir], [\${pythondir}/$PACKAGE.egg-info])
+
# Checks for programs.
-CIT_PROG_MPICXX
+AC_PROG_CXX([mpicxx mpic++ mpiCC hcp mpCC mpxlC mpxlC_r cmpic++ g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlc++_r xlC_r xlC icpc ecpc pgCC])
AC_LANG(C++)
+AC_DISABLE_SHARED
AC_PROG_LIBTOOL
# Checks for libraries.
-CIT_CHECK_LIB_MPI
+AC_SEARCH_LIBS([MPI_Init], [mpi mpich], [], [AC_MSG_ERROR([MPI library not found])])
# Checks for header files.
-CIT_HEADER_MPI
+AC_CHECK_HEADER([mpi.h], [], [AC_MSG_ERROR([header 'mpi.h' not found])])
# Checks for typedefs, structures, and compiler characteristics.
Modified: cs/Exchanger/trunk/lib/exchangers.cc
===================================================================
--- cs/Exchanger/trunk/lib/exchangers.cc 2007-05-11 00:57:13 UTC (rev 6849)
+++ cs/Exchanger/trunk/lib/exchangers.cc 2007-05-11 01:47:59 UTC (rev 6850)
@@ -9,7 +9,7 @@
#include <Python.h>
#include "mpi.h"
-#include "mpi/Communicator.h"
+#include "mpi/pympi.h"
#include "BoundedBox.h"
#include "BoundingBox.h"
#include "Convertor.h"
@@ -46,9 +46,9 @@
BoundedBox* bbox = static_cast<BoundedBox*>(PyCObject_AsVoidPtr(obj0));
- mpi::Communicator* temp1 = static_cast<mpi::Communicator*>
- (PyCObject_AsVoidPtr(obj1));
- MPI_Comm mycomm = temp1->handle();
+ PyMPICommObject *temp1 = static_cast<PyMPICommObject*>
+ (PyCObject_AsVoidPtr(obj1));
+ MPI_Comm mycomm = temp1->comm;
const int leader = 0;
int rank;
@@ -58,9 +58,9 @@
BoundedBox* newbbox = new BoundedBox(*bbox);
if(rank == leader) {
- mpi::Communicator* temp2 = static_cast<mpi::Communicator*>
- (PyCObject_AsVoidPtr(obj2));
- MPI_Comm intercomm = temp2->handle();
+ PyMPICommObject* temp2 = static_cast<PyMPICommObject*>
+ (PyCObject_AsVoidPtr(obj2));
+ MPI_Comm intercomm = temp2->comm;
// convert before sending
Convertor& convertor = Convertor::instance();
@@ -94,9 +94,9 @@
BoundingBox* box = static_cast<BoundingBox*>(PyCObject_AsVoidPtr(obj0));
- mpi::Communicator* temp1 = static_cast<mpi::Communicator*>
- (PyCObject_AsVoidPtr(obj1));
- MPI_Comm mycomm = temp1->handle();
+ PyMPICommObject* temp1 = static_cast<PyMPICommObject*>
+ (PyCObject_AsVoidPtr(obj1));
+ MPI_Comm mycomm = temp1->comm;
const int leader = 0;
int rank;
@@ -106,9 +106,9 @@
BoundingBox* remote_boxes;
if(rank == leader) {
- mpi::Communicator* temp2 = static_cast<mpi::Communicator*>
- (PyCObject_AsVoidPtr(obj2));
- MPI_Comm intercomm = temp2->handle();
+ PyMPICommObject* temp2 = static_cast<PyMPICommObject*>
+ (PyCObject_AsVoidPtr(obj2));
+ MPI_Comm intercomm = temp2->comm;
int my_comm_size;
MPI_Comm_size(mycomm, &my_comm_size);
@@ -137,18 +137,18 @@
&signal, &obj1, &obj2, &target))
return NULL;
- mpi::Communicator* temp1 = static_cast<mpi::Communicator*>
- (PyCObject_AsVoidPtr(obj1));
- MPI_Comm mycomm = temp1->handle();
+ PyMPICommObject* temp1 = static_cast<PyMPICommObject*>
+ (PyCObject_AsVoidPtr(obj1));
+ MPI_Comm mycomm = temp1->comm;
const int leader = 0;
int rank;
MPI_Comm_rank(mycomm, &rank);
if(rank == leader) {
- mpi::Communicator* temp2 = static_cast<mpi::Communicator*>
- (PyCObject_AsVoidPtr(obj2));
- MPI_Comm intercomm = temp2->handle();
+ PyMPICommObject* temp2 = static_cast<PyMPICommObject*>
+ (PyCObject_AsVoidPtr(obj2));
+ MPI_Comm intercomm = temp2->comm;
util::exchange(intercomm, target, signal);
}
@@ -172,18 +172,18 @@
&dt, &obj1, &obj2, &target))
return NULL;
- mpi::Communicator* temp1 = static_cast<mpi::Communicator*>
- (PyCObject_AsVoidPtr(obj1));
- MPI_Comm mycomm = temp1->handle();
+ PyMPICommObject* temp1 = static_cast<PyMPICommObject*>
+ (PyCObject_AsVoidPtr(obj1));
+ MPI_Comm mycomm = temp1->comm;
const int leader = 0;
int rank;
MPI_Comm_rank(mycomm, &rank);
if(rank == leader) {
- mpi::Communicator* temp2 = static_cast<mpi::Communicator*>
- (PyCObject_AsVoidPtr(obj2));
- MPI_Comm intercomm = temp2->handle();
+ PyMPICommObject* temp2 = static_cast<PyMPICommObject*>
+ (PyCObject_AsVoidPtr(obj2));
+ MPI_Comm intercomm = temp2->comm;
Convertor& convertor = Convertor::instance();
convertor.time(dt);
@@ -289,9 +289,9 @@
&obj1, &numSrc, &obj2))
return NULL;
- mpi::Communicator* temp = static_cast<mpi::Communicator*>
- (PyCObject_AsVoidPtr(obj1));
- MPI_Comm comm = temp->handle();
+ PyMPICommObject* temp = static_cast<PyMPICommObject*>
+ (PyCObject_AsVoidPtr(obj1));
+ MPI_Comm comm = temp->comm;
BoundedMesh* b = static_cast<BoundedMesh*>(PyCObject_AsVoidPtr(obj2));
Modified: cs/Exchanger/trunk/setup.py
===================================================================
--- cs/Exchanger/trunk/setup.py 2007-05-11 00:57:13 UTC (rev 6849)
+++ cs/Exchanger/trunk/setup.py 2007-05-11 01:47:59 UTC (rev 6850)
@@ -1,27 +1,24 @@
-# This is not a normal 'setup.py' script; it is provided as a
-# convenience to install Python packages required by Exchanger. For
-# instructions on installing Exchanger itself, see the file INSTALL.
+from archimedes import use_merlin
+use_merlin()
-from ez_setup import use_setuptools
-use_setuptools()
+from merlin import setup, find_packages
-import setuptools
-import sys
+setup(
+
+ name = 'Exchanger',
+ version = '1.0',
-requirements = []
+ zip_safe = False,
+ packages = find_packages(),
+
+ install_requires = [
+ 'pythia[mpi] >= 0.8.1.0, < 0.8.2a',
+ ],
-if setuptools.bootstrap_install_from:
- requirements.append(setuptools.bootstrap_install_from)
- setuptools.bootstrap_install_from = None
+ author = 'Eh Tan',
+ author_email = 'cig-mc at geodynamics.org',
+ license = 'GPL',
+ url = 'http://www.geodynamics.org/cig/software/packages/mc/citcoms/',
-requirements.append('pythia >= 0.8-1.0dev-r4617, < 0.8-2.0a, == dev')
-
-setuptools.setup(
- script_args = (
- ['easy_install',
- '--find-links=svn://geodynamics.org/cig/cs/pythia/trunk#egg=pythia-dev'] +
- sys.argv[1:] +
- requirements
- )
)
More information about the cig-commits
mailing list