[adios] 02/07: Merge tag 'upstream/1.11.0' into debian/master

Alastair McKinstry mckinstry at moszumanska.debian.org
Tue Apr 4 12:09:18 UTC 2017


This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository adios.

commit 22d24d5b1b32627f0c769713a5bb9154c0742e4e
Merge: cc9de75 0c48e54
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Nov 21 13:09:40 2016 +0000

    Merge tag 'upstream/1.11.0' into debian/master

 CMakeLists.txt                                     |    73 +
 COPYING                                            |    14 +-
 Makefile.in                                        |     5 +-
 NEWS                                               |    21 +
 aclocal.m4                                         |     1 +
 cmake_init                                         |    15 +-
 config.h.in                                        |    12 +
 config/ac_dataspaces.m4                            |    54 +-
 config/ac_dimes.m4                                 |    47 +-
 config/ac_zfp.m4                                   |    83 +
 configure                                          |   839 +-
 configure.ac                                       |    58 +-
 examples/C/CMakeLists.txt                          |     2 +-
 examples/C/Makefile.am                             |     4 +-
 examples/C/Makefile.in                             |    10 +-
 examples/C/arrays/Makefile.in                      |     5 +-
 examples/C/attributes/Makefile.in                  |     5 +-
 examples/C/flexpath_arrays/Makefile.in             |     5 +-
 .../global_range_select/Makefile.in                |     5 +-
 .../C/flexpath_arrays/process_select/Makefile.in   |     5 +-
 examples/C/global-array-time/Makefile.in           |     5 +-
 examples/C/global-array-time/adios_globaltime.c    |    89 +-
 examples/C/global-array-time/adios_globaltime.xml  |     7 +-
 .../C/global-array-time/adios_globaltime_no_xml.c  |     4 +-
 examples/C/global-array/Makefile.in                |     5 +-
 .../global-array/adios_global_aggregate_by_color.c |     2 +-
 examples/C/global-array/adios_global_no_xml.c      |    95 +-
 examples/C/global-array/no_xml_write_byid.c        |     2 +-
 examples/C/icee_arrays/Makefile.in                 |     5 +-
 examples/C/icee_arrays/array/Makefile.in           |     5 +-
 examples/C/icee_arrays/array/adios_write.c         |     2 +-
 examples/C/manual/Makefile.in                      |     5 +-
 examples/C/query/Makefile.in                       |     5 +-
 examples/C/query/write_table.c                     |     2 +-
 examples/C/query/write_vars.c                      |     2 +-
 examples/C/read_all/Makefile.in                    |     5 +-
 examples/C/scalars/Makefile.in                     |     5 +-
 examples/C/schema/Makefile.in                      |     5 +-
 examples/C/schema/rectilinear2d_noxml.c            |     2 +-
 examples/C/schema/structured2d_noxml.c             |     2 +-
 examples/C/schema/tri2d_noxml.c                    |     2 +-
 examples/C/schema/uniform2d_noxml.c                |     2 +-
 examples/C/stat/Makefile.in                        |     5 +-
 examples/C/time_aggregation/CMakeLists.txt         |    24 +
 examples/C/time_aggregation/Makefile.am            |    23 +
 .../C/{attributes => time_aggregation}/Makefile.in |    72 +-
 examples/C/time_aggregation/time_aggregation.c     |   111 +
 examples/C/time_aggregation/time_aggregation.xml   |    45 +
 .../C/time_aggregation/time_aggregation_no_xml.c   |   158 +
 examples/C/transforms/Makefile.in                  |     5 +-
 examples/Fortran/Makefile.in                       |     5 +-
 examples/Fortran/arrays/Makefile.in                |     5 +-
 examples/Fortran/global-array-time/Makefile.in     |     5 +-
 examples/Fortran/global-array/Makefile.in          |     5 +-
 .../Fortran/global-array/adios_global_no_xml.F90   |     3 +-
 .../Fortran/global-array/no_xml_write_byid.F90     |     2 +-
 examples/Fortran/scalars/Makefile.in               |     5 +-
 examples/Fortran/schema/Makefile.in                |     5 +-
 examples/Fortran/schema/rectilinear2d_noxml.F90    |     2 +-
 examples/Fortran/schema/structured2d_noxml.F90     |     2 +-
 examples/Fortran/schema/tri2d_noxml.F90            |     2 +-
 examples/Fortran/schema/tri2d_noxml_seperate.F90   |     4 +-
 examples/Fortran/schema/uniform2d_noxml.F90        |     2 +-
 examples/Makefile.in                               |     5 +-
 runconf                                            |    50 +-
 src/CMakeLists.txt                                 |    69 +-
 src/Makefile.am                                    |    69 +-
 src/Makefile.in                                    |   383 +-
 src/core/adios.c                                   |    77 +-
 src/core/adios_bp_v1.c                             |     1 +
 src/core/adios_bp_v1.h                             |     1 +
 src/core/adios_clock.h                             |     2 +-
 src/core/adios_icee.h                              |     2 +
 src/core/adios_internals.c                         |   741 +-
 src/core/adios_internals.h                         |   116 +-
 src/core/adios_internals_mxml.c                    |   130 +-
 src/core/adios_read.c                              |     3 +-
 src/core/adios_transform_methods.c                 |    59 +
 src/core/adiosf.c                                  |    31 +-
 src/core/adiosf_defs_mod.f90                       |     8 +
 src/core/adiosf_write_mod.f90                      |  6812 +++++-----
 src/core/bp_utils.c                                |     4 +-
 src/core/bp_utils.h                                |     2 +-
 src/core/buffer.c                                  |    12 +
 src/core/common_adios.c                            |   655 +-
 src/core/common_adios.h                            |     2 +-
 src/core/common_read.c                             |    57 +-
 src/core/common_read.h                             |     2 +-
 src/core/flexpath.h                                |     1 +
 src/core/mpidummy.c                                |    22 +
 src/mxml/Makefile.am                               |     2 +-
 src/mxml/Makefile.in                               |     7 +-
 src/public/adios.h                                 |    24 +-
 src/public/adios_error.h                           |     1 +
 src/public/adios_query.h                           |    15 +
 src/public/adios_read_v2.h                         |    17 +-
 src/public/adios_transform_methods.h               |    25 +
 src/public/adios_types.h                           |     9 +
 src/public/adios_version.h                         |     6 +-
 src/public/mpidummy.h                              |    10 +-
 src/query/common_query.c                           |    58 +
 src/read/read_flexpath.c                           |    83 +-
 src/read/read_icee.c                               |   323 +-
 src/transforms/Makefile.plugins                    |     4 +
 src/transforms/adios_transform_zfp_common.h        |   235 +
 src/transforms/adios_transform_zfp_read.c          |   223 +
 src/transforms/adios_transform_zfp_write.c         |   268 +
 src/transforms/transform_plugins.h                 |     1 +
 src/write/adios_dataspaces.c                       |     2 +-
 src/write/adios_flexpath.c                         |   138 +-
 src/write/adios_icee.c                             |   300 +-
 src/write/adios_mpi.c                              |    32 +-
 src/write/adios_mpi_amr.c                          |    89 +-
 src/write/adios_mpi_lustre.c                       |     3 -
 src/write/adios_posix.c                            |    12 +-
 src/write/adios_var_merge.c                        |     7 +-
 src/zfp/CMakeLists.txt                             |    40 +
 src/zfp/Makefile.am                                |    61 +
 src/{mxml => zfp}/Makefile.in                      |   296 +-
 src/zfp/zfp-0.5.0/API                              |   439 +
 src/zfp/zfp-0.5.0/Config                           |    49 +
 src/zfp/zfp-0.5.0/FAQ                              |   371 +
 src/zfp/zfp-0.5.0/LICENSE                          |    57 +
 src/zfp/zfp-0.5.0/Makefile                         |    16 +
 src/zfp/zfp-0.5.0/README                           |   422 +
 src/zfp/zfp-0.5.0/VERSIONS                         |   161 +
 src/zfp/zfp-0.5.0/array/cache.h                    |   224 +
 src/zfp/zfp-0.5.0/array/memory.h                   |    42 +
 src/zfp/zfp-0.5.0/array/zfparray.h                 |   105 +
 src/zfp/zfp-0.5.0/array/zfparray1.h                |   243 +
 src/zfp/zfp-0.5.0/array/zfparray2.h                |   273 +
 src/zfp/zfp-0.5.0/array/zfparray3.h                |   284 +
 src/zfp/zfp-0.5.0/array/zfpcodec.h                 |    17 +
 src/zfp/zfp-0.5.0/array/zfpcodecd.h                |   149 +
 src/zfp/zfp-0.5.0/array/zfpcodecf.h                |   149 +
 src/zfp/zfp-0.5.0/examples/Makefile                |    35 +
 src/zfp/zfp-0.5.0/examples/array2d.h               |    25 +
 src/zfp/zfp-0.5.0/examples/diffusion.cpp           |   107 +
 src/zfp/zfp-0.5.0/examples/fields.c                | 12201 +++++++++++++++++
 src/zfp/zfp-0.5.0/examples/fields.h                |    20 +
 src/zfp/zfp-0.5.0/examples/pgm.c                   |   112 +
 src/zfp/zfp-0.5.0/examples/simple.c                |    99 +
 src/zfp/zfp-0.5.0/examples/speed.c                 |   136 +
 src/zfp/zfp-0.5.0/examples/testzfp.cpp             |   705 +
 src/zfp/zfp-0.5.0/examples/zfp.c                   |   480 +
 src/zfp/zfp-0.5.0/inc/bitstream.h                  |    87 +
 src/zfp/zfp-0.5.0/inc/macros.h                     |     7 +
 src/zfp/zfp-0.5.0/inc/system.h                     |    20 +
 src/zfp/zfp-0.5.0/inc/types.h                      |    30 +
 src/zfp/zfp-0.5.0/inc/zfp.h                        |   549 +
 src/zfp/zfp-0.5.0/src/Makefile                     |    21 +
 src/zfp/zfp-0.5.0/src/bitstream.c                  |     4 +
 src/zfp/zfp-0.5.0/src/block1.h                     |     1 +
 src/zfp/zfp-0.5.0/src/block2.h                     |     1 +
 src/zfp/zfp-0.5.0/src/block3.h                     |     1 +
 src/zfp/zfp-0.5.0/src/decode1d.c                   |    10 +
 src/zfp/zfp-0.5.0/src/decode1f.c                   |    10 +
 src/zfp/zfp-0.5.0/src/decode2d.c                   |    10 +
 src/zfp/zfp-0.5.0/src/decode2f.c                   |    10 +
 src/zfp/zfp-0.5.0/src/decode3d.c                   |    10 +
 src/zfp/zfp-0.5.0/src/decode3f.c                   |    10 +
 src/zfp/zfp-0.5.0/src/encode1d.c                   |    10 +
 src/zfp/zfp-0.5.0/src/encode1f.c                   |    10 +
 src/zfp/zfp-0.5.0/src/encode2d.c                   |    10 +
 src/zfp/zfp-0.5.0/src/encode2f.c                   |    10 +
 src/zfp/zfp-0.5.0/src/encode3d.c                   |    10 +
 src/zfp/zfp-0.5.0/src/encode3f.c                   |    10 +
 src/zfp/zfp-0.5.0/src/inline/bitstream.c           |   410 +
 src/zfp/zfp-0.5.0/src/inline/inline.h              |    12 +
 src/zfp/zfp-0.5.0/src/template/codec.h             |     3 +
 src/zfp/zfp-0.5.0/src/template/codec1.c            |    11 +
 src/zfp/zfp-0.5.0/src/template/codec2.c            |    39 +
 src/zfp/zfp-0.5.0/src/template/codec3.c            |    97 +
 src/zfp/zfp-0.5.0/src/template/compress.c          |   104 +
 src/zfp/zfp-0.5.0/src/template/decode.c            |   165 +
 src/zfp/zfp-0.5.0/src/template/decode1.c           |    55 +
 src/zfp/zfp-0.5.0/src/template/decode2.c           |    62 +
 src/zfp/zfp-0.5.0/src/template/decode3.c           |    70 +
 src/zfp/zfp-0.5.0/src/template/decompress.c        |   104 +
 src/zfp/zfp-0.5.0/src/template/encode.c            |   216 +
 src/zfp/zfp-0.5.0/src/template/encode1.c           |    55 +
 src/zfp/zfp-0.5.0/src/template/encode2.c           |    65 +
 src/zfp/zfp-0.5.0/src/template/encode3.c           |    77 +
 src/zfp/zfp-0.5.0/src/template/template.h          |    12 +
 src/zfp/zfp-0.5.0/src/traitsd.h                    |    11 +
 src/zfp/zfp-0.5.0/src/traitsf.h                    |    17 +
 src/zfp/zfp-0.5.0/src/zfp.c                        |   719 +
 tests/C/Makefile.in                                |     5 +-
 tests/C/fgr_tests/Makefile.in                      |     5 +-
 tests/C/flexpath_tests/1D_arr_global/Makefile.in   |     5 +-
 tests/C/flexpath_tests/1D_arr_global/reader.c      |     6 +-
 .../flexpath_tests/1D_arr_global_noxml/Makefile.in |     5 +-
 .../C/flexpath_tests/1D_arr_global_noxml/writer.c  |     4 +-
 tests/C/flexpath_tests/Makefile.in                 |     5 +-
 .../flexpath_tests/global_range_select/Makefile.in |     5 +-
 tests/C/flexpath_tests/maya_append/Makefile.in     |     5 +-
 tests/C/flexpath_tests/maya_append/writer.c        |     2 +-
 tests/C/flexpath_tests/maya_noxml/Makefile.in      |     5 +-
 tests/C/flexpath_tests/maya_noxml/writer.c         |     2 +-
 tests/C/flexpath_tests/scalar/Makefile.in          |     5 +-
 tests/C/flexpath_tests/scalar/writer.c             |     2 +-
 tests/C/query/Makefile.in                          |     5 +-
 tests/C/query/alacrity/Makefile.in                 |     5 +-
 tests/C/query/common/Makefile.in                   |     5 +-
 tests/C/query/fastbit/Makefile.in                  |     5 +-
 tests/Fortran/Makefile.in                          |     5 +-
 tests/Makefile.in                                  |     5 +-
 tests/bp_read/Makefile.in                          |     5 +-
 tests/genarray/Makefile.in                         |     5 +-
 tests/suite/Makefile.in                            |     5 +-
 tests/suite/programs/Makefile.in                   |     5 +-
 tests/suite/programs/big_file.c                    |     2 +-
 tests/suite/programs/blocks.c                      |     2 +-
 tests/suite/programs/connect_to_space_subset.c     |     2 +-
 tests/suite/programs/examples/Makefile.in          |     5 +-
 .../suite/programs/examples/attributes/Makefile.in |     5 +-
 .../programs/examples/global_array/Makefile.in     |     5 +-
 .../examples/global_array/global_array_F.xml       |     2 +-
 .../global_array_aggregate_by_color_C.c            |     2 +-
 .../global_array/global_array_write_byid_noxml_C.c |     2 +-
 .../global_array_write_byid_noxml_F.F90            |     2 +-
 .../global_array/global_array_write_noxml_C.c      |     2 +-
 .../global_array/global_array_write_noxml_F.F90    |     2 +-
 .../examples/global_array_time/Makefile.am         |     2 +-
 .../examples/global_array_time/Makefile.in         |     7 +-
 .../global_array_time/global_array_time_aggr_C.xml |     3 +-
 .../global_array_time/global_array_time_write_C.c  |    84 +-
 .../programs/examples/local_array/Makefile.in      |     5 +-
 tests/suite/programs/examples/scalars/Makefile.in  |     5 +-
 .../programs/examples/scalars/scalars_read_C.c     |    28 +-
 .../programs/examples/scalars/scalars_read_F.F90   |    30 +-
 tests/suite/programs/many_vars.c                   |     2 +-
 tests/suite/programs/reuse_dim.c                   |     2 +-
 tests/suite/programs/selections.c                  |     2 +-
 tests/suite/programs/steps_write.c                 |     2 +-
 tests/suite/reference/attributes_bpls.txt          |     2 +-
 tests/suite/reference/global_array_no_xml_bpls.txt |     2 +-
 .../suite/reference/global_array_no_xml_f_bpls.txt |     2 +-
 tests/suite/reference/global_array_time_bpls.txt   |     4 +-
 tests/suite/reference/local_array_C_bpls.txt       |     4 +-
 tests/suite/reference/no_xml_write_byid_bpls.txt   |     2 +-
 tests/suite/reference/no_xml_write_byid_f_bpls.txt |     2 +-
 tests/suite/test.sh                                |    17 +-
 tests/suite/tests/01_scalars.sh                    |     4 +-
 tests/suite/tests/05_global_array_time.sh          |    53 +-
 tests/suite/tests/19_query.sh                      |     9 +-
 tests/test_src/CMakeLists.txt                      |     2 +-
 tests/test_src/Makefile.am                         |    12 +-
 tests/test_src/Makefile.in                         |   105 +-
 tests/test_src/array_attribute.c                   |   327 +
 tests/test_src/group_free_test.c                   |     2 +-
 tests/test_src/query_minmax.c                      |     2 +-
 tests/test_src/read_points_2d.c                    |     2 +-
 tests/test_src/read_points_3d.c                    |   774 --
 utils/Makefile.in                                  |     5 +-
 utils/adios_lint/Makefile.in                       |     5 +-
 utils/adios_list_methods/Makefile.in               |     5 +-
 utils/adios_list_methods/adios_list_methods.c      |   425 +-
 utils/bp2ascii/Makefile.in                         |     5 +-
 utils/bp2bp/Makefile.in                            |     5 +-
 utils/bp2h5/Makefile.in                            |     5 +-
 utils/bp2h5/bp2h5.c                                |     8 +-
 utils/bp2ncd/Makefile.in                           |     5 +-
 utils/bpdiff/Makefile.in                           |     5 +-
 utils/bpdump/Makefile.in                           |     5 +-
 utils/bpls/Makefile.in                             |     5 +-
 utils/bpmeta/Makefile.in                           |     5 +-
 utils/bprecover/Makefile.in                        |     5 +-
 utils/bpsplit/Makefile.in                          |     5 +-
 utils/fastbit/Makefile.in                          |     5 +-
 utils/gpp/CMakeLists.txt                           |     3 +-
 utils/gpp/Makefile.am                              |     7 +-
 utils/gpp/Makefile.in                              |    62 +-
 utils/gpp/gpp.py                                   |     9 +-
 utils/gpp/gpp.py.in                                |     7 +
 utils/skel/CMakeLists.txt                          |    31 +-
 utils/skel/Makefile.am                             |     2 +-
 utils/skel/Makefile.in                             |     7 +-
 .../skel/bin/{set_method.sh => skel_set_method.sh} |     0
 utils/skel/etc/Makefile.in                         |     5 +-
 utils/skel/etc/templates/Makefile.default.tpl      |     2 +-
 utils/skel/etc/templates/submit_jaguar.tpl         |     2 +-
 utils/skel/etc/templates/submit_nautilus.tmpl      |     2 +-
 utils/skel/etc/templates/submit_nautilus.tpl       |     2 +-
 utils/skel/etc/templates/submit_sith.tmpl          |     2 +-
 utils/skel/etc/templates/submit_sith.tpl           |     2 +-
 utils/skel/src/Makefile.in                         |     5 +-
 utils/skeldump/Makefile.in                         |     5 +-
 utils/skeldump/skeldump.c                          |     2 +-
 wrappers/java/CMakeLists.txt                       |     6 +-
 wrappers/java/gov/ornl/ccs/Adios.java              |     8 +-
 wrappers/java/gov_ornl_ccs_Adios.cxx               |    40 +-
 wrappers/java/test/AdiosNoxmlTest.java             |    14 +-
 wrappers/numpy/adios.cpp                           | 12949 +++++++++++-------
 wrappers/numpy/adios.pyx                           |   288 +-
 wrappers/numpy/adios_mpi.cpp                       | 13041 ++++++++++++-------
 wrappers/numpy/adios_mpi.pyx                       |   288 +-
 wrappers/numpy/build-and-install.sh                |    14 +
 wrappers/numpy/doc/source/build.rst                |    24 +-
 wrappers/numpy/src/__init__.py                     |     2 +-
 wrappers/numpy/src_mpi/__init__.py                 |     2 +-
 wrappers/numpy/test/test_adios_writer_unittest.py  |    43 +
 wrappers/numpy/tests/test_adios_attribute.py       |     3 +-
 wrappers/numpy/tests/test_adios_mpi_writer.py      |    18 +-
 wrappers/numpy/tests/test_adios_writer.py          |    15 +-
 305 files changed, 46943 insertions(+), 15799 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git



More information about the debian-science-commits mailing list