diff options
| author |  Axel Huebl <axel.huebl@plasma.ninja>
| 2023-05-02 15:16:52 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-05-02 22:16:52 +0000 |
| commit | 8d08142918f6784bb2c70de32a5cc99d8ab746df (patch) | |
| tree | f59db6a236e0658552ca957f8dbdbf2b9a153a0a /Source | |
| parent | 18ba699fb23091a8d88f6b588c5a8ac3db850f4a (diff) | |
| download | WarpX-8d08142918f6784bb2c70de32a5cc99d8ab746df.tar.gz WarpX-8d08142918f6784bb2c70de32a5cc99d8ab746df.tar.zst WarpX-8d08142918f6784bb2c70de32a5cc99d8ab746df.zip | |
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>"
^
```
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/FieldSolver/SpectralSolver/AnyFFT.H | 2 | ||||
| -rw-r--r-- | Source/Particles/PhotonParticleContainer.cpp | 4 | ||||
| -rw-r--r-- | Source/Particles/PhysicalParticleContainer.cpp | 4 | ||||
| -rw-r--r-- | Source/Utils/WarpXrocfftUtil.cpp | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/Source/FieldSolver/SpectralSolver/AnyFFT.H b/Source/FieldSolver/SpectralSolver/AnyFFT.H index 3e23f8f9e..6d05cba0b 100644 --- a/Source/FieldSolver/SpectralSolver/AnyFFT.H +++ b/Source/FieldSolver/SpectralSolver/AnyFFT.H @@ -17,7 +17,7 @@ // cstddef: work-around for ROCm/rocFFT <=4.3.0 // https://github.com/ROCmSoftwarePlatform/rocFFT/blob/rocm-4.3.0/library/include/rocfft.h#L36-L42 # include <cstddef> -# include <rocfft.h> +# include <rocfft/rocfft.h> #else # include <fftw3.h> #endif diff --git a/Source/Particles/PhotonParticleContainer.cpp b/Source/Particles/PhotonParticleContainer.cpp index dc4c1b122..30d51f383 100644 --- a/Source/Particles/PhotonParticleContainer.cpp +++ b/Source/Particles/PhotonParticleContainer.cpp @@ -177,7 +177,7 @@ PhotonParticleContainer::PushPX (WarpXParIter& pti, {exteb_runtime_flag, qed_runtime_flag}, np_to_push, [=] AMREX_GPU_DEVICE (long i, auto exteb_control, - [[maybe_unused]] auto qed_control) { + auto qed_control) { if (do_copy) copyAttribs(i); ParticleReal x, y, z; GetPosition(i, x, y, z); @@ -210,6 +210,8 @@ PhotonParticleContainer::PushPX (WarpXParIter& pti, evolve_opt(ux[i], uy[i], uz[i], Exp, Eyp, Ezp, Bxp, Byp, Bzp, dt, p_optical_depth_BW[i]); } +#else + amrex::ignore_unused(qed_control); #endif UpdatePositionPhoton( x, y, z, ux[i], uy[i], uz[i], dt ); diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp index 7a32e051d..ac6aecbac 100644 --- a/Source/Particles/PhysicalParticleContainer.cpp +++ b/Source/Particles/PhysicalParticleContainer.cpp @@ -2751,7 +2751,7 @@ PhysicalParticleContainer::PushPX (WarpXParIter& pti, CompileTimeOptions<no_qed ,has_qed>>{}, {exteb_runtime_flag, qed_runtime_flag}, np_to_push, [=] AMREX_GPU_DEVICE (long ip, auto exteb_control, - [[maybe_unused]] auto qed_control) + auto qed_control) { amrex::ParticleReal xp, yp, zp; getPosition(ip, xp, yp, zp); @@ -2824,6 +2824,8 @@ PhysicalParticleContainer::PushPX (WarpXParIter& pti, dt, p_optical_depth_QSR[ip]); } } +#else + amrex::ignore_unused(qed_control); #endif }); } diff --git a/Source/Utils/WarpXrocfftUtil.cpp b/Source/Utils/WarpXrocfftUtil.cpp index 8af65f1b6..d613ba8c6 100644 --- a/Source/Utils/WarpXrocfftUtil.cpp +++ b/Source/Utils/WarpXrocfftUtil.cpp @@ -13,7 +13,7 @@ // cstddef: work-around for ROCm/rocFFT <=4.3.0 // https://github.com/ROCmSoftwarePlatform/rocFFT/blob/rocm-4.3.0/library/include/rocfft.h#L36-L42 # include <cstddef> -# include <rocfft.h> +# include <rocfft/rocfft.h> #endif void |