Don't force-inline actual_integrator()

yut23 · yut23 · commit 3edabe2cc186 · 2024-02-12T20:15:39.000-05:00
This greatly reduces the compilation time.
diff --git a/integration/BackwardEuler/actual_integrator.H b/integration/BackwardEuler/actual_integrator.H
@@ -5,7 +5,7 @@
 #include <be_integrator.H>
 
 template <typename BurnT>
-AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
+AMREX_GPU_HOST_DEVICE AMREX_INLINE
 void actual_integrator (BurnT& state, const Real dt, bool is_retry=false)
 {
     constexpr int int_neqs = integrator_neqs<BurnT>();
diff --git a/integration/BackwardEuler/actual_integrator_sdc.H b/integration/BackwardEuler/actual_integrator_sdc.H
@@ -9,7 +9,7 @@
 #include <integrator_data.H>
 
 template <typename BurnT>
-AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
+AMREX_GPU_HOST_DEVICE AMREX_INLINE
 void actual_integrator (BurnT& state, const Real dt, bool is_retry=false)
 {
     constexpr int int_neqs = integrator_neqs<BurnT>();
diff --git a/integration/ForwardEuler/actual_integrator.H b/integration/ForwardEuler/actual_integrator.H
@@ -156,7 +156,7 @@ void initialize_int_state (IntT& int_state)
 }
 
 template <typename BurnT>
-AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
+AMREX_GPU_HOST_DEVICE AMREX_INLINE
 void actual_integrator (BurnT& state, Real dt, bool is_retry=false)
 {
     using namespace microphysics::forward_euler;
diff --git a/integration/QSS/actual_integrator.H b/integration/QSS/actual_integrator.H
@@ -196,7 +196,7 @@ bool corrector (const BurnT& state_0, const Array1D<Real, 1, NumSpec>& f_minus_0
 }
 
 template <typename BurnT>
-AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
+AMREX_GPU_HOST_DEVICE AMREX_INLINE
 void actual_integrator (BurnT& state, Real dt, const bool is_retry=false)
 {
     initialize_state(state);
diff --git a/integration/RKC/actual_integrator.H b/integration/RKC/actual_integrator.H
@@ -12,7 +12,7 @@
 #include <rkc.H>
 
 template <typename BurnT>
-AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
+AMREX_GPU_HOST_DEVICE AMREX_INLINE
 void actual_integrator (BurnT& state, Real dt, bool is_retry=false)
 {
     constexpr int int_neqs = integrator_neqs<BurnT>();
diff --git a/integration/RKC/actual_integrator_sdc.H b/integration/RKC/actual_integrator_sdc.H
@@ -15,7 +15,7 @@
 using namespace integrator_rp;
 
 template <typename BurnT>
-AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
+AMREX_GPU_HOST_DEVICE AMREX_INLINE
 void actual_integrator (BurnT& state, Real dt)
 {
     constexpr int int_neqs = integrator_neqs<BurnT>();
diff --git a/integration/VODE/actual_integrator.H b/integration/VODE/actual_integrator.H
@@ -17,7 +17,7 @@
 using namespace integrator_rp;
 
 template <typename BurnT>
-AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
+AMREX_GPU_HOST_DEVICE AMREX_INLINE
 void actual_integrator (BurnT& state, amrex::Real dt, bool is_retry=false)
 {
     constexpr int int_neqs = integrator_neqs<BurnT>();
diff --git a/integration/VODE/actual_integrator_sdc.H b/integration/VODE/actual_integrator_sdc.H
@@ -17,7 +17,7 @@
 using namespace integrator_rp;
 
 template <typename BurnT>
-AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE
+AMREX_GPU_HOST_DEVICE AMREX_INLINE
 void actual_integrator (BurnT& state, amrex::Real dt, bool is_retry=false)
 {
     constexpr int int_neqs = integrator_neqs<BurnT>();

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#include <be_integrator.H>`
`6`	`6`
`7`	`7`	`template <typename BurnT>`
`8`		`-AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE`
	`8`	`+AMREX_GPU_HOST_DEVICE AMREX_INLINE`
`9`	`9`	`void actual_integrator (BurnT& state, const Real dt, bool is_retry=false)`
`10`	`10`	`{`
`11`	`11`	`constexpr int int_neqs = integrator_neqs<BurnT>();`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`#include <integrator_data.H>`
`10`	`10`
`11`	`11`	`template <typename BurnT>`
`12`		`-AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE`
	`12`	`+AMREX_GPU_HOST_DEVICE AMREX_INLINE`
`13`	`13`	`void actual_integrator (BurnT& state, const Real dt, bool is_retry=false)`
`14`	`14`	`{`
`15`	`15`	`constexpr int int_neqs = integrator_neqs<BurnT>();`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ void initialize_int_state (IntT& int_state)`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`template <typename BurnT>`
`159`		`-AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE`
	`159`	`+AMREX_GPU_HOST_DEVICE AMREX_INLINE`
`160`	`160`	`void actual_integrator (BurnT& state, Real dt, bool is_retry=false)`
`161`	`161`	`{`
`162`	`162`	`using namespace microphysics::forward_euler;`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ bool corrector (const BurnT& state_0, const Array1D<Real, 1, NumSpec>& f_minus_0`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`template <typename BurnT>`
`199`		`-AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE`
	`199`	`+AMREX_GPU_HOST_DEVICE AMREX_INLINE`
`200`	`200`	`void actual_integrator (BurnT& state, Real dt, const bool is_retry=false)`
`201`	`201`	`{`
`202`	`202`	`initialize_state(state);`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`#include <rkc.H>`
`13`	`13`
`14`	`14`	`template <typename BurnT>`
`15`		`-AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE`
	`15`	`+AMREX_GPU_HOST_DEVICE AMREX_INLINE`
`16`	`16`	`void actual_integrator (BurnT& state, Real dt, bool is_retry=false)`
`17`	`17`	`{`
`18`	`18`	`constexpr int int_neqs = integrator_neqs<BurnT>();`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`using namespace integrator_rp;`
`16`	`16`
`17`	`17`	`template <typename BurnT>`
`18`		`-AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE`
	`18`	`+AMREX_GPU_HOST_DEVICE AMREX_INLINE`
`19`	`19`	`void actual_integrator (BurnT& state, Real dt)`
`20`	`20`	`{`
`21`	`21`	`constexpr int int_neqs = integrator_neqs<BurnT>();`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`using namespace integrator_rp;`
`18`	`18`
`19`	`19`	`template <typename BurnT>`
`20`		`-AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE`
	`20`	`+AMREX_GPU_HOST_DEVICE AMREX_INLINE`
`21`	`21`	`void actual_integrator (BurnT& state, amrex::Real dt, bool is_retry=false)`
`22`	`22`	`{`
`23`	`23`	`constexpr int int_neqs = integrator_neqs<BurnT>();`