<pre style='margin:0'>
David Strubbe (dstrubbe) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4dd9b60cbbfe89274041fc6930e4e79840cf2013">https://github.com/macports/macports-ports/commit/4dd9b60cbbfe89274041fc6930e4e79840cf2013</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4dd9b60cbbf fftw-3: Update patch for pfft (used with variant +pfft_patches).
</span>4dd9b60cbbf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4dd9b60cbbfe89274041fc6930e4e79840cf2013
</span>Author: David Strubbe <dstrubbe@macports.org>
AuthorDate: Mon Mar 22 16:09:12 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> fftw-3: Update patch for pfft (used with variant +pfft_patches).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Adapt to changes in fftw-3.3.9 by: updating memory reference (0xffff -> 0x7fff) in two lines that prevented patch application; updating corresponding memory reference in new functions added by patch (this change is referred to in the ChangeLog as something to be done globally); adjusting other lines slightly to avoid offset or fuzz.
</span>---
math/fftw-3/files/patch-pfft.diff | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/fftw-3/files/patch-pfft.diff b/math/fftw-3/files/patch-pfft.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a518842135a..0880a57a68b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/fftw-3/files/patch-pfft.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/fftw-3/files/patch-pfft.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,14 +12,14 @@
</span>
--- mpi/Makefile.am 2013-03-18 13:10:45.000000000 +0100
+++ mpi/Makefile.am 2015-09-05 05:53:19.084516437 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,6 +16,7 @@ BUILT_SOURCES = fftw3-mpi.f03.in fftw3-m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,6 +17,7 @@ BUILT_SOURCES = fftw3-mpi.f03.in fftw3-m
</span> CLEANFILES = fftw3-mpi.f03 fftw3l-mpi.f03
TRANSPOSE_SRC = transpose-alltoall.c transpose-pairwise.c transpose-recurse.c transpose-problem.c transpose-solve.c mpi-transpose.h
+TRANSPOSE_SRC += transpose-alltoall-transposed.c transpose-pairwise-transposed.c
DFT_SRC = dft-serial.c dft-rank-geq2.c dft-rank-geq2-transposed.c dft-rank1.c dft-rank1-bigvec.c dft-problem.c dft-solve.c mpi-dft.h
RDFT_SRC = rdft-serial.c rdft-rank-geq2.c rdft-rank-geq2-transposed.c rdft-rank1-bigvec.c rdft-problem.c rdft-solve.c mpi-rdft.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>- RDFT2_SRC = rdft2-serial.c rdft2-rank-geq2.c rdft2-rank-geq2-transposed.c rdft2-problem.c rdft2-solve.c mpi-rdft2.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RDFT2_SRC = rdft2-serial.c rdft2-rank-geq2.c rdft2-rank-geq2-transposed.c rdft2-problem.c rdft2-solve.c mpi-rdft2.h
</span>
--- mpi/mpi-transpose.h 2014-03-04 19:41:03.000000000 +0100
+++ mpi/mpi-transpose.h 2015-09-05 05:53:19.085516467 +0200
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -331,7 +331,7 @@
</span> @@ -74,7 +73,7 @@ static void transpose_chunks(int *sched,
O + rbo[pe], (int) (rbs[pe]),
FFTW_MPI_TYPE,
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pe, (pe * n_pes + my_pe) & 0xffff,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pe, (pe * n_pes + my_pe) & 0x7fff,
</span> - comm, &status);
+ comm, MPI_STATUS_IGNORE);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -340,7 +340,7 @@
</span> @@ -92,7 +91,7 @@ static void transpose_chunks(int *sched,
O + rbo[pe], (int) (rbs[pe]),
FFTW_MPI_TYPE,
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pe, (pe * n_pes + my_pe) & 0xffff,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pe, (pe * n_pes + my_pe) & 0x7fff,
</span> - comm, &status);
+ comm, MPI_STATUS_IGNORE);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -422,10 +422,10 @@
</span> + else {
+ memcpy(buf, O + sbo[pe], sbs[pe] * sizeof(R));
+ MPI_Sendrecv(buf, (int) (sbs[pe]), FFTW_MPI_TYPE,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pe, (my_pe * n_pes + pe) & 0xffff,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pe, (my_pe * n_pes + pe) & 0x7fff,
</span> + O + rbo[pe], (int) (rbs[pe]),
+ FFTW_MPI_TYPE,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pe, (pe * n_pes + my_pe) & 0xffff,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pe, (pe * n_pes + my_pe) & 0x7fff,
</span> + comm, MPI_STATUS_IGNORE);
+ }
+ }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -440,10 +440,10 @@
</span> + else
+ MPI_Sendrecv(I + sbo[pe], (int) (sbs[pe]),
+ FFTW_MPI_TYPE,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pe, (my_pe * n_pes + pe) & 0xffff,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pe, (my_pe * n_pes + pe) & 0x7fff,
</span> + O + rbo[pe], (int) (rbs[pe]),
+ FFTW_MPI_TYPE,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pe, (pe * n_pes + my_pe) & 0xffff,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pe, (pe * n_pes + my_pe) & 0x7fff,
</span> + comm, MPI_STATUS_IGNORE);
+ }
+ }
</pre><pre style='margin:0'>
</pre>