Skip to content
Snippets Groups Projects
Commit a60a0592 authored by Podhorszki, Norbert's avatar Podhorszki, Norbert
Browse files

Merge branch 'master' of github:ornladios/ADIOS2 into adios1

parents ac17ba1b 63187fce
No related branches found
No related tags found
1 merge request!41ADIOS1 Write engine, Selections, Variable.SetSelection() and updated Heat Transfer example
Hide whitespace changes
Inline Side-by-side
Showing
with 120 additions and 71 deletions
CMakeLists.txt
+ 2
− 2
View file @ a60a0592
......@@ -65,12 +65,12 @@ if(ADIOS_ENABLE_PIC)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif()
option(ADIOS_USE_MPI "Enable the MPI version of ADIOS" ON)
option(ADIOS_USE_MPI "Enable the MPI version of ADIOS" OFF)
if(ADIOS_USE_MPI)
# Workaround for OpenMPI forcing the link of C++ bindings
add_definitions(-DOMPI_SKIP_MPICXX)
endif()
option(ADIOS_USE_BZip2 "Enable support for BZip2 transforms" ON)
option(ADIOS_USE_BZip2 "Enable support for BZip2 transforms" OFF)
option(ADIOS_USE_ADIOS1 "Enable support for the ADIOS 1 engine" OFF)
option(ADIOS_USE_DataMan "Enable support for the DataMan engine" OFF)
......
Contributing.md
+ 7
− 0
View file @ a60a0592
......@@ -16,6 +16,13 @@ To setup your local repository for development:
```
[chuck@hal9000 Code]$ mkdir adios
[chuck@hal9000 Code]$ cd adios
#
# If you don't have ssh access setup to your github repository then you will
# need to clone your fork from
# https://github.com/<your-GitHub-username-here>/adios2.git
# instead of
# git@github.com:<your-GitHub-username-here>/adios2.git
#
[chuck@hal9000 adios]$ git clone git@github.com:<your-GitHub-username-here>/adios2.git source
Cloning into 'source'...
remote: Counting objects: 4535, done.
......
examples/hello/bpWriter/CMakeLists.txt
+ 7
− 7
View file @ a60a0592
......@@ -3,6 +3,13 @@
# accompanying file Copyright.txt for details.
#------------------------------------------------------------------------------#
add_executable(hello_bpWriter_nompi helloBPWriter_nompi.cpp)
target_link_libraries(hello_bpWriter_nompi adios2_nompi)
if(ADIOS_BUILD_TESTING)
add_test( NAME Example::hello::bpWriter_nompi COMMAND hello_bpWriter_nompi)
endif()
if(ADIOS_USE_MPI)
find_package(MPI COMPONENTS C REQUIRED)
add_executable(hello_bpWriter helloBPWriter.cpp)
......@@ -12,12 +19,5 @@ if(ADIOS_USE_MPI)
if(ADIOS_BUILD_TESTING)
add_test( NAME Example::hello::bpWriter COMMAND hello_bpWriter)
endif()
else()
add_executable(hello_bpWriter_nompi helloBPWriter_nompi.cpp)
target_link_libraries(hello_bpWriter_nompi adios2)
if(ADIOS_BUILD_TESTING)
add_test( NAME Example::hello::bpWriter_nompi COMMAND hello_bpWriter_nompi)
endif()
endif()
examples/hello/datamanReader/CMakeLists.txt
+ 10
− 10
View file @ a60a0592
......@@ -3,6 +3,16 @@
# accompanying file Copyright.txt for details.
#------------------------------------------------------------------------------#
add_executable(hello_datamanReader_nompi helloDataManReader_nompi.cpp)
target_link_libraries(hello_datamanReader_nompi adios2_nompi)
if(ADIOS_BUILD_TESTING)
add_test(
NAME Example::hello::datamanReader_nompi
COMMAND hello_datamanReader_nompi
)
endif()
if(ADIOS_USE_MPI)
find_package(MPI COMPONENTS C REQUIRED)
......@@ -14,15 +24,5 @@ if(ADIOS_USE_MPI)
if(ADIOS_BUILD_TESTING)
add_test(NAME Example::hello::datamanReader COMMAND hello_datamanReader)
endif()
else()
add_executable(hello_datamanReader_nompi helloDataManReader_nompi.cpp)
target_link_libraries(hello_datamanReader_nompi adios2)
if(ADIOS_BUILD_TESTING)
add_test(
NAME Example::hello::datamanReader_nompi
COMMAND hello_datamanReader_nompi
)
endif()
endif()
examples/hello/datamanWriter/CMakeLists.txt
+ 10
− 10
View file @ a60a0592
......@@ -3,6 +3,16 @@
# accompanying file Copyright.txt for details.
#------------------------------------------------------------------------------#
add_executable(hello_datamanWriter_nompi helloDataManWriter_nompi.cpp)
target_link_libraries(hello_datamanWriter_nompi adios2_nompi)
if(ADIOS_BUILD_TESTING)
add_test(
NAME Example::hello::datamanWriter_nompi
COMMAND hello_datamanWriter_nompi
)
endif()
if(ADIOS_USE_MPI)
find_package(MPI COMPONENTS C REQUIRED)
......@@ -14,15 +24,5 @@ if(ADIOS_USE_MPI)
if(ADIOS_BUILD_TESTING)
add_test(NAME Example::hello::datamanWriter COMMAND hello_datamanWriter)
endif()
else()
add_executable(hello_datamanWriter_nompi helloDataManWriter_nompi.cpp)
target_link_libraries(hello_datamanWriter_nompi adios2)
if(ADIOS_BUILD_TESTING)
add_test(
NAME Example::hello::datamanWriter_nompi
COMMAND hello_datamanWriter_nompi
)
endif()
endif()
examples/hello/timeBP/CMakeLists.txt
+ 10
− 10
View file @ a60a0592
......@@ -3,6 +3,16 @@
# accompanying file Copyright.txt for details.
#------------------------------------------------------------------------------#
add_executable(hello_timeBPWriter_nompi timeBPWriter_nompi.cpp)
target_link_libraries(hello_timeBPWriter_nompi adios2_nompi)
if(ADIOS_BUILD_TESTING)
add_test(
NAME Example::hello::timeBPWriter_nompi
COMMAND hello_timeBPWriter_nompi
)
endif()
if(ADIOS_USE_MPI)
find_package(MPI COMPONENTS C REQUIRED)
add_executable(hello_timeBPWriter timeBPWriter.cpp)
......@@ -13,14 +23,4 @@ if(ADIOS_USE_MPI)
if(ADIOS_BUILD_TESTING)
add_test(NAME Example::hello::timeBPWriter COMMAND hello_timeBPWriter)
endif()
else()
add_executable(hello_timeBPWriter_nompi timeBPWriter_nompi.cpp)
target_link_libraries(hello_timeBPWriter_nompi adios2)
if(ADIOS_BUILD_TESTING)
add_test(
NAME Example::hello::timeBPWriter_nompi
COMMAND hello_timeBPWriter_nompi
)
endif()
endif()
scripts/developer/git/setup-aliases
+ 3
− 3
View file @ a60a0592
#!/usr/bin/env bash
echo "Setting up git aliases..."
if ! which clang-format 2>1 1>/dev/null
if ! which clang-format 1>/dev/null 2>&1
then
echo "Warning: ADIOS uses clang-format to enforce style guidelines but no"
echo " clang-format binary was found in tyour path"
echo " clang-format binary was found in your path"
fi
if ! git config alias.clang-format "!scripts/developer/git/git-clang-format"
then
echo "Error adding clang-format alias"
echo "Waring: Error adding clang-format alias"
fi
exit 0
scripts/developer/git/setup-remotes
+ 1
− 1
View file @ a60a0592
#!/usr/bin/env bash
echo "Checking GitHub username..."
GHUSER=$(git remote get-url origin | sed 's|.*[:/]\([^/]*\)/adios2.git|\1|')
GHUSER=$(git remote show origin | grep "Fetch URL" | sed 's|.*[:/]\([^/]*\)/adios2.git|\1|')
if [ -z "${GHUSER}" ]
then
echo " Warning: Unable to determine GitHub username. Are you sure you"
......
source/CMakeLists.txt
+ 70
− 28
View file @ a60a0592
......@@ -2,35 +2,77 @@
# Distributed under the OSI-approved Apache License, Version 2.0. See
# accompanying file Copyright.txt for details.
#------------------------------------------------------------------------------#
set(adios2_targets adios2_nompi)
if(ADIOS_USE_MPI)
list(APPEND adios2_targets adios2)
endif()
foreach(adios2_target IN LISTS adios2_targets)
add_library(${adios2_target}
ADIOS.cpp ADIOS_inst.cpp
#ADIOS_C.cpp
capsule/heap/STLVector.cpp
capsule/shmem/ShmSystemV.cpp
core/Capsule.cpp
core/Engine.cpp
core/Method.cpp
core/Support.cpp
core/Transform.cpp
core/Transport.cpp
engine/bp/BPFileReader.cpp
engine/bp/BPFileWriter.cpp
format/BP1.cpp
format/BP1Aggregator.cpp
format/BP1Writer.cpp
functions/adiosFunctions.cpp
transport/file/FStream.cpp
transport/file/FileDescriptor.cpp
transport/file/FilePointer.cpp
)
target_include_directories(${adios2_target}
PUBLIC ${ADIOS_SOURCE_DIR}/include
)
if(ADIOS_USE_ADIOS1)
find_package(ADIOS REQUIRED)
target_sources(${adios2_target} PRIVATE
engine/adios1/ADIOS1Reader.cpp
engine/adios1/ADIOS1Writer.cpp
)
target_compile_definitions(${adios2_target} PRIVATE ADIOS_HAVE_ADIOS1)
target_link_libraries(${adios2_target} PRIVATE adios::adios)
endif()
if(ADIOS_USE_DataMan)
find_package(DataMan REQUIRED)
target_sources(${adios2_target} PRIVATE
engine/dataman/DataManReader.cpp
engine/dataman/DataManWriter.cpp
transport/wan/MdtmMan.cpp
)
target_compile_definitions(${adios2_target} PRIVATE ADIOS_HAVE_DATAMAN)
target_link_libraries(${adios2_target} PRIVATE DataMan::DataMan)
endif()
if(ADIOS_USE_BZip2)
find_package(BZip2 REQUIRED)
target_sources(${adios2_target} PRIVATE transform/BZip2.cpp)
target_compile_definitions(${adios2_target} PRIVATE ADIOS_HAVE_BZIP2)
target_link_libraries(${adios2_target} PRIVATE BZip2::BZip2)
endif()
endforeach()
add_library(adios2
ADIOS.cpp ADIOS.tcc ADIOS_inst.cpp
#ADIOS_C.cpp
capsule/heap/STLVector.cpp
capsule/shmem/ShmSystemV.cpp
core/Capsule.cpp
core/Engine.cpp
core/Method.cpp
core/Support.cpp
core/Transform.cpp
core/Transport.cpp
engine/bp/BPFileReader.cpp
engine/bp/BPFileWriter.cpp
format/BP1.cpp
format/BP1Aggregator.cpp
format/BP1Writer.cpp
functions/adiosFunctions.cpp
transport/file/FStream.cpp
transport/file/FileDescriptor.cpp
transport/file/FilePointer.cpp
)
target_include_directories(adios2 PUBLIC ${ADIOS_SOURCE_DIR}/include)
target_sources(adios2_nompi PRIVATE mpidummy.cpp)
if(CMAKE_CXX_COMPILER_WRAPPER STREQUAL CrayPrgEnv)
target_compile_options(adios2_nompi PRIVATE --cray-bypass-pkgconfig)
endif()
if(ADIOS_USE_MPI)
find_package(MPI COMPONENTS C REQUIRED)
......
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