Permalink
Browse files

merged branch parallel into trunk (svn merge -r 41:HEAD svn+ssh://svn…

….berlios.de/svnroot/repos/vsg/branches/parallel)

git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/vsg/trunk@249 7332c9bf-690c-0410-b12f-844d5cfd0fe5
  • Loading branch information...
peyo
peyo committed Feb 5, 2011
1 parent e21c6a1 commit cc410cb37267858571c7bbf32f573e797061e582
Showing with 20,954 additions and 1,103 deletions.
  1. +1 −1 autogen.sh
  2. +2 −2 bindings/python/Makefile.am
  3. +4 −0 bindings/python/docs/Makefile.am
  4. +17 −15 bindings/python/docs/vsgdocgen.py
  5. +97 −18 bindings/python/vsg@t@.defs
  6. +17 −11 bindings/python/vsgprtree2@t@.override
  7. +32 −14 bindings/python/vsgprtree3@t@.override
  8. +2 −2 bindings/python/vsgvector2@t@.override
  9. +2 −2 bindings/python/vsgvector3@t@.override
  10. +17 −5 build/vsg/Makefile.am
  11. +43 −1 configure.ac
  12. +299 −0 docs/reference/tmpl/vsg-unused.sgml
  13. +3 −0 docs/reference/tmpl/vsg.sgml
  14. +148 −0 docs/reference/tmpl/vsgcommbuffer.sgml
  15. +3 −0 docs/reference/tmpl/vsgd.sgml
  16. +3 −0 docs/reference/tmpl/vsgf.sgml
  17. +10 −0 docs/reference/tmpl/vsgmatrix3d.sgml
  18. +10 −0 docs/reference/tmpl/vsgmatrix3f.sgml
  19. +10 −0 docs/reference/tmpl/vsgmatrix4d.sgml
  20. +10 −0 docs/reference/tmpl/vsgmatrix4f.sgml
  21. +30 −0 docs/reference/tmpl/vsgmpi.sgml
  22. +196 −0 docs/reference/tmpl/vsgpackedmsg.sgml
  23. +92 −0 docs/reference/tmpl/vsgprtree-common.sgml
  24. +107 −0 docs/reference/tmpl/vsgprtree-parallel.sgml
  25. +3 −0 docs/reference/tmpl/vsgprtree2-common.sgml
  26. +189 −9 docs/reference/tmpl/vsgprtree2d.sgml
  27. +189 −9 docs/reference/tmpl/vsgprtree2f.sgml
  28. +3 −0 docs/reference/tmpl/vsgprtree3-common.sgml
  29. +42 −9 docs/reference/tmpl/vsgprtree3d.sgml
  30. +42 −9 docs/reference/tmpl/vsgprtree3f.sgml
  31. +10 −0 docs/reference/tmpl/vsgquaterniond.sgml
  32. +10 −0 docs/reference/tmpl/vsgquaternionf.sgml
  33. +10 −0 docs/reference/tmpl/vsgvector2d.sgml
  34. +10 −0 docs/reference/tmpl/vsgvector2f.sgml
  35. +10 −0 docs/reference/tmpl/vsgvector3d.sgml
  36. +10 −0 docs/reference/tmpl/vsgvector3f.sgml
  37. +68 −3 docs/reference/vsg-docs.xml
  38. +239 −25 docs/reference/vsg-sections.txt
  39. +1 −1 m4/Makefile.am
  40. +143 −0 m4/acx_mpi_paths.m4
  41. +1 −1 src/Makefile.am
  42. +45 −19 src/sources.list
  43. +7 −0 src/vsg@t@.h
  44. +33 −0 src/vsgcommbuffer-private.h
  45. +327 −0 src/vsgcommbuffer.c
  46. +61 −0 src/vsgcommbuffer.h
  47. +46 −2 src/vsgmatrix3@t@.c
  48. +9 −0 src/vsgmatrix3@t@.h
  49. +44 −0 src/vsgmatrix4@t@.c
  50. +10 −0 src/vsgmatrix4@t@.h
  51. +51 −0 src/vsgmpi.h.in
  52. +779 −0 src/vsgpackedmsg.c
  53. +105 −0 src/vsgpackedmsg.h
  54. +101 −0 src/vsgprtree-common.h
  55. +191 −0 src/vsgprtree-parallel.h
  56. +56 −0 src/vsgprtree2-common.h
  57. +308 −80 src/vsgprtree2@t@-extras.c
  58. +3 −0 src/vsgprtree2@t@-extras.h
  59. +3,171 −0 src/vsgprtree2@t@-parallel.c
  60. +56 −0 src/vsgprtree2@t@-parallel.h
  61. +166 −23 src/vsgprtree2@t@-private.h
  62. +901 −195 src/vsgprtree2@t@.c
  63. +60 −16 src/vsgprtree2@t@.h
  64. +168 −0 src/vsgprtree3-common.h
  65. +390 −82 src/vsgprtree3@t@-extras.c
  66. +3 −0 src/vsgprtree3@t@-extras.h
  67. +3,187 −0 src/vsgprtree3@t@-parallel.c
  68. +56 −0 src/vsgprtree3@t@-parallel.h
  69. +167 −23 src/vsgprtree3@t@-private.h
  70. +928 −251 src/vsgprtree3@t@.c
  71. +56 −15 src/vsgprtree3@t@.h
  72. +552 −0 src/vsgprtreekey2@t@.c
  73. +121 −0 src/vsgprtreekey2@t@.h
  74. +576 −0 src/vsgprtreekey3@t@.c
  75. +124 −0 src/vsgprtreekey3@t@.h
  76. +44 −0 src/vsgquaternion@t@.c
  77. +9 −0 src/vsgquaternion@t@.h
  78. +42 −0 src/vsgvector2@t@.c
  79. +10 −0 src/vsgvector2@t@.h
  80. +41 −1 src/vsgvector3@t@.c
  81. +10 −0 src/vsgvector3@t@.h
  82. +21 −8 tests/Makefile.am
  83. +1 −0 tests/atlocal.in
  84. +86 −0 tests/commbuffer.c
  85. +63 −0 tests/parallel.at
  86. +9 −1 tests/prtree2.at
  87. +91 −0 tests/prtree2clone.c
  88. +1 −39 tests/prtree2hilb.c
  89. +1 −1 tests/prtree2nftrav.c
  90. +741 −0 tests/prtree2paradist.c
  91. +529 −0 tests/prtree2parallel.c
  92. +1,345 −0 tests/prtree2paranftrav.c
  93. +2 −0 tests/prtree2pt.c
  94. +9 −1 tests/prtree3.at
  95. +93 −0 tests/prtree3clone.c
  96. +1 −120 tests/prtree3hilb.c
  97. +1 −1 tests/prtree3nftrav.c
  98. +766 −0 tests/prtree3paradist.c
  99. +537 −0 tests/prtree3parallel.c
  100. +1,196 −0 tests/prtree3paranftrav.c
  101. +2 −0 tests/prtree3pt.c
  102. +146 −0 tests/prtreekey2.c
  103. +146 −0 tests/prtreekey3.c
  104. +2 −0 tests/testsuite.at
  105. +10 −0 types.list
  106. +0 −82 vsg-config.h.in
  107. +2 −2 vsg.pc.in
  108. +2 −2 vsgd.pc.in
  109. +2 −2 vsgf.pc.in
