Skip to content
Snippets Groups Projects
Commit 897d1c93 authored by Atkins, Charles Vernon's avatar Atkins, Charles Vernon Committed by GitHub
Browse files

Merge pull request #72 from chuckatkins/finish-reorg 

Finish reorg
parents 5e0aa522 262f0ca7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 107 additions and 51 deletions
CMakeLists.txt
+ 7
− 0
View file @ 897d1c93
......@@ -78,6 +78,13 @@ option(ADIOS_USE_HDF5 "Enable support for the HDF5 engine" OFF)
# platform supports it.
set(ADIOS_USE_DataMan ${SHARED_LIBS_SUPPORTED})
include(GenerateADIOSConfig)
GenerateADIOSConfig(MPI BZip2 ADIOS1 HDF5 DataMan)
install(
FILES ${ADIOS_BINARY_DIR}/adios2/ADIOSConfig.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/adios2
)
#------------------------------------------------------------------------------#
# Third party libraries
#------------------------------------------------------------------------------#
......
bindings/python/include/ADIOSPy.h
+ 6
− 6
View file @ 897d1c93
......@@ -16,17 +16,17 @@
#include <string>
#ifdef HAVE_BOOSTPYTHON
#include "boost/python.hpp"
#include "adios2/boost/python.hpp"
#endif
#ifdef HAVE_PYBIND11
#include "pybind11/pybind11.h"
#include "adios2/pybind11/pybind11.h"
#endif
#include "ADIOS.h"
#include "MethodPy.h"
#include "VariablePy.h"
#include "adiosPyFunctions.h" //ListToVector, VectorToList
#include "adios2/ADIOS.h"
#include "adios2/MethodPy.h"
#include "adios2/VariablePy.h"
#include "adios2/adiosPyFunctions.h" //ListToVector, VectorToList
namespace adios
{
......
bindings/python/include/EnginePy.h
+ 8
− 8
View file @ 897d1c93
......@@ -12,19 +12,19 @@
#define ENGINEPY_H_
#ifdef HAVE_BOOSTPYTHON
#include "boost/python.hpp"
#include "boost/python/numpy.hpp"
#include "adios2/boost/python.hpp"
#include "adios2/boost/python/numpy.hpp"
#endif
#ifdef HAVE_PYBIND11
#include "pybind11/numpy.h"
#include "pybind11/pybind11.h"
#include "adios2/pybind11/numpy.h"
#include "adios2/pybind11/pybind11.h"
#endif
#include "ADIOSPy.h"
#include "VariablePy.h"
#include "adiosPyFunctions.h"
#include "core/Engine.h"
#include "adios2/ADIOSPy.h"
#include "adios2/VariablePy.h"
#include "adios2/adiosPyFunctions.h"
#include "adios2/core/Engine.h"
namespace adios
{
......
bindings/python/include/MethodPy.h
+ 4
− 4
View file @ 897d1c93
......@@ -12,15 +12,15 @@
#define METHODPY_H_
#ifdef HAVE_BOOSTPYTHON
#include "boost/python.hpp"
#include "adios2/boost/python.hpp"
#endif
#ifdef HAVE_PYBIND11
#include "pybind11/cast.h"
#include "pybind11/pybind11.h"
#include "adios2/pybind11/cast.h"
#include "adios2/pybind11/pybind11.h"
#endif
#include "core/Method.h"
#include "adios2/core/Method.h"
namespace adios
{
......
bindings/python/include/VariablePy.h
+ 2
− 2
View file @ 897d1c93
......@@ -11,8 +11,8 @@
#ifndef VARIABLEPY_H_
#define VARIABLEPY_H_
#include "adiosPyFunctions.h"
#include "core/Variable.h"
#include "adios2/adiosPyFunctions.h"
#include "adios2/core/Variable.h"
namespace adios
{
......
bindings/python/include/adiosPyFunctions.h
+ 4
− 4
View file @ 897d1c93
......@@ -16,13 +16,13 @@
#include <vector>
#ifdef HAVE_BOOSTPYTHON
#include "boost/python.hpp"
#include "boost/python/numpy.hpp"
#include "adios2/boost/python.hpp"
#include "adios2/boost/python/numpy.hpp"
#endif
#ifdef HAVE_PYBIND11
#include "pybind11/numpy.h"
#include "pybind11/pybind11.h"
#include "adios2/pybind11/numpy.h"
#include "adios2/pybind11/pybind11.h"
#endif
namespace adios
......
bindings/python/src/ADIOSPy.cpp
+ 2
− 2
View file @ 897d1c93
......@@ -12,8 +12,8 @@
#include <mpi4py/mpi4py.h>
#include "ADIOSPy.h"
#include "EnginePy.h"
#include "adios2/ADIOSPy.h"
#include "adios2/EnginePy.h"
namespace adios
{
......
bindings/python/src/EnginePy.cpp
+ 2
− 2
View file @ 897d1c93
......@@ -10,9 +10,9 @@
#include <string>
#include "EnginePy.h"
#include "adios2/EnginePy.h"
#include "adiosPyFunctions.h"
#include "adios2/adiosPyFunctions.h"
namespace adios
{
......
bindings/python/src/MethodPy.cpp
+ 2
− 2
View file @ 897d1c93
......@@ -10,8 +10,8 @@
#include <iostream>
#include "MethodPy.h"
#include "adiosPyFunctions.h"
#include "adios2/MethodPy.h"
#include "adios2/adiosPyFunctions.h"
namespace adios
{
......
bindings/python/src/VariablePy.cpp
+ 1
− 1
View file @ 897d1c93
......@@ -8,7 +8,7 @@
* Author: wfg
*/
#include "VariablePy.h"
#include "adios2/VariablePy.h"
namespace adios
{
......
bindings/python/src/adiosPyFunctions.cpp
+ 1
− 1
View file @ 897d1c93
......@@ -9,7 +9,7 @@
*/
#include <iostream>
#include "adiosPyFunctions.h"
#include "adios2/adiosPyFunctions.h"
namespace adios
{
......
bindings/python/src/glueBoostPython.cpp
+ 7
− 7
View file @ 897d1c93
......@@ -10,14 +10,14 @@
#include <mpi4py/mpi4py.h>
#include "boost/python.hpp"
#include "boost/python/numpy.hpp"
#include "boost/python/raw_function.hpp"
#include "boost/python/suite/indexing/vector_indexing_suite.hpp"
#include "adios2/boost/python.hpp"
#include "adios2/boost/python/numpy.hpp"
#include "adios2/boost/python/raw_function.hpp"
#include "adios2/boost/python/suite/indexing/vector_indexing_suite.hpp"
#include "ADIOSPy.h"
#include "EnginePy.h"
#include "adiosPyFunctions.h"
#include "adios2/ADIOSPy.h"
#include "adios2/EnginePy.h"
#include "adios2/adiosPyFunctions.h"
namespace py = boost::python;
namespace np = boost::python::numpy;
......
bindings/python/src/gluePyBind11.cpp
+ 3
− 3
View file @ 897d1c93
......@@ -12,10 +12,10 @@
#include <mpi4py/mpi4py.h>
#include "pybind11/pybind11.h"
#include "adios2/pybind11/pybind11.h"
#include "ADIOSPy.h"
#include "EnginePy.h"
#include "adios2/ADIOSPy.h"
#include "adios2/EnginePy.h"
namespace py = pybind11;
......
cmake/GenerateADIOSConfig.cmake 0 → 100644
+ 48
− 0
View file @ 897d1c93
#------------------------------------------------------------------------------#
# Distributed under the OSI-approved Apache License, Version 2.0. See
# accompanying file Copyright.txt for details.
#------------------------------------------------------------------------------#
function(GenerateADIOSConfig)
configure_file(
${ADIOS_SOURCE_DIR}/source/adios2/ADIOSConfig.h.in
${ADIOS_BINARY_DIR}/adios2/ADIOSConfig.h
)
foreach(L IN ITEMS C CXX Fortran)
if(NOT CMAKE_${L}_COMPILER)
continue()
endif()
file(APPEND ${ADIOS_BINARY_DIR}/adios2/ADIOSConfig.h
" * ${L}: ${CMAKE_${L}_COMPILER}\n"
)
if(CMAKE_${L}_COMPILER_WRAPPER)
file(APPEND ${ADIOS_BINARY_DIR}/adios2/ADIOSConfig.h
" * Wrapper: ${CMAKE_${L}_COMPILER_WRAPPER}\n"
)
endif()
file(APPEND ${ADIOS_BINARY_DIR}/adios2/ADIOSConfig.h
" * Id: ${CMAKE_${L}_COMPILER_ID} ${CMAKE_${L}_COMPILER_VERSION}\n"
)
endforeach()
file(APPEND ${ADIOS_BINARY_DIR}/adios2/ADIOSConfig.h " */\n")
foreach(OPT IN LISTS ARGN)
string(TOUPPER ${OPT} OPT_UPPER)
file(APPEND ${ADIOS_BINARY_DIR}/adios2/ADIOSConfig.h
"\n/* CMake Option: ADIOS_USE_${OPT}=${ADIOS_USE_${OPT}} */\n"
)
if(ADIOS_USE_${OPT})
file(APPEND ${ADIOS_BINARY_DIR}/adios2/ADIOSConfig.h
"#define ADIOS2_HAVE_${OPT_UPPER} 1\n"
)
else()
file(APPEND ${ADIOS_BINARY_DIR}/adios2/ADIOSConfig.h
"#undef ADIOS2_HAVE_${OPT_UPPER}\n"
)
endif()
endforeach()
file(APPEND ${ADIOS_BINARY_DIR}/adios2/ADIOSConfig.h
"\n#endif /* ADIOSCONFIG_H_ */\n"
)
endfunction()
doc/API_design/API_example_use.cpp
+ 1
− 1
View file @ 897d1c93
......@@ -2,7 +2,7 @@
* of the ideas */
#include <mpi.h>
#include "ADIOS.h"
#include "adios2/ADIOS.h"
void cb_AsyncWriteAdvanceCompleted(std::shared_ptr<adios::Engine> writer)
{
......
examples/globalArray/globalArrayNoXML.cpp
+ 1
− 1
View file @ 897d1c93
......@@ -15,7 +15,7 @@
#include <string>
#include <vector>
#include "../../include/ADIOS.h"
#include "adios2/../../include/ADIOS.h"
int main(int argc, char *argv[])
{
......
examples/globalArray/globalArrayXML.cpp
+ 1
− 1
View file @ 897d1c93
......@@ -15,7 +15,7 @@
#include <string>
#include <vector>
#include "../../include/ADIOS.h"
#include "adios2/../../include/ADIOS.h"
int main(int argc, char *argv[])
{
......
examples/globalArray/globalArrayZeroCopy.cpp
+ 1
− 1
View file @ 897d1c93
......@@ -15,7 +15,7 @@
#include <string>
#include <vector>
#include "../../include/ADIOS.h"
#include "adios2/../../include/ADIOS.h"
int main(int argc, char *argv[])
{
......
examples/heatTransfer/read/PrintData.cpp
+ 2
− 1
View file @ 897d1c93
......@@ -8,12 +8,13 @@
* Author: Norbert Podhorszki
*/
#include "PrintData.h"
#include <fstream>
#include <iomanip>
#include <iostream>
#include <string>
#include "PrintData.h"
void printData(double *xy, uint64_t *size, uint64_t *offset, int rank,
int steps)
{
......
examples/heatTransfer/read/heatRead_adios1.cpp
+ 4
− 4
View file @ 897d1c93
#include <mpi.h>
#include "adios_read.h"
#include <cstdint>
#include <iomanip>
#include <iostream>
#include <math.h>
......@@ -10,6 +7,9 @@
#include <stdexcept>
#include <string>
#include <adios_read.h>
#include <mpi.h>
#include "PrintData.h"
int main(int argc, char *argv[])
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment