Skip to content

Commit 8d08142

Browse files
authored
Fix: rocFFT 5.5 (#3888)
``` /opt/rocm-5.5.0/include/rocfft.h:16:2: error: "This file is deprecated. Use the header file from /opt/rocm-5.5.0/include/rocfft/rocfft.h by using #include <rocfft/rocfft.h>" [-Werror,-W#warnings] warning "This file is deprecated. Use the header file from /opt/rocm-5.5.0/include/rocfft/rocfft.h by using #include <rocfft/rocfft.h>" ^ ```
1 parent 18ba699 commit 8d08142

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

Source/FieldSolver/SpectralSolver/AnyFFT.H

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// cstddef: work-around for ROCm/rocFFT <=4.3.0
1818
// https://github.com/ROCmSoftwarePlatform/rocFFT/blob/rocm-4.3.0/library/include/rocfft.h#L36-L42
1919
# include <cstddef>
20-
# include <rocfft.h>
20+
# include <rocfft/rocfft.h>
2121
#else
2222
# include <fftw3.h>
2323
#endif

Source/Particles/PhotonParticleContainer.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ PhotonParticleContainer::PushPX (WarpXParIter& pti,
177177
{exteb_runtime_flag, qed_runtime_flag},
178178
np_to_push,
179179
[=] AMREX_GPU_DEVICE (long i, auto exteb_control,
180-
[[maybe_unused]] auto qed_control) {
180+
auto qed_control) {
181181
if (do_copy) copyAttribs(i);
182182
ParticleReal x, y, z;
183183
GetPosition(i, x, y, z);
@@ -210,6 +210,8 @@ PhotonParticleContainer::PushPX (WarpXParIter& pti,
210210
evolve_opt(ux[i], uy[i], uz[i], Exp, Eyp, Ezp, Bxp, Byp, Bzp,
211211
dt, p_optical_depth_BW[i]);
212212
}
213+
#else
214+
amrex::ignore_unused(qed_control);
213215
#endif
214216

215217
UpdatePositionPhoton( x, y, z, ux[i], uy[i], uz[i], dt );

Source/Particles/PhysicalParticleContainer.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -2751,7 +2751,7 @@ PhysicalParticleContainer::PushPX (WarpXParIter& pti,
27512751
CompileTimeOptions<no_qed ,has_qed>>{},
27522752
{exteb_runtime_flag, qed_runtime_flag},
27532753
np_to_push, [=] AMREX_GPU_DEVICE (long ip, auto exteb_control,
2754-
[[maybe_unused]] auto qed_control)
2754+
auto qed_control)
27552755
{
27562756
amrex::ParticleReal xp, yp, zp;
27572757
getPosition(ip, xp, yp, zp);
@@ -2824,6 +2824,8 @@ PhysicalParticleContainer::PushPX (WarpXParIter& pti,
28242824
dt, p_optical_depth_QSR[ip]);
28252825
}
28262826
}
2827+
#else
2828+
amrex::ignore_unused(qed_control);
28272829
#endif
28282830
});
28292831
}

Source/Utils/WarpXrocfftUtil.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// cstddef: work-around for ROCm/rocFFT <=4.3.0
1414
// https://github.com/ROCmSoftwarePlatform/rocFFT/blob/rocm-4.3.0/library/include/rocfft.h#L36-L42
1515
# include <cstddef>
16-
# include <rocfft.h>
16+
# include <rocfft/rocfft.h>
1717
#endif
1818

1919
void

0 commit comments

Comments
 (0)