Skip to content

Commit

Permalink
Merge pull request #7035 from raffenet/4.2.2-updates
Browse files Browse the repository at this point in the history
[4.2.x] more fixes and update version info

Approved-by: Hui Zhou <hzhou321@anl.gov>
  • Loading branch information
raffenet authored Jun 27, 2024
2 parents 0cdbd7d + f30d5da commit 7a413b5
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 7 deletions.
24 changes: 24 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
===============================================================================
Changes in 4.2.2
===============================================================================

# Update embedded libfabric to v1.20.1 and fix compilation with GCC 14.

# Fix dataloop support for MPIX_Type_iov routines

# Fix crash in Hydra when system has many local ip addresses

# Fix RMA fallback check in ch4:ofi netmod

# Fix MPI_UNDEFINED handling in mpi_f08 module

# Fix Slurm environment variable inheritance in Hydra

# Fix multiple issues with large count support in ROMIO

# Fix potential hang in init using PMIx client and nonstandard keys

# Fix crash if PMIx client cannot get appnum from server during init

# Fix other build errors and warnings

===============================================================================
Changes in 4.2.1
===============================================================================
Expand Down
4 changes: 2 additions & 2 deletions maint/version.m4
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# changing this by playing with diversions, but then we would probably be
# playing with autotools-fire.

m4_define([MPICH_VERSION_m4],[4.2.1])dnl
m4_define([MPICH_VERSION_m4],[4.2.2])dnl
m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl

# For libtool ABI versioning rules see:
Expand All @@ -36,7 +36,7 @@ m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl
# standard, and does not include MPIX_ functions and C++ bindings.

# Use [0:0:0] for unstable (e.g. alpha and beta) releases.
# last version: 4.2.1 - 16:1:4
# last version: 4.2.2 - 16:2:4

m4_define([libmpi_so_version_m4],[0:0:0])dnl

Expand Down
2 changes: 1 addition & 1 deletion modules/libfabric
16 changes: 13 additions & 3 deletions src/mpi/datatype/typerep/src/typerep_dataloop_iov.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,22 @@ int MPIR_Typerep_to_iov_offset(const void *buf, MPI_Aint count, MPI_Datatype typ
{
int mpi_errno = MPI_SUCCESS;

int is_contig;
MPI_Aint typesize;
if (HANDLE_IS_BUILTIN(type)) {
MPI_Aint typesize;
is_contig = 1;
typesize = MPIR_Datatype_get_basic_size(type);
} else {
MPIR_Datatype *dt_ptr;
MPIR_Datatype_get_ptr(type, dt_ptr);
is_contig = dt_ptr->is_contig;
typesize = dt_ptr->size;
}

if (is_contig) {
if (max_iov_len >= 1) {
iov[0].iov_base = (char *) buf;
iov[0].iov_len = typesize;
iov[0].iov_len = typesize * count;
*actual_iov_len = 1;
} else {
*actual_iov_len = 0;
Expand Down Expand Up @@ -84,7 +94,7 @@ int MPIR_Typerep_iov_len(MPI_Aint count, MPI_Datatype type, MPI_Aint max_iov_byt
}

if (max_iov_bytes >= count * type_size) {
*iov_len = count * num_contig;
*iov_len = is_contig ? 1 : count * num_contig;
if (actual_iov_bytes) {
*actual_iov_bytes = count * type_size;
}
Expand Down
6 changes: 6 additions & 0 deletions src/mpi/datatype/typerep/src/typerep_dataloop_pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
#include "typerep_pre.h"
#include "typerep_internal.h"

int MPIR_Typerep_test(MPIR_Typerep_req typerep_req, int *completed)
{
*completed = 1;
return MPI_SUCCESS;
}

int MPIR_Typerep_icopy(void *outbuf, const void *inbuf, MPI_Aint num_bytes,
MPIR_Typerep_req * typerep_req, uint32_t flags)
{
Expand Down
2 changes: 1 addition & 1 deletion src/mpid/ch4/netmod/ofi/ofi_rma.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_gpu_rma_enabled(const void *ptr)
return 0;
}
}
return 0;
return 1;
}

MPL_STATIC_INLINE_PREFIX void MPIDI_OFI_query_acc_atomic_support(MPI_Datatype dt, int query_type,
Expand Down

0 comments on commit 7a413b5

Please sign in to comment.