Skip to content

Commit a7b1bde

Browse files
authored
Merge pull request #7586 from raffenet/4.3.x-fixes
[4.3.x] misc fixes for 4.3.2rc1 Approved-by: Hui Zhou <[email protected]>
2 parents dad7d07 + 1ff4723 commit a7b1bde

File tree

9 files changed

+33
-21
lines changed

9 files changed

+33
-21
lines changed

CHANGES

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,19 @@
1010

1111
# Update libfabric usage to silence deprecation warnings
1212

13+
# Update yaksa for improved reproducibility in code generation
14+
1315
# Update embedded UCX to v1.19.0
1416

17+
# Update embedded libfabric to fix build issue with GCC 15
18+
1519
# Add compatibility with CUDA 13
1620

21+
# Fix missing const in nondestructive request test and status query
22+
functions
23+
24+
# Fix HCOLL support
25+
1726
# Fix crash with GPU-aware build when running on systems with no GPUs
1827

1928
# Fix singleton init with Hydra

maint/release.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ sub run_cmd
259259
print("===> Removing unnecessary files in the main codebase... ");
260260
chdir($expdir);
261261
run_cmd("rm -rf README.vin maint/config.log maint/config.status unusederr.txt");
262-
run_cmd("find . -name autom4te.cache | xargs rm -rf");
262+
run_cmd("find . -name autom4te.cache -o -name __pycache__ | xargs rm -rf");
263263
print("done\n");
264264

265265
# Get docs

modules/yaksa

src/binding/mpi_standard_api.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1805,18 +1805,18 @@ MPI_Request_get_status:
18051805
status: STATUS, direction=out, [status object if flag is true]
18061806
MPI_Request_get_status_all:
18071807
count: ARRAY_LENGTH_NNI, lists length
1808-
array_of_requests: REQUEST, direction=in, length=count, [array of requests]
1808+
array_of_requests: REQUEST, constant=True, direction=in, length=count, [array of requests]
18091809
flag: LOGICAL, direction=out
18101810
array_of_statuses: STATUS, direction=out, length=*, pointer=False, [array of status objects]
18111811
MPI_Request_get_status_any:
18121812
count: ARRAY_LENGTH_NNI, list length
1813-
array_of_requests: REQUEST, direction=in, length=count, [array of requests]
1813+
array_of_requests: REQUEST, constant=True, direction=in, length=count, [array of requests]
18141814
index: INDEX, direction=out, [index of operation that completed or MPI_UNDEFINED if none completed]
18151815
flag: LOGICAL, direction=out, [true if one of the operations is complete]
18161816
status: STATUS, direction=out
18171817
MPI_Request_get_status_some:
18181818
incount: ARRAY_LENGTH_NNI, [length of array_of_requests]
1819-
array_of_requests: REQUEST, direction=in, length=incount, [array of requests]
1819+
array_of_requests: REQUEST, constant=True, direction=in, length=incount, [array of requests]
18201820
outcount: ARRAY_LENGTH, direction=out, [number of completed requests]
18211821
array_of_indices: INDEX, direction=out, length=*, [array of indices of operations that completed]
18221822
array_of_statuses: STATUS, direction=out, length=*, pointer=False, [array of status objects for operations that completed]
@@ -2070,13 +2070,13 @@ MPI_Status_f2f08:
20702070
f_status: F90_STATUS, pointer=True, constant=True, [status object declared as array]
20712071
f08_status: F08_STATUS, direction=out, [status object declared as named type]
20722072
MPI_Status_get_error:
2073-
status: STATUS, direction=in, [status from which to retrieve source rank]
2073+
status: STATUS, constant=True, direction=in, [status from which to retrieve source rank]
20742074
error: ERROR_CODE, direction=out, [error set in the MPI_ERROR field]
20752075
MPI_Status_get_source:
2076-
status: STATUS, direction=in, [status from which to retrieve source rank]
2076+
status: STATUS, constant=True, direction=in, [status from which to retrieve source rank]
20772077
source: RANK, direction=out, [rank set in the MPI_SOURCE field]
20782078
MPI_Status_get_tag:
2079-
status: STATUS, direction=in, [status from which to retrieve source rank]
2079+
status: STATUS, constant=True, direction=in, [status from which to retrieve source rank]
20802080
tag: TAG, direction=out, [tag set in the MPI_TAG field]
20812081
MPI_Status_set_error:
20822082
status: STATUS, direction=inout, [status with which to associate error]

