From c274b34f3f71a0157d920c158164892164299734 Mon Sep 17 00:00:00 2001 From: Vicente Adolfo Bolea Sanchez Date: Wed, 1 Nov 2023 19:17:25 -0400 Subject: [PATCH] updated v2.9.2 --- recipe/3769.patch | 21 --------------------- recipe/meta.yaml | 9 +++------ 2 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 recipe/3769.patch diff --git a/recipe/3769.patch b/recipe/3769.patch deleted file mode 100644 index 5ec7bad..0000000 --- a/recipe/3769.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 5397b295009523f9f55130753b49470bb53e6d77 Mon Sep 17 00:00:00 2001 -From: Norbert Podhorszki -Date: Thu, 17 Aug 2023 16:08:43 -0400 -Subject: [PATCH 1/2] Fix ChunkV maintaining CurOffset when downsizing current - chunk in Allocate() and creating the next chunk. - ---- - .../toolkit/format/buffer/chunk/ChunkV.cpp | 1 + - -diff --git a/source/adios2/toolkit/format/buffer/chunk/ChunkV.cpp b/source/adios2/toolkit/format/buffer/chunk/ChunkV.cpp -index 27cb11e334..42df160434 100644 ---- a/source/adios2/toolkit/format/buffer/chunk/ChunkV.cpp -+++ b/source/adios2/toolkit/format/buffer/chunk/ChunkV.cpp -@@ -193,6 +193,7 @@ BufferV::BufferPos ChunkV::Allocate(const size_t size, size_t align) - { - auto p = m_Chunks.back().Ptr + m_TailChunkPos; - std::fill(p, p + alignment, 0); -+ CurOffset += alignment; - } - DataV.back().Size = actualsize; - m_TailChunkPos = 0; diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f1704ff..6d599fc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,7 +1,7 @@ {% set name = "adios2" %} -{% set version = "2.9.1" %} -{% set sha256 = "ddfa32c14494250ee8a48ef1c97a1bf6442c15484bbbd4669228a0f90242f4f9" %} -{% set build = 4 %} +{% set version = "2.9.2" %} +{% set sha256 = "78309297c82a95ee38ed3224c98b93d330128c753a43893f63bbe969320e4979" %} +{% set build = 0 %} # ensure mpi is defined (needed for conda-smithy recipe-lint) {% set mpi = mpi or 'nompi' %} @@ -32,9 +32,6 @@ source: sha256: {{ sha256 }} patches: - python-exclude-from-all.patch - # Fix ChunkV maintaining CurOffset when downsizing current chunk #3769 - # https://github.com/ornladios/ADIOS2/pull/3769 - - 3769.patch build: number: {{ build }}