Unverified Commit 2d86df27 authored by pnorbert's avatar pnorbert Committed by GitHub
Browse files

Merge pull request #949 from ornladios/pipeline 

Added adios_iotest utility and tests
parents b18132f1 c1ae2fa1

docs/user_guide/source/conf.py

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ exclude_patterns = [ 
    'api_simple/c.rst',

    # 'api_simple/api_simple.rst',

    'utilities/adios2-config.rst',

    'utilities/adios2_reorganize.rst',

    'utilities/adios_reorganize.rst',

    # 'utilities/utilities.rst',

    'utilities/bpls.rst',

    'engines/dataman.rst',

docs/user_guide/source/utilities/adios2_reorganize.rst→docs/user_guide/source/utilities/adios_reorganize.rst

+1 −1
Original line number Diff line number Diff line 
*****************

adios2_reorganize

adios_reorganize

*****************

docs/user_guide/source/utilities/utilities.rst

+3 −3
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ manipulation that builds on top of the library. The are located in the inside th 
Currently supported tools are:



* *bpls* : exploration of bp/hdf5 files data and metadata in human readable outputs   

* *adios2_reorganize*

* *adios_reorganize*

* *adios2-config*



.. include:: bpls.rst

.. include:: adios2_reorganize.rst

.. include:: adios_reorganize.rst

.. include:: adios2-config.rst

source/utils/CMakeLists.txt

+10 −8
Original line number Diff line number Diff line
@@ -19,20 +19,22 @@ file(GENERATE 
  INPUT ${PROJECT_BINARY_DIR}/bpls.cmake.gen

)



# ADIOS2_REORGANIZE

add_executable(adios2_reorganize 

               ./adios2_reorganize/main.cpp 

               ./adios2_reorganize/Reorganize.cpp 

# ADIOS_REORGANIZE

add_executable(adios_reorganize 

               ./adios_reorganize/main.cpp 

               ./adios_reorganize/Reorganize.cpp 

               Utils.cpp)

target_link_libraries(adios2_reorganize adios2)

install(TARGETS adios2_reorganize EXPORT adios2

target_link_libraries(adios_reorganize adios2)

install(TARGETS adios_reorganize EXPORT adios2

  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

)



# Add MPI dependency to parallel tools

if(ADIOS2_HAVE_MPI)

  target_link_libraries(adios2_reorganize MPI::MPI_C)

  target_link_libraries(adios_reorganize MPI::MPI_C)

endif()





if(ADIOS2_HAVE_MPI)

  add_subdirectory(adios_iotest)

endif()

source/utils/adios_iotest/CMakeLists.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
#------------------------------------------------------------------------------#

# Distributed under the OSI-approved Apache License, Version 2.0.  See

# accompanying file Copyright.txt for details.

#------------------------------------------------------------------------------#



file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/iotest-config

  DESTINATION ${PROJECT_BINARY_DIR}

)



add_executable(adios_iotest settings.cpp decomp.cpp processConfig.cpp adios_iotest.cpp)

target_link_libraries(adios_iotest adios2 MPI::MPI_C)



install(TARGETS adios_iotest EXPORT adios2

  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

)



install(DIRECTORY iotest-config/ 

   DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/iotest-config

)