fix warnings in some fglm files

Author: vneiger

src/fglm/Makefile.am

@@ -2,7 +2,7 @@ noinst_LTLIBRARIES 	= libfglm.la
 libfglm_la_SOURCES 	= fglm_core.c
 libfglm_ladir				=	$(includedir)/msolve/fglm
 libfglm_la_HEADERS	= fglm.h
-libfglm_la_CFLAGS		= $(SIMD_FLAGS) $(CPUEXT_FLAGS) $(OPENMP_CFLAGS)
+libfglm_la_CFLAGS		= $(SIMD_FLAGS) $(CPUEXT_FLAGS) $(OPENMP_CFLAGS) -Wall -Wextra
 
 EXTRA_DIST	=		fglm.h \
                 libfglm.h \

src/fglm/berlekamp_massey.c

@@ -191,8 +191,7 @@ void nmod_berlekamp_massey_add_point_modif(
     B->points->length = old_length + 1;
 }
 
-//shift ne sert pas 
-int nmod_em_gcd(nmod_berlekamp_massey_t B, long shift){
+int nmod_em_gcd(nmod_berlekamp_massey_t B){
   slong i, l, k, queue_len, queue_lo, queue_hi;
   queue_lo = B->npoints; // vaut 0 en entree
   queue_hi = B->points->length; //vaut 2*dim ou dim est la dimension du quotient
@@ -316,7 +315,6 @@ int nmod_em_gcd(nmod_berlekamp_massey_t B, long shift){
 }
 
 
-//shift ne sert pas 
 int nmod_em_gcd_preinstantiated(nmod_berlekamp_massey_t B, long shift){
   slong l, k, queue_len, queue_lo, queue_hi;
   queue_lo = B->npoints; // vaut 0 en entree
@@ -436,7 +434,6 @@ int nmod_em_gcd_preinstantiated(nmod_berlekamp_massey_t B, long shift){
   FLINT_ASSERT(2*nmod_poly_degree(B->V1) <= B->npoints);
   FLINT_ASSERT(2*nmod_poly_degree(B->R0) >= B->npoints);
   FLINT_ASSERT(2*nmod_poly_degree(B->R1) <  B->npoints);
-
 
   return 1;
 }

src/fglm/data_fglm.c

@@ -166,7 +166,7 @@ static inline param_t *allocate_fglm_param(mp_limb_t prime, long nvars){
 static inline void free_fglm_param(param_t *param){
   nmod_poly_clear(param->elim);
   nmod_poly_clear(param->denom);
-  for(szmat_t i = 0; i < param->nvars-1; i++){
+  for(szmat_t i = 0; i < (unsigned int)param->nvars-1; i++){
     nmod_poly_clear(param->coords[i]);
   }
   free(param->coords);

src/fglm/fglm_core.c

@@ -222,7 +222,7 @@ static int invert_hankel_matrix(fglm_bms_data_t *data_bms, szmat_t deg){
 
   mirror_points(data_bms->BMS, data_bms->BMS->points->length);
 
-  nmod_em_gcd(data_bms->BMS, 0);
+  nmod_em_gcd(data_bms->BMS);
   if(data_bms->BMS->R1->length-1 < dim-1 && dim > 1){
     fprintf(stderr, "Singular matrix\n");
     return 0;
@@ -242,7 +242,7 @@ static int invert_hankel_matrix(fglm_bms_data_t *data_bms, szmat_t deg){
     data_bms->BMS->npoints = 0;
 
     //(R_i, R_{i+1}, V_i, V_{i+1}) = EMGCD(R_0, R_1)
-    nmod_em_gcd(data_bms->BMS, 0);
+    nmod_em_gcd(data_bms->BMS);
     //Z2 = LC(R_{i+1})^{-1} x (V_{i+1})
     inv = n_invmod(data_bms->BMS->R1->coeffs[data_bms->BMS->R1->length-1],
                    (data_bms->BMS->R1->mod).n);

src/fglm/linalg-fglm.c

@@ -49,9 +49,7 @@
 
 static inline void non_avx_matrix_vector_product(uint32_t* vec_res, const uint32_t* mat,
                                                  const uint32_t* vec, const uint32_t ncols,
-                                                 const uint32_t nrows, const uint32_t PRIME,
-                                                 const uint32_t RED_32, const uint32_t RED_64,
-                                                 md_t *st)
+                                                 const uint32_t nrows, const uint32_t PRIME)
 {
     uint32_t i, j;
     int64_t prod1, prod2, prod3, prod4;

src/fglm/matrix-mult.c

@@ -100,15 +100,17 @@ static inline uint64_t ADDMODRED32(uint64_t a, uint64_t b,
                                    const uint32_t p, const uint32_t preinv)
 {
   const long neg = p - a;
-  return (neg > b) ? MODRED32((a + b), p, preinv) : MODRED32((b - neg), p, preinv);
+  return (neg > (long)b) ? MODRED32((a + b), p, preinv) : MODRED32((b - neg), p, preinv);
 }
 
-static inline uint64_t SUBMODRED32(uint64_t a, uint64_t b,
-                                   const uint32_t p, const uint32_t preinv)
-{
-  const long neg = a - b;
-  return (a < b) ? (p + neg) : (neg);
-}
+/** currently unused
+* static inline uint64_t SUBMODRED32(uint64_t a, uint64_t b,
+*                                    const uint32_t p, const uint32_t preinv)
+* {
+*   const long neg = a - b;
+*   return (a < b) ? (p + neg) : (neg);
+* }
+*/
 
 #if HAVE_AVX2
 static inline void REDUCE(uint64_t *acc64, uint64_t *acc4x64,