Skip to content

Commit

Permalink
Merge branch 'release' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
aradi committed May 6, 2022
2 parents 68219e2 + 13b0391 commit d2062d2
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 5 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@ Change Log
Notable project changes in various releases.


1.3
===

Added
------

* Grid splitting based on type (e.g. MPI_COMM_TYPE_SHARED)

* Wrappers for accessing MPI shared memory window

* Some tests accessible via ctest


1.2
===

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.0
1.3.0
2 changes: 1 addition & 1 deletion doc/doxygen/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ PROJECT_NAME = "MpiFx"
# This could be handy for archiving the generated documentation or
# if some version control system is used.

PROJECT_NUMBER = "1.2.0"
PROJECT_NUMBER = "1.3.0"

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer
Expand Down
4 changes: 2 additions & 2 deletions doc/sphinx/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
# built documents.
#
# The short X.Y version.
version = '1.2'
version = '1.3'

# The full version, including alpha/beta/rc tags.
release = '1.2.0'
release = '1.3.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion test/test_allgather.f90
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ program test_allgather
integer, allocatable :: recv1(:), recv2(:,:)
character(100) :: formstr
character(*), parameter :: label = "(I2.2,'-',I3.3,'|',1X"
logical :: tPassed
logical :: isPassed

call mpifx_init()
call mycomm%init()
Expand Down
4 changes: 4 additions & 0 deletions utils/srcmanip/set_version
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ _VERSION_PATTERN = r'\d+\.\d+(?:\.\d+)?(?:-\w+)?'

_FILES_AND_PATTERNS = [
#
('VERSION',
r'{}'.format(_VERSION_PATTERN),
r'{version}'),
#
('doc/doxygen/Doxyfile',
r'^PROJECT_NUMBER\s*=\s*([\'"]){}\1\s*$'.format(_VERSION_PATTERN),
'PROJECT_NUMBER = "{version}"\n'),
Expand Down

0 comments on commit d2062d2

Please sign in to comment.