Unverified Commit cb871e73 authored by Bolea Sanchez, Vicente Adolfo's avatar Bolea Sanchez, Vicente Adolfo Committed by GitHub
Browse files

Merge pull request #4374 from vicentebolea/backport-from-master

Backport from master
parents 43591d41 74698a47
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ If you find ADIOS2 useful, please cite our [SoftwareX paper](https://doi.org/10.
## Releases

* Latest release: [v2.10.1](https://github.com/ornladios/ADIOS2/releases/tag/v2.10.1)

* Previous releases: [https://github.com/ornladios/ADIOS2/releases](https://github.com/ornladios/ADIOS2/releases)

## Packages
+0 −4
Original line number Diff line number Diff line
@@ -210,9 +210,7 @@ public:
        auto bufferView = static_cast<AdiosView<U>>(data);
#if defined(ADIOS2_HAVE_KOKKOS) || defined(ADIOS2_HAVE_GPU_SUPPORT)
        auto bufferMem = bufferView.memory_space();
        auto bufferLayout = bufferView.layout();
        variable.SetMemorySpace(bufferMem);
        variable.SetArrayLayout(bufferLayout);
#endif
        Put(variable, bufferView.data(), launch);
    }
@@ -416,9 +414,7 @@ public:
        auto bufferView = static_cast<AdiosView<U>>(data);
#if defined(ADIOS2_HAVE_KOKKOS) || defined(ADIOS2_HAVE_GPU_SUPPORT)
        auto bufferMem = bufferView.memory_space();
        auto bufferLayout = bufferView.layout();
        variable.SetMemorySpace(bufferMem);
        variable.SetArrayLayout(bufferLayout);
#endif
        Get(variable, bufferView.data(), launch);
    }
+2 −1
Original line number Diff line number Diff line
@@ -280,7 +280,8 @@ std::vector<std::map<std::string, std::string>> Engine::BlocksInfo(std::string &
    MinVarInfo *minBlocksInfo = nullptr;

    auto Variable = itVariable->second.get();
    minBlocksInfo = m_Engine->MinBlocksInfo(*Variable, 0);
    size_t s = (m_Engine->m_OpenMode == Mode::ReadRandomAccess ? step : 0);
    minBlocksInfo = m_Engine->MinBlocksInfo(*Variable, s);
    if (minBlocksInfo)
    {
        for (auto &info : minBlocksInfo->BlocksInfo)
+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ class Stream:
        if shape != [] and not variable.single_value():
            variable.set_shape(shape)

        if start != [] and count != []:
        if start != [] or count != []:
            variable.set_selection([start, count])

        if operations:
+0 −59
Original line number Diff line number Diff line
#!/bin/bash
# shellcheck disable=SC2191

module load rocm/5.4.0
module load gcc/11.2.0
module load cmake/3.23.2
module load craype-accel-amd-gfx90a

######## User Configurations ########
Kokkos_HOME=$HOME/kokkos/kokkos
ADIOS2_HOME=$(pwd)
BUILD_DIR=${ADIOS2_HOME}/build-kokkos-crusher
INSTALL_DIR=${ADIOS2_HOME}/install-kokkos-crusher

num_build_procs=4

######## Kokkos ########
mkdir -p "${BUILD_DIR}/kokkos"
rm -f "${BUILD_DIR}/kokkos/CMakeCache.txt"
rm -rf "${BUILD_DIR}/kokkos/CMakeFiles"

ARGS=(
    -D CMAKE_BUILD_TYPE=RelWithDebInfo
    -D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
	-D CMAKE_CXX_COMPILER=hipcc

    -D Kokkos_ENABLE_SERIAL=ON
    -D Kokkos_ARCH_ZEN3=ON
    -D Kokkos_ENABLE_HIP=ON
    -D Kokkos_ARCH_VEGA90A=ON

    -D CMAKE_CXX_STANDARD=17
    -D CMAKE_CXX_EXTENSIONS=OFF
    -D CMAKE_POSITION_INDEPENDENT_CODE=TRUE
	-D BUILD_SHARED_LIBS=ON
)
cmake "${ARGS[@]}" -S "${Kokkos_HOME}" -B "${BUILD_DIR}/kokkos"
cmake --build "${BUILD_DIR}/kokkos" -j${num_build_procs}
cmake --install "${BUILD_DIR}/kokkos"

######## ADIOS2 ########
mkdir -p "${BUILD_DIR}/adios2"
rm -f "${BUILD_DIR}/adios2/CMakeCache.txt"
rm -rf "${BUILD_DIR}/adios2/CMakeFiles"

ARGS_ADIOS=(
    -D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
    -D CMAKE_CXX_COMPILER=g++
    -D CMAKE_C_COMPILER=gcc

    -D ADIOS2_USE_Kokkos=ON
    -D Kokkos_ROOT="${INSTALL_DIR}"

    -D CMAKE_POSITION_INDEPENDENT_CODE=TRUE
    -D BUILD_SHARED_LIBS=ON
)
cmake "${ARGS_ADIOS[@]}" -S "${ADIOS2_HOME}" -B "${BUILD_DIR}"/adios2
cmake --build "${BUILD_DIR}/adios2" -j${num_build_procs}
cmake --install "${BUILD_DIR}/adios2"
Loading