Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: find branchs in chrono order #3666

Closed
wants to merge 45 commits into from
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
eff1b1b
BP5: fixes memory error with IBM XL
vicentebolea May 10, 2023
f1cedf3
Merge pull request #3619 from vicentebolea/backports-bp5-bugfix
vicentebolea May 29, 2023
457d8e2
Merge pull request #3623 from vicentebolea/kokkos-use-nvcc-wrapper
vicentebolea May 17, 2023
72e430c
ci,ascent: enable ascent builds
vicentebolea May 5, 2023
6bbf433
ci,olcf,crusher: enable Crusher CI
vicentebolea May 12, 2023
55fe563
ci,crusher: minor tweaks
vicentebolea May 25, 2023
86b792f
docs: update whatsnew
vicentebolea May 25, 2023
4e640c1
Bump requests from 2.28.1 to 2.31.0 in /docs
dependabot[bot] May 23, 2023
be4fcbc
CI,windows: change MSMPI URL
vicentebolea May 22, 2023
bc04804
fixed https://github.com/ornladios/ADIOS2/issues/3638
guj May 26, 2023
c55cf75
crusher,ci: set unique env per pipeline
vicentebolea May 29, 2023
3bd4cff
Merge pull request #3643 from vicentebolea/backports-from-master
vicentebolea May 30, 2023
32eb32b
Allow Span in files opened for Append
eisenhauer Jun 8, 2023
7bd34be
Merge pull request #3657 from eisenhauer/SpanAppend
eisenhauer Jun 8, 2023
b395e8f
ci: find branchs in chrono order
vicentebolea Jun 30, 2023
6277f97
Fix: std::min w/ windows.h in C-Blosc2
ax3l Jul 1, 2023
12c4319
Merge pull request #3681 from ax3l/fix-blosc2-windows-min
eisenhauer Jul 2, 2023
e0f9dc0
enet 2023-06-08 (f93beb4e)
Jun 8, 2023
74eebf7
Merge branch 'upstream-enet' into BP5
eisenhauer Jul 2, 2023
298e38a
EVPath 2023-06-10 (e9be8e63)
Jun 10, 2023
9c455f6
Merge branch 'upstream-EVPath' into BP5
eisenhauer Jul 2, 2023
6535ef9
atl 2023-06-07 (f3c23577)
Jun 7, 2023
86c328a
Merge branch 'upstream-atl' into BP5
eisenhauer Jul 2, 2023
1e45542
ffs 2023-06-06 (46d79432)
Jun 6, 2023
324febb
Merge branch 'upstream-ffs' into BP5
eisenhauer Jul 2, 2023
20afb0e
dill 2023-06-09 (6c94efb3)
Jun 9, 2023
5023da9
Merge branch 'upstream-dill' into BP5
eisenhauer Jul 2, 2023
8ea624a
Tweaks for BP5 on Windows
eisenhauer Jul 2, 2023
e08dba0
String fix and timeout
eisenhauer Jul 3, 2023
9785b9a
Merge pull request #3682 from eisenhauer/BP5
eisenhauer Jul 3, 2023
06ca9cf
Merge branch 'release_29'
vicentebolea Jul 3, 2023
537405d
Merge pull request #3681 from ax3l/fix-blosc2-windows-min
eisenhauer Jul 2, 2023
1b99c8c
Merge release_29
vicentebolea Jul 3, 2023
6917bf9
Fix memory leak when there are Joined Arrays in streaming mode
eisenhauer May 10, 2023
68b282c
Merge pull request #3684 from eisenhauer/FixLeak
eisenhauer Jul 3, 2023
defc1c7
Merge pull request #3673 from vicentebolea/disable-ascent-install-test
vicentebolea Jun 29, 2023
43ae62c
Merge pull request #3650 from ornladios/dependabot/pip/docs/cryptogra…
vicentebolea Jun 14, 2023
af34a40
Merge pull request #3652 from guj/unistd-windows
guj Jun 5, 2023
ce73176
Merge pull request #3684 from eisenhauer/FixLeak
eisenhauer Jul 3, 2023
5e1f9f5
Merge pull request #3685 from vicentebolea/backports_release_29
vicentebolea Jul 4, 2023
ec7d094
Merge branch 'release_29'
vicentebolea Jul 4, 2023
55dc9b2
Merge pull request #3657 from eisenhauer/SpanAppend
eisenhauer Jun 8, 2023
9318869
Fix for the issue #3646. It looks like the default for macos and pyth…
dmitry-ganyushin Jul 4, 2023
c8c5238
Merge pull request #3687 from dmitry-ganyushin/i3646-mult-macos
eisenhauer Jul 4, 2023
b8b4ac0
Merge pull request #3666 from vicentebolea/ci-crusher-tweaks
vicentebolea Jul 5, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions source/adios2/engine/bp5/BP5Writer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -547,12 +547,14 @@ void BP5Writer::EndStep()
m_Profiler.Start("AWD");
// TSInfo destructor would delete the DataBuffer so we need to save it
// for async IO and let the writer free it up when not needed anymore
adios2::format::BufferV *databuf = TSInfo.DataBuffer;
TSInfo.DataBuffer = NULL;
m_AsyncWriteLock.lock();
m_flagRush = false;
m_AsyncWriteLock.unlock();
WriteData(databuf);

// WriteData will free TSInfo.DataBuffer
WriteData(TSInfo.DataBuffer);
TSInfo.DataBuffer = NULL;

m_Profiler.Stop("AWD");

/*
Expand Down Expand Up @@ -688,6 +690,16 @@ void BP5Writer::EndStep()
m_EndStepEnd = Now();
/* Seconds ts2 = Now() - m_EngineStart;
std::cout << "END STEP ended at: " << ts2.count() << std::endl;*/

if (TSInfo.AttributeEncodeBuffer)
{
delete TSInfo.AttributeEncodeBuffer;
}

if (TSInfo.MetaEncodeBuffer)
{
delete TSInfo.MetaEncodeBuffer;
}
}

// PRIVATE
Expand Down
4 changes: 0 additions & 4 deletions source/adios2/toolkit/format/bp5/BP5Serializer.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ class BP5Serializer : virtual public BP5Base

~TimestepInfo()
{
delete MetaEncodeBuffer;
if (AttributeEncodeBuffer)
delete AttributeEncodeBuffer;
delete DataBuffer;
}
};

Expand Down