Skip to content

Commit

Permalink
Merge branch 'master' into http-connector
Browse files Browse the repository at this point in the history 
* master: (183 commits)
  Adding tests for writing null blocks with and without compression
  Replace LookupWriterRec's linear search on RecList with an unordered_map. For 250k variables, time goes from 21sec to ~1sec in WSL. The order of entries in RecList was not necessary for the serializer to work correctly.
  Merge pull request ornladios#3805 from pnorbert/fix-bpls-string-scalar
  Merge pull request ornladios#3804 from pnorbert/fix-aws-version
  Merge pull request ornladios#3759 from pnorbert/bp5dbg-metadata
  new attempt to commit query support of local array. (ornladios#3868)
  MPI::MPI_Fortran should be INTERFACE not PUBLIC
  Fix hip example compilation error (ornladios#3865)
  Server Improvements (ornladios#3862)
  ascent,ci: remove unshallow flag
  Remove Slack as a contact mechanism (ornladios#3866)
  bug fix:  syntax error in json  output (ornladios#3857)
  Update the bpWriterReadHip example's cmake to run on crusher
  Examples: Use BPFile instead of BP3/4/5 for future-proof
  inlineMWE example: Close files at the end
  Examples: Add BeginStep/EndStep wherever it was missing
  BP5Serializer: handle local variables that use operators (ornladios#3859)
  Blosc2 USE ON: Fix Module Fallback (ornladios#3774)
  SST,MPI,DP: soft handle peer error
  SST,MPI,DP: improve uniq identifier
  Fix destdir install test (ornladios#3850)
  cmake: include ctest before detectoptions
  ci: enable tau check
  Add/Improve the ReadMe.md files in examples directory
  Disable BUILD_TESTING and ADIOS2_BUILD_EXAMPLES by default
  Remove testing based on ADIOS2-examples
  Fix formatting issue in DetectOptions.cmake
  Add examples from ADIOS2-Examples
  Improve existing examples
  MPI_DP: do not call MPI_Init (ornladios#3847)
  cmake: update minimum cmake to 3.12 (ornladios#3849)
  MPI: add timeout for conf test for MPI_DP (ornladios#3848)
  Tweak Remote class and test multi-threaded file remote access (ornladios#3834)
  Add prototype testing of remote functionality (ornladios#3830)
  Try always using the MPI version
  Try always using the MPI version
  Import tests from bp to staging common, implement memory selection in SST
  ci: fix codeql ignore path (ornladios#3772)
  install: export adios2 device variables (ornladios#3819)
  added support to query BP5 files (ornladios#3809)
  ffs 2023-09-19 (67e411c0)
  Fix abs/rel step in BP5 DoCount
  fix dummy Win build
  Pass Array Order of reader to remote server for proper Get() operation
  Fix the ADIOS_USE_{_} variable names to use ADIOS2
  Remove BP5 BetweenStepPairs variable that hides Engine.h counterpart
  Delete experimental examples
  yaml-cpp: support 0.8.0 version
  Mod not to overload to make some compilers happy
  Mod to keep MinBlocksInfo private to BP5Writer, not reuse Engine.h API.
  gha,ci: update checkout to v4
  Limit testing changes to BP5
  tests: fix windows 64bit type issues
  Add location of hdf5.dll to PATH for windows tests
  Fix more compiler warnings from ompi build
  clang format
  Fix size_t -> int conversion warnings
  Allow building with Visual Studio and HDF5 shared libs
  Fixup local var reading by block with test, master branch
  use documented initial cache variable to find hdf5 on windows
  ci: Add HDF5 to a windows build
  Remove unused SelectionType values
  Update ADIOS2 HDF5 VOL with basic set of capability flags
  defines
  reorder
  Remove file before writing, catch exceptions
  format
  Reader-side Profiling
  removed  a comment
  ci: disable MGARD static build
  cmake: fix ffs dependency
  removed comments and cleaned up more code
  bp5: remove ADIOS2_USE_BP5 option
  operators: fix module library
  ci: Create static minimal build
  cmake: correct prefer_shared_blosc behavior
  removing warning from auto
  clang-format
  match type of timestep for h5 engine to size_t (same as adios VariableBase class) when storing to hdf5, check the limit of size_t and match to the right type (uint, ulong, default ulonglong)
  BP5Deserialize: modify changes to keep abi compt
  Rename test. fix windows compile errors.
  add codeql workflow
  Fix ChunkV maintaining CurOffset when downsizing current chunk in Allocate() and creating the next chunk.
  ci: fix docker images names
  removed kwsys gitattributes
  KWSys 2023-05-25 (c9f0da47)
  fixup! ci: add mgard dependency to spack builds
  ci: remove unused script part
  cmake: remove redundant pugixml dependency
  ci: add mgard dependency to spack builds
  cmake: Remove enet config warning
  cmake: resolve cmake python deprecation
  enet 2023-08-15 (7587eb15)
  EVPath 2023-08-15 (657c7fa4)
  dill 2023-08-15 (235dadf0)
  atl 2023-08-15 (7286dd11)
  remove data.py since BP5 data file has no format
  format
  bp5dbg parse records and check sizes during it for mmd.0 and md.0. No decoding FFS records.
  cmake: correct info.h installation path
  ...
  • Loading branch information
@dmitry-ganyushin
dmitry-ganyushin committed Nov 1, 2023
2 parents f47310d + 65ef26c commit 7174719
Show file tree
Hide file tree
Showing 1,499 changed files with 146,478 additions and 62,615 deletions.
2 changes: 1 addition & 1 deletion .clang-format
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: false
FixNamespaceComments: false
Standard: Cpp11
ColumnLimit: 80
ColumnLimit: 100
AllowAllParametersOfDeclarationOnNextLine: true
AlignEscapedNewlines: Right
AlignAfterOpenBracket: Align
Expand Down
22 changes: 22 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.cxx text
*.h text
*.hxx text
*.tcc text
*.cu text
*.c text
*.h text
*.py text
*.f90 text
*.F90 text
*.sh text

*.cmake whitespace=tab-in-indent
*.md whitespace=tab-in-indent whitespace=-blank-at-eol conflict-marker-size=79
*.rst whitespace=tab-in-indent conflict-marker-size=79
*.txt whitespace=tab-in-indent
*.xml whitespace=tab-in-indent
21 changes: 19 additions & 2 deletions .github/ISSUE_TEMPLATE/new_release.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,27 @@ git push
git fetch origin
git checkout -b release_@MAJOR@@MINOR@ origin/master
# Use the following command with care
git push origin
git push origin release_@MAJOR@@MINOR@:release_@MAJOR@@MINOR@
```
<!-- else -->
- [ ] Create PR that merges release_@MAJOR@@MINOR@ into master
- [ ] Remove older patch releases for @MAJOR@.@MINOR@.X in ReadTheDocs.
- [ ] Create merge -sours commit in master:
```
git fetch origin
git checkout master
git reset --hard origin/master
# We do not want the changes master from the release branch
git -s ours release_@MAJOR@@MINOR@
# Be very careful here
git push origin master
```
<!-- endif -->
- [ ] Submit a PR in Spack that adds this new version of ADIOS (if not RC mark this new version as preferred)
- Run `spack checksum -a adios2` to add it, create commit; push it; Create
PR in Spack repo.
- [ ] Submit a PR in Conda that adds this new version of ADIOS (if not RC mark this new version as preferred)
- CondaForge robot should do this for you automatically, expect a new PR at
https://github.com/conda-forge/adios2-feedstock a couple of hours after the
release.
- [ ] Write an announcement in the ADIOS-ECP mail-list
(https://groups.google.com/a/kitware.com/g/adios-ecp)
Loading

0 comments on commit 7174719

Please sign in to comment.