Merge pull request flintlib#1984 from albinahlback/reduce_more

Reduce more headers

examples/hilbert_matrix.c

@@ -3,6 +3,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <flint/arb_mat.h>
+#include <flint/acb.h>
 #include <flint/acb_mat.h>
 #include <flint/profiler.h>
 

examples/integrals.c

@@ -12,6 +12,7 @@
 #include <math.h>
 #include <flint/profiler.h>
 #include <flint/arb_hypgeom.h>
+#include <flint/acb.h>
 #include <flint/acb_hypgeom.h>
 #include <flint/acb_dirichlet.h>
 #include <flint/acb_modular.h>

examples/integrals_double_exp.c

@@ -75,7 +75,7 @@ quad(arb_t result,
 {
 
     arb_t x, y, h, x0, pi, w, t;
-    slong order = 0, max_iter = 16, n_eval = 0, flag, j, k;
+    slong order = 0, max_iter = 16, n_eval = 0, FLINT_SET_BUT_UNUSED(flag), j, k;
 
     arb_ptr r = _arb_vec_init(max_iter);
     arb_ptr d = _arb_vec_init(max_iter);
@@ -419,7 +419,7 @@ main(int argc, char *argv[])
     slong num_threads = 1;
     slong prec = 1024;
 
-    int index, c, verbose = 0;
+    int c, verbose = 0;
 
     opterr = 0;
 

examples/lcentral.c

@@ -4,6 +4,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <flint/profiler.h>
+#include <flint/acb.h>
 #include <flint/acb_dirichlet.h>
 
 static int usage(char *argv[])

examples/lvalue.c

@@ -2,8 +2,9 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <flint/acb_dirichlet.h>
 #include <flint/profiler.h>
+#include <flint/acb.h>
+#include <flint/acb_dirichlet.h>
 
 int main(int argc, char *argv[])
 {

examples/real_roots.c

@@ -2,11 +2,12 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <flint/profiler.h>
 #include <flint/arb_poly.h>
 #include <flint/arb_calc.h>
+#include <flint/acb.h>
 #include <flint/acb_hypgeom.h>
 #include <flint/acb_dirichlet.h>
-#include <flint/profiler.h>
 
 slong eval_count = 0;
 

examples/zeta_zeros.c

@@ -2,8 +2,9 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <flint/acb_dirichlet.h>
 #include <flint/profiler.h>
+#include <flint/arb.h>
+#include <flint/acb_dirichlet.h>
 
 void print_zeros(arb_srcptr p, const fmpz_t n, slong len, slong digits)
 {

src/acb_dft/bluestein.c

@@ -97,7 +97,7 @@ _acb_dft_bluestein_init(acb_dft_bluestein_t t, slong dv, slong n, slong prec)
     if (n == 0)
         return;
 
-    e = n_clog(2 * n - 1, 2);
+    e = FLINT_CLOG2(2 * n - 1);
 
     if (DFT_VERB)
         flint_printf("dft_bluestein: init z[2^%i]\n", e);

src/acb_dft/convol_rad2.c

@@ -78,9 +78,9 @@ acb_dft_convol_rad2(acb_ptr w, acb_srcptr f, acb_srcptr g, slong len, slong prec
     if (len <= 0)
         return;
     else if ((len & (len - 1)) == 0)
-        e = n_clog(len, 2);
+        e = FLINT_CLOG2(len);
     else
-        e = n_clog(2 * len - 1, 2);
+        e = FLINT_CLOG2(2 * len - 1);
     acb_dft_rad2_init(dft, e, prec);
     acb_dft_convol_rad2_precomp(w, f, g, len, dft, prec);
     acb_dft_rad2_clear(dft);

src/acb_dirichlet.h

@@ -14,7 +14,7 @@
 #ifndef ACB_DIRICHLET_H
 #define ACB_DIRICHLET_H
 
-#include "acb.h"
+#include "acb_types.h"
 #include "dirichlet.h"
 
 #ifdef __cplusplus

src/acb_dirichlet/arb_quadratic_powers.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "arb.h"
 #include "acb_dirichlet.h"
 
 /* TODO: BSGS can reduce to nv mul */

src/acb_dirichlet/backlund_s.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 /* S(t) = N(t) - theta(t)/pi - 1 */

src/acb_dirichlet/backlund_s_bound.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "arb.h"
 #include "acb_dirichlet.h"
 
 static void

src/acb_dirichlet/backlund_s_gram.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "fmpz.h"
 #include "acb_dirichlet.h"
 
 slong

src/acb_dirichlet/chi.c

@@ -12,6 +12,7 @@
 */
 
 #include "fmpq.h"
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 void

src/acb_dirichlet/chi_vec.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 void

src/acb_dirichlet/eta.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 void

src/acb_dirichlet/euler_product_real_ui.c

@@ -11,6 +11,7 @@
 
 #include "thread_pool.h"
 #include "thread_support.h"
+#include "arb.h"
 #include "acb_dirichlet.h"
 
 #ifdef __GNUC__

src/acb_dirichlet/gauss_sum.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 static void

src/acb_dirichlet/gauss_sum_factor.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 void

src/acb_dirichlet/gauss_sum_order2.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 void

src/acb_dirichlet/gauss_sum_theta.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 void

src/acb_dirichlet/gram_point.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 /*

src/acb_dirichlet/hardy_z_zero.c

@@ -10,6 +10,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_dirichlet.h"
 #include "arb_calc.h"
 

src/acb_dirichlet/hurwitz_precomp_bound.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 void

src/acb_dirichlet/hurwitz_precomp_choose_param.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 #ifdef __GNUC__

src/acb_dirichlet/hurwitz_precomp_clear.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 void

src/acb_dirichlet/isolate_hardy_z_zero.c

@@ -11,6 +11,7 @@
 */
 
 #include "thread_support.h"
+#include "acb.h"
 #include "acb_dirichlet.h"
 #include "arb_calc.h"
 

src/acb_dirichlet/jacobi_sum.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 /* J_N(1,a) = sum on x = 1 mod some p | q */

src/acb_dirichlet/jacobi_sum_factor.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 void

src/acb_dirichlet/jacobi_sum_gauss.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 /* should use only for prime power modulus */

src/acb_dirichlet/jacobi_sum_naive.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 void

src/acb_dirichlet/l.c

@@ -10,6 +10,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 #ifdef __GNUC__
@@ -29,7 +30,7 @@ acb_dirichlet_l_general(acb_t res, const acb_t s,
     }
     else
     {
-        slong wp = prec + n_clog(G->phi_q, 2);
+        slong wp = prec + FLINT_CLOG2(G->phi_q);
         acb_dirichlet_hurwitz_precomp_t pre;
         acb_dirichlet_hurwitz_precomp_init_num(pre, s, acb_is_one(s), G->phi_q, wp);
         acb_dirichlet_l_hurwitz(res, s, pre, G, chi, prec);

src/acb_dirichlet/l_euler_product.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 #ifdef __GNUC__

src/acb_dirichlet/l_fmpq.c

@@ -12,6 +12,7 @@
 #include "fmpq.h"
 #include "arb_mat.h"
 #include "arb_hypgeom.h"
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 #ifdef __GNUC__

src/acb_dirichlet/l_fmpq_afe.c

@@ -12,6 +12,7 @@
 #include "fmpq.h"
 #include "arb_mat.h"
 #include "arb_hypgeom.h"
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 #ifdef __GNUC__

src/acb_dirichlet/l_hurwitz.c

@@ -45,7 +45,7 @@ acb_dirichlet_l_hurwitz(acb_t res, const acb_t s,
     dirichlet_char_one(cn, G);
     acb_zero(t);
 
-    prec += n_clog(G->phi_q, 2);
+    prec += FLINT_CLOG2(G->phi_q);
 
     order = dirichlet_order_char(G, chi);
     mult = G->expo / order;

src/acb_dirichlet/l_jet.c

@@ -61,7 +61,7 @@ acb_dirichlet_l_jet(acb_ptr res, const acb_t s,
 
     dirichlet_char_one(cn, G);
 
-    prec += n_clog(G->phi_q, 2);
+    prec += FLINT_CLOG2(G->phi_q);
 
     order = dirichlet_order_char(G, chi);
     mult = G->expo / order;

src/acb_dirichlet/l_vec_hurwitz.c

@@ -29,7 +29,7 @@ acb_dirichlet_l_vec_hurwitz(acb_ptr res, const acb_t s,
     acb_init(qs);
     acb_init(a);
 
-    prec += n_clog(G->phi_q, 2);
+    prec += FLINT_CLOG2(G->phi_q);
 
     acb_set_ui(qs, G->q);
     acb_neg(a, s);

src/acb_dirichlet/lerch_phi.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_hypgeom.h"
 #include "acb_dirichlet.h"
 

src/acb_dirichlet/lerch_phi_direct.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 void

src/acb_dirichlet/lerch_phi_integral.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "acb.h"
 #include "acb_calc.h"
 #include "acb_dirichlet.h"
 

src/acb_dirichlet/pairing.c

@@ -10,6 +10,7 @@
 */
 
 #include "fmpq.h"
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 void

src/acb_dirichlet/pairing_conrey.c

@@ -10,6 +10,7 @@
 */
 
 #include "fmpq.h"
+#include "acb.h"
 #include "acb_dirichlet.h"
 
 void

src/acb_dirichlet/platt_beta.c

@@ -9,6 +9,7 @@
     (at your option) any later version.  See <https://www.gnu.org/licenses/>.
 */
 
+#include "arb.h"
 #include "acb_dirichlet.h"
 
 static void