test/mpi/Makefile_f77.mtest

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
1515

1616
# This is right for many platforms, but not all. The right fix involves a
1717
# configure test, but this version is no worse than the simplemake version was.
18-
AM_FFLAGS = -I.
18+
# Add -w to suppress all warnings. Compilers such as gfortrans warns even with
19+
# -fallow-argument-mismatch.
20+
AM_FFLAGS = -I. -w
1921

2022
LDADD = $(top_builddir)/util/libmtest_f77.la
2123
mtest_c_objects = $(top_builddir)/util/libmtest_single.la

test/mpi/autogen.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ check_copy() {
6363
}
6464

6565
generate_benchmarks() {
66-
MYDEF_BOOT=$PWD/../../modules/mydef_boot
67-
if test -d $MYDEF_BOOT ; then
66+
MYDEF_BOOT="$PWD/../../modules/mydef_boot"
67+
if test -d "$MYDEF_BOOT/bin" ; then
6868
echo "Generating benchmark tests"
69-
export PATH=$MYDEF_BOOT/bin:$PATH
70-
export PERL5LIB=$MYDEF_BOOT/lib/perl5
71-
export MYDEFLIB=$MYDEF_BOOT/lib/MyDef
69+
export PATH="$MYDEF_BOOT/bin:$PATH"
70+
export PERL5LIB="$MYDEF_BOOT/lib/perl5"
71+
export MYDEFLIB="$MYDEF_BOOT/lib/MyDef"
7272
(cd bench && ./autogen.sh)
7373
fi
7474
}

test/mpi/io/large_count.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ int main(int argc, char **argv)
6767
if (rank == 0) {
6868
printf("nprocs=%d NVARS=%d LEN=%d\n", nprocs, NVARS, LEN);
6969
printf("Expecting file size=%lld bytes (%.1f MB, %.1f GB)\n",
70-
fsize, (float) fsize / 1048576, (float) fsize / 1073741824);
70+
(long long) fsize, (float) fsize / 1048576, (float) fsize / 1073741824);
7171
printf("Each global variable is of size %d bytes (%.1f MB)\n",
7272
gsize[0] * gsize[1], (float) gsize[0] * gsize[1] / 1048576);
7373
printf("Each process writes %zd bytes (%.1f MB, %.1f GB)\n",

test/mpi/io/large_dtype.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,12 @@ int main(int argc, char **argv)
156156
printf("Output file name = %s\n", filename);
157157
printf("nprocs=%d nvars=%d len=%d\n", nprocs, nvars, len);
158158
printf("Expecting file size=%lld bytes (%.1f MB, %.1f GB)\n",
159-
fsize * 2, (float) fsize * 2 / 1048576, (float) fsize * 2 / 1073741824);
160-
printf("Each global variable is of size %d bytes (%.1f MB)\n",
161-
gsize[0] * gsize[1], (float) gsize[0] * gsize[1] / 1048576);
162-
printf("Each process writes %zd bytes (%.1f MB, %.1f GB)\n",
163-
buf_len, (float) buf_len / 1048576, (float) buf_len / 1073741824);
159+
(long long) fsize * 2, (float) fsize * 2 / 1048576,
160+
(float) fsize * 2 / 1073741824);
161+
printf("Each global variable is of size %d bytes (%.1f MB)\n", gsize[0] * gsize[1],
162+
(float) gsize[0] * gsize[1] / 1048576);
163+
printf("Each process writes %zd bytes (%.1f MB, %.1f GB)\n", buf_len,
164+
(float) buf_len / 1048576, (float) buf_len / 1073741824);
164165
printf("** For nonblocking I/O test, the amount is twice\n");
165166
printf("-------------------------------------------------------\n");
166167
}

0 commit comments

Comments
 (0)