View
@@ -150,7 +150,7 @@ do
fi
done
conf_flags="--enable-maintainer-mode"
conf_flags=""
if test x$NOCONFIGURE = x; then
echo Running $srcdir/configure $conf_flags "$@" ...
@@ -19,8 +19,8 @@ if ENABLE_PYGTK
defsdir = $(pkgdatadir)/$(VSG_MAJOR_VERSION).$(VSG_MINOR_VERSION)/defs
defs_DATA = vsgtypedefs.py
VSG_CFLAGS = -I$(top_srcdir)/build
VSG_LIBS = $(top_builddir)/build/vsg/libvsg.la
VSG_CFLAGS = -I$(top_srcdir)/build $(MPI_CFLAGS)
VSG_LIBS = $(top_builddir)/build/vsg/libvsg.la $(MPI_LIBS)
INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) @PYGTK_CFLAGS@ $(VSG_CFLAGS)
@@ -13,6 +13,8 @@ vsgsupmatrix3d.defs vsgsupmatrix3f.defs vsgsupmatrix4d.defs vsgsupmatrix4f.defs
EXTRA_DIST += $(supdefs)
if ENABLE_GTK_DOC
xml_files.stamp : $(supdefs)
test -d $(srcdir)/xml || mkdir $(srcdir)/xml
env PYTHONPATH=$(codegen_dir) $(PYTHON) vsgdocgen.py
@@ -53,6 +55,8 @@ types_list = $(top_srcdir)/types.list
%d.defs %f.defs : %@t@.defs $(types_list)
$(PYTHON) $(top_srcdir)/gencode/typegens.py -f=$(types_list) $<
endif # ENABLE_GTK_DOC
endif # ENABLE_PYGTK
noinst_SCRIPTS = vsgdocgen.py pyvsgdocs.xsl devhelp.xsl pyvsgdocs.xml \
@@ -9,25 +9,27 @@
class VsgDocbookDocWriter(docgen.DocbookDocWriter):
def write_class_header(self, obj_name, fp):
if self.use_xml:
fp.write('<?xml version="1.0" standalone="no"?>\n')
fp.write('<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"\n')
fp.write(' "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">\n')
fp.write('<refentry id="' + self.make_class_ref(obj_name) + '">\n')
fp.write(' <refmeta>\n')
fp.write(' <refentrytitle>%s</refentrytitle>\n'
def write_class_header(self, obj_name):
self._fp.write('<?xml version="1.0" standalone="no"?>\n')
self._fp.write('<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"\n')
self._fp.write(' "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">\n')
self._fp.write('<refentry id="' + self.make_class_ref(obj_name) + '">\n')
self._fp.write(' <refmeta>\n')
self._fp.write(' <refentrytitle>%s</refentrytitle>\n'
% self.pyname(obj_name))
fp.write(' <manvolnum>3</manvolnum>\n')
fp.write(' <refmiscinfo>PyVsg Docs</refmiscinfo>\n')
fp.write(' </refmeta>\n\n')
fp.write(' <refnamediv>\n')
fp.write(' <refname>%s</refname><refpurpose></refpurpose>\n'
self._fp.write(' <manvolnum>3</manvolnum>\n')
self._fp.write(' <refmiscinfo>PyVsg Docs</refmiscinfo>\n')
self._fp.write(' </refmeta>\n\n')
self._fp.write(' <refnamediv>\n')
self._fp.write(' <refname>%s</refname><refpurpose></refpurpose>\n'
% self.pyname(obj_name))
fp.write(' </refnamediv>\n\n')
self._fp.write(' </refnamediv>\n\n')
def _format_param(self, match):
return '<parameter>%s</parameter>' % (match.group(1), )
if __name__ == '__main__':
d = VsgDocbookDocWriter(use_xml=1)
d = VsgDocbookDocWriter()
# we parse ".." directory in order to get overriden comments.
sys.stderr.write ("parsing source docs.\n")
View
@@ -12,6 +12,11 @@
)
)
(define-function vsg_matrix3@t@_get_mpi_type
(c-name "vsg_matrix3@t@_get_mpi_type")
(return-type "MPI_Datatype")
)
(define-function vsg_matrix3@t@_new
(c-name "vsg_matrix3@t@_new")
(is-constructor-of "VsgMatrix3@t@")
@@ -255,6 +260,11 @@
)
)
(define-function vsg_matrix4@t@_get_mpi_type
(c-name "vsg_matrix4@t@_get_mpi_type")
(return-type "MPI_Datatype")
)
(define-function vsg_matrix4@t@_new
(c-name "vsg_matrix4@t@_new")
(is-constructor-of "VsgMatrix4@t@")
@@ -634,32 +644,59 @@
(return-type "VsgPRTree2@t@*")
)
(define-method set_point_loc_marshall
(define-method set_point_loc
(of-object "VsgPRTree2@t@")
(c-name "vsg_prtree2@t@_set_point_loc")
(return-type "none")
(parameters
'("VsgPoint2@t@LocFunc" "locfunc")
)
)
(define-method set_point_loc_with_data
(of-object "VsgPRTree2@t@")
(c-name "vsg_prtree2@t@_set_point_loc_marshall")
(c-name "vsg_prtree2@t@_set_point_loc_with_data")
(return-type "none")
(parameters
'("VsgPoint2@t@LocMarshall" "marshall")
'("VsgPoint2@t@LocDataFunc" "locfunc")
'("gpointer" "locdata")
)
)
(define-method set_region_loc_marshall
(define-method set_region_loc
(of-object "VsgPRTree2@t@")
(c-name "vsg_prtree2@t@_set_region_loc_marshall")
(c-name "vsg_prtree2@t@_set_region_loc")
(return-type "none")
(parameters
'("VsgRegion2@t@LocMarshall" "marshall")
'("VsgRegion2@t@LocFunc" "locfunc")
)
)
(define-method set_region_loc_with_data
(of-object "VsgPRTree2@t@")
(c-name "vsg_prtree2@t@_set_region_loc_with_data")
(return-type "none")
(parameters
'("VsgRegion2@t@LocDataFunc" "locfunc")
'("gpointer" "locdata")
)
)
(define-method set_point_dist_marshall
(define-method set_point_dist
(of-object "VsgPRTree2@t@")
(c-name "vsg_prtree2@t@_set_point_dist_marshall")
(c-name "vsg_prtree2@t@_set_point_dist")
(return-type "none")
(parameters
'("VsgPoint2@t@DistMarshall" "marshall")
'("VsgPoint2@t@DistFunc" "distfunc")
)
)
(define-method set_point_dist_with_data
(of-object "VsgPRTree2@t@")
(c-name "vsg_prtree2@t@_set_point_dist_with_data")
(return-type "none")
(parameters
'("VsgPoint2@t@DistDataFunc" "distfunc")
'("gpointer" "distdata")
)
)
@@ -945,32 +982,59 @@
(return-type "VsgPRTree3@t@*")
)
(define-method set_point_loc_marshall
(define-method set_point_loc
(of-object "VsgPRTree3@t@")
(c-name "vsg_prtree3@t@_set_point_loc")
(return-type "none")
(parameters
'("VsgPoint3@t@LocFunc" "locfunc")
)
)
(define-method set_point_loc_with_data
(of-object "VsgPRTree3@t@")
(c-name "vsg_prtree3@t@_set_point_loc_marshall")
(c-name "vsg_prtree3@t@_set_point_loc_with_data")
(return-type "none")
(parameters
'("VsgPoint3@t@LocMarshall" "marshall")
'("VsgPoint3@t@LocDataFunc" "locfunc")
'("gpointer" "locdata")
)
)
(define-method set_region_loc_marshall
(define-method set_region_loc
(of-object "VsgPRTree3@t@")
(c-name "vsg_prtree3@t@_set_region_loc")
(return-type "none")
(parameters
'("VsgRegion3@t@LocFunc" "locfunc")
)
)
(define-method set_region_loc_with_data
(of-object "VsgPRTree3@t@")
(c-name "vsg_prtree3@t@_set_region_loc_marshall")
(c-name "vsg_prtree3@t@_set_region_loc_with_data")
(return-type "none")
(parameters
'("VsgRegion3@t@LocMarshall" "marshall")
'("VsgRegion3@t@LocDataFunc" "locfunc")
'("gpointer" "locdata")
)
)
(define-method set_point_dist_marshall
(define-method set_point_dist
(of-object "VsgPRTree3@t@")
(c-name "vsg_prtree3@t@_set_point_dist_marshall")
(c-name "vsg_prtree3@t@_set_point_dist")
(return-type "none")
(parameters
'("VsgPoint3@t@DistMarshall" "marshall")
'("VsgPoint3@t@DistFunc" "distfunc")
)
)
(define-method set_point_dist_with_data
(of-object "VsgPRTree3@t@")
(c-name "vsg_prtree3@t@_set_point_dist_with_data")
(return-type "none")
(parameters
'("VsgPoint3@t@DistDataFunc" "distfunc")
'("gpointer" "distdata")
)
)
@@ -1216,6 +1280,11 @@
)
)
(define-function vsg_quaternion@t@_get_mpi_type
(c-name "vsg_quaternion@t@_get_mpi_type")
(return-type "MPI_Datatype")
)
(define-function vsg_quaternion@t@_new
(c-name "vsg_quaternion@t@_new")
(is-constructor-of "VsgQuaternion@t@")
@@ -1477,6 +1546,11 @@
(return-type "GType")
)
(define-function vsg_vector2@t@_get_mpi_type
(c-name "vsg_vector2@t@_get_mpi_type")
(return-type "MPI_Datatype")
)
(define-function vsg_vector2@t@_new
(c-name "vsg_vector2@t@_new")
(is-constructor-of "VsgVector2@t@")
@@ -1726,6 +1800,11 @@
)
)
(define-function vsg_vector3@t@_get_mpi_type
(c-name "vsg_vector3@t@_get_mpi_type")
(return-type "MPI_Datatype")
)
(define-function vsg_vector3@t@_new
(c-name "vsg_vector3@t@_new")
(is-constructor-of "VsgVector3@t@")
@@ -36,8 +36,11 @@ ignore
/*****************************************************************************/
%%
ignore-glob
vsg_prtree2@t@_*_marshall
vsg_prtree2@t@_set_*_loc*
/*****************************************************************************/
%%
ignore-glob
vsg_prtree2@t@_set_*_dist*
/*****************************************************************************/
%%
override-slot VsgPRTree2@t@.tp_flags
@@ -216,23 +219,23 @@ _wrap_vsg_prtree2@t@_tp_init (PyGBoxed *self, PyObject *args,
}
Py_INCREF (point_locfunc);
vsg_prtree2@t@_set_point_loc_marshall
vsg_prtree2@t@_set_point_loc_with_data
(self->boxed,
(VsgPoint2@t@LocMarshall) marshall_point_locfunc_2@t@,
(VsgPoint2@t@LocDataFunc) marshall_point_locfunc_2@t@,
point_locfunc);
Py_INCREF (point_distfunc);
vsg_prtree2@t@_set_point_dist_marshall
vsg_prtree2@t@_set_point_dist_with_data
(self->boxed,
(VsgPoint2@t@DistMarshall) marshall_point_distfunc_2@t@,
(VsgPoint2@t@DistDataFunc) marshall_point_distfunc_2@t@,
point_distfunc);
if (region_locfunc != Py_None)
{
Py_INCREF (region_locfunc);
vsg_prtree2@t@_set_region_loc_marshall
vsg_prtree2@t@_set_region_loc_with_data
(self->boxed,
(VsgRegion2@t@LocMarshall) marshall_region_locfunc_2@t@,
(VsgRegion2@t@LocDataFunc) marshall_region_locfunc_2@t@,
region_locfunc);
}
@@ -1103,6 +1106,9 @@ void visitfunc2@t@ (PyObject *obj,
/* else do nothing */
}
/* keep in sync with vsgprtree2@t@.c */
gboolean _vsg_prtree2@t@_check_user_data_model (VsgPRTree2@t@ *tree);
static int
_wrap_vsg_prtree2@t@_tp_traverse(PyObject *self, visitproc visit, void *arg)
{
@@ -1123,10 +1129,10 @@ _wrap_vsg_prtree2@t@_tp_traverse(PyObject *self, visitproc visit, void *arg)
{
if (visit (tree->config.region_loc_data, arg) < 0) return -1;
}
if (tree->config.user_data_model != NULL)
if (_vsg_prtree2@t@_check_user_data_model (tree))
{
if (visit (tree->config.user_data_model, arg) < 0) return -1;
if (visit (tree->config.parallel_config.node_data.alloc_data,
arg) < 0) return -1;
}
if (tree->config.children_order_data != NULL)
Oops, something went wrong.

0 comments on commit cc410cb

Please sign in to comment.