[m4rie] New upstream release.
Jerry James
jjames at fedoraproject.org
Mon Dec 10 18:53:12 UTC 2012
commit 0662921b3839312253c8535a44fa6ae77fae6797
Author: Jerry James <jamesjer at betterlinux.com>
Date: Mon Dec 10 11:53:04 2012 -0700
New upstream release.
.gitignore | 2 +-
m4rie-givaro.patch => m4rie-warning.patch | 259 +++++++++--------------------
m4rie.spec | 11 +-
sources | 2 +-
4 files changed, 91 insertions(+), 183 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index da47983..222d042 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/m4rie-20120415.tar.gz
+/m4rie-20120613.tar.gz
diff --git a/m4rie-givaro.patch b/m4rie-warning.patch
similarity index 66%
rename from m4rie-givaro.patch
rename to m4rie-warning.patch
index 352fbfa..1d84f33 100644
--- a/m4rie-givaro.patch
+++ b/m4rie-warning.patch
@@ -1,52 +1,55 @@
---- ./src/permutation.h.orig 2012-04-14 07:58:21.000000000 -0600
-+++ ./src/permutation.h 2012-04-25 15:19:05.630000524 -0600
-@@ -103,7 +103,7 @@ static inline void mzed_apply_p_right_tr
- */
-
- static inline void mzd_slice_apply_p_left(mzd_slice_t *A, mzp_t const *P) {
-- for(int i=0; i<A->depth; i++) {
-+ for(unsigned int i=0; i<A->depth; i++) {
- mzd_apply_p_left(A->x[i], P);
- }
- }
-@@ -118,7 +118,7 @@ static inline void mzd_slice_apply_p_lef
- */
+--- ./tests/test_smallops.cc.orig 2012-06-07 10:10:17.000000000 -0600
++++ ./tests/test_smallops.cc 2012-12-10 10:38:40.040956930 -0700
+@@ -44,11 +44,11 @@ int test_slice_known_answers(gf2e *ff, i
+ mzd_t *one = mzd_init(m,n);
+ mzd_set_ui(one, 1);
- static inline void mzd_slice_apply_p_left_trans(mzd_slice_t *A, mzp_t const *P) {
-- for(int i=0; i<A->depth; i++) {
-+ for(unsigned int i=0; i<A->depth; i++) {
- mzd_apply_p_left_trans(A->x[i], P);
- }
- }
-@@ -133,7 +133,7 @@ static inline void mzd_slice_apply_p_lef
- */
+- for(int j=0; j<ff->degree; j++) {
++ for(unsigned int j=0; j<ff->degree; j++) {
+ mzed_set_ui(A, 1<<j);
+ mzd_slice_t *a = mzed_slice(NULL, A);
- static inline void mzd_slice_apply_p_right(mzd_slice_t *A, mzp_t const *P) {
-- for(int i=0; i<A->depth; i++) {
-+ for(unsigned int i=0; i<A->depth; i++) {
- mzd_apply_p_right(A->x[i], P);
- }
- }
-@@ -148,7 +148,7 @@ static inline void mzd_slice_apply_p_rig
- */
+- for(int i=0; i<a->depth; i++) {
++ for(unsigned int i=0; i<a->depth; i++) {
+ if (i!=j) {
+ m4rie_check( mzd_is_zero(a->x[i]) );
+ } else {
+--- ./tests/testing.h.orig 2012-06-07 10:10:17.000000000 -0600
++++ ./tests/testing.h 2012-12-10 10:34:44.116992212 -0700
+@@ -120,7 +120,7 @@ static inline void mzd_slice_clear_canar
+ const word mask_end = __M4RI_LEFT_BITMASK((A->x[0]->offset + A->ncols)%m4ri_radix);
+ const rci_t n = A->x[0]->width-1;
- static inline void mzd_slice_apply_p_right_trans(mzd_slice_t *A, mzp_t const *P) {
-- for(int i=0; i<A->depth; i++) {
-+ for(unsigned int i=0; i<A->depth; i++) {
- mzd_apply_p_right_trans(A->x[i], P);
+- for(int e=0; e<A->finite_field->degree; e++) {
++ for(unsigned int e=0; e<A->finite_field->degree; e++) {
+ for(rci_t i=0; i<A->nrows; i++) {
+ A->x[e]->rows[i][0] &=mask_begin;
+ A->x[e]->rows[i][n] &=mask_end;
+@@ -142,9 +142,9 @@ static inline int mzd_slice_canary_is_al
+ return 0;
+ }
+ }
+- return 1;
}
- }
-@@ -165,7 +165,7 @@ static inline void mzd_slice_apply_p_rig
- */
+-};
++ return 1;
++}
- static inline void mzd_slice_apply_p_right_trans_tri(mzd_slice_t *A, mzp_t const *P) {
-- for(int i=0; i<A->depth; i++) {
-+ for(unsigned int i=0; i<A->depth; i++) {
- mzd_apply_p_right_trans_tri(A->x[i], P);
+ static inline mzed_t *random_mzed_t(gf2e *ff, int m, int n) {
+ mzed_t *A = mzed_init(ff,m,n);
+--- ./src/mzd_poly.h.orig 2012-06-07 10:10:17.000000000 -0600
++++ ./src/mzd_poly.h 2012-12-10 10:33:50.373889229 -0700
+@@ -48,7 +48,7 @@ static inline void _poly_add(mzd_t **c,
+ case 0:
+ break;
+ default:
+- for(int i=0; i<length; i++)
++ for(unsigned int i=0; i<length; i++)
+ mzd_add(c[ i], a[ i], b[ i]);
}
}
---- ./src/mzd_slice.h.orig 2012-04-14 07:58:21.000000000 -0600
-+++ ./src/mzd_slice.h 2012-04-25 15:18:00.759000842 -0600
+--- ./src/mzd_slice.h.orig 2012-06-07 10:10:17.000000000 -0600
++++ ./src/mzd_slice.h 2012-12-10 10:33:24.960784239 -0700
@@ -89,7 +89,7 @@ static inline mzd_slice_t *mzd_slice_ini
A->ncols = n;
A->depth = ff->degree;
@@ -209,148 +212,50 @@
mzd_row_clear_offset(A->x[i], row, coloffset);
}
---- ./src/mzd_poly.h.orig 2012-04-14 07:58:21.000000000 -0600
-+++ ./src/mzd_poly.h 2012-04-25 15:15:50.508000002 -0600
-@@ -48,7 +48,7 @@ static inline void _poly_add(mzd_t **c,
- case 0:
- break;
- default:
-- for(int i=0; i<length; i++)
-+ for(unsigned int i=0; i<length; i++)
- mzd_add(c[ i], a[ i], b[ i]);
- }
- }
---- ./tests/testing.h.orig 2012-04-14 07:58:21.000000000 -0600
-+++ ./tests/testing.h 2012-04-25 15:19:36.133999969 -0600
-@@ -120,7 +120,7 @@ static inline void mzd_slice_clear_canar
- const word mask_end = __M4RI_LEFT_BITMASK((A->x[0]->offset + A->ncols)%m4ri_radix);
- const rci_t n = A->x[0]->width-1;
-
-- for(int e=0; e<A->finite_field->degree; e++) {
-+ for(unsigned int e=0; e<A->finite_field->degree; e++) {
- for(rci_t i=0; i<A->nrows; i++) {
- A->x[e]->rows[i][0] &=mask_begin;
- A->x[e]->rows[i][n] &=mask_end;
-@@ -142,9 +142,9 @@ static inline int mzd_slice_canary_is_al
- return 0;
- }
- }
-- return 1;
- }
--};
-+ return 1;
-+}
-
- static inline mzed_t *random_mzed_t(gf2e *ff, int m, int n) {
- mzed_t *A = mzed_init(ff,m,n);
---- ./tests/test_elimination.cc.orig 2012-04-14 07:58:21.000000000 -0600
-+++ ./tests/test_elimination.cc 2012-04-25 15:15:50.513000003 -0600
-@@ -1,3 +1,4 @@
-+#define __STDC_LIMIT_MACROS
- #include "testing.h"
- #include <gf2e_cxx/finite_field_givaro.h>
-
-@@ -77,7 +78,7 @@ int main(int argc, char **argv) {
- int fail_ret = 0;
+--- ./src/permutation.h.orig 2012-06-07 10:10:17.000000000 -0600
++++ ./src/permutation.h 2012-12-10 10:05:13.240351404 -0700
+@@ -103,7 +103,7 @@ static inline void mzed_apply_p_right_tr
+ */
- for(int k=2; k<=10; k++) {
-- GFqDom<int> GF = GFqDom<int>(2,k);
-+ Givaro::GFqDom<int> GF = Givaro::GFqDom<int>(2,k);
- FiniteField *F = (FiniteField*)&GF;
- ff[k] = gf2e_init_givgfq(F);
+ static inline void mzd_slice_apply_p_left(mzd_slice_t *A, mzp_t const *P) {
+- for(int i=0; i<A->depth; i++) {
++ for(unsigned int i=0; i<A->depth; i++) {
+ mzd_apply_p_left(A->x[i], P);
}
---- ./tests/test_ple.cc.orig 2012-04-14 07:58:21.000000000 -0600
-+++ ./tests/test_ple.cc 2012-04-25 15:15:50.516000003 -0600
-@@ -1,3 +1,4 @@
-+#define __STDC_LIMIT_MACROS
- #include "testing.h"
- #include <gf2e_cxx/finite_field_givaro.h>
-
-@@ -188,7 +189,7 @@ int main(int argc, char **argv) {
- int fail_ret = 0;
+ }
+@@ -118,7 +118,7 @@ static inline void mzd_slice_apply_p_lef
+ */
- for(int k=2; k<=10; k++) {
-- GFqDom<int> GF = GFqDom<int>(2,k);
-+ Givaro::GFqDom<int> GF = Givaro::GFqDom<int>(2,k);
- FiniteField *F = (FiniteField*)&GF;
- ff[k] = gf2e_init_givgfq(F);
+ static inline void mzd_slice_apply_p_left_trans(mzd_slice_t *A, mzp_t const *P) {
+- for(int i=0; i<A->depth; i++) {
++ for(unsigned int i=0; i<A->depth; i++) {
+ mzd_apply_p_left_trans(A->x[i], P);
}
---- ./tests/test_multiplication.cc.orig 2012-04-14 07:58:21.000000000 -0600
-+++ ./tests/test_multiplication.cc 2012-04-25 15:15:50.518000003 -0600
-@@ -25,6 +25,7 @@
- ******************************************************************************/
-
-
-+#define __STDC_LIMIT_MACROS
- #include "testing.h"
- #include <gf2e_cxx/finite_field_givaro.h>
-
-@@ -225,7 +226,7 @@ int main(int argc, char **argv) {
- int fail_ret = 0;
+ }
+@@ -133,7 +133,7 @@ static inline void mzd_slice_apply_p_lef
+ */
- for(int k=2; k<=10; k++) {
-- GFqDom<int> GF = GFqDom<int>(2,k);
-+ Givaro::GFqDom<int> GF = Givaro::GFqDom<int>(2,k);
- FiniteField *F = (FiniteField*)&GF;
- ff[k] = gf2e_init_givgfq(F);
+ static inline void mzd_slice_apply_p_right(mzd_slice_t *A, mzp_t const *P) {
+- for(int i=0; i<A->depth; i++) {
++ for(unsigned int i=0; i<A->depth; i++) {
+ mzd_apply_p_right(A->x[i], P);
}
---- ./tests/test_trsm.cc.orig 2012-04-14 07:58:21.000000000 -0600
-+++ ./tests/test_trsm.cc 2012-04-25 15:15:50.520000003 -0600
-@@ -24,6 +24,7 @@
- * http://www.gnu.org/licenses/
- ******************************************************************************/
-
-+#define __STDC_LIMIT_MACROS
- #include "testing.h"
- #include <gf2e_cxx/finite_field_givaro.h>
-
-@@ -476,7 +477,7 @@ int main(int argc, char **argv) {
- int fail_ret = 0;
+ }
+@@ -148,7 +148,7 @@ static inline void mzd_slice_apply_p_rig
+ */
- for(int k=2; k<=10; k++) {
-- GFqDom<int> GF = GFqDom<int>(2,k);
-+ Givaro::GFqDom<int> GF = Givaro::GFqDom<int>(2,k);
- FiniteField *F = (FiniteField*)&GF;
- ff[k] = gf2e_init_givgfq(F);
+ static inline void mzd_slice_apply_p_right_trans(mzd_slice_t *A, mzp_t const *P) {
+- for(int i=0; i<A->depth; i++) {
++ for(unsigned int i=0; i<A->depth; i++) {
+ mzd_apply_p_right_trans(A->x[i], P);
}
---- ./tests/test_smallops.cc.orig 2012-04-14 07:58:21.000000000 -0600
-+++ ./tests/test_smallops.cc 2012-04-25 15:15:50.522000003 -0600
-@@ -1,3 +1,4 @@
-+#define __STDC_LIMIT_MACROS
- #include "testing.h"
-
- #include <gf2e_cxx/finite_field_givaro.h>
-@@ -45,11 +46,11 @@ int test_slice_known_answers(gf2e *ff, i
- mzd_t *one = mzd_init(m,n);
- mzd_set_ui(one, 1);
-
-- for(int j=0; j<ff->degree; j++) {
-+ for(unsigned int j=0; j<ff->degree; j++) {
- mzed_set_ui(A, 1<<j);
- mzd_slice_t *a = mzed_slice(NULL, A);
-
-- for(int i=0; i<a->depth; i++) {
-+ for(unsigned int i=0; i<(unsigned int)a->depth; i++) {
- if (i!=j) {
- m4rie_check( mzd_is_zero(a->x[i]) );
- } else {
-@@ -161,7 +162,7 @@ int main(int argc, char **argv) {
- int fail_ret = 0;
+ }
+@@ -165,7 +165,7 @@ static inline void mzd_slice_apply_p_rig
+ */
- for(int k=2; k<=10; k++) {
-- GFqDom<int> GF = GFqDom<int>(2,k);
-+ Givaro::GFqDom<int> GF = Givaro::GFqDom<int>(2,k);
- FiniteField *F = (FiniteField*)&GF;
- ff[k] = gf2e_init_givgfq(F);
+ static inline void mzd_slice_apply_p_right_trans_tri(mzd_slice_t *A, mzp_t const *P) {
+- for(int i=0; i<A->depth; i++) {
++ for(unsigned int i=0; i<A->depth; i++) {
+ mzd_apply_p_right_trans_tri(A->x[i], P);
}
---- ./gf2e_cxx/finite_field_givaro.h.orig 2012-04-14 07:58:21.000000000 -0600
-+++ ./gf2e_cxx/finite_field_givaro.h 2012-04-25 15:15:50.524000003 -0600
-@@ -22,7 +22,7 @@
-
- namespace M4RIE {
-
-- class FiniteField: public GFqDom<int> {
-+ class FiniteField: public Givaro::GFqDom<int> {
- public:
- unsigned int log2pol(int x) { return _log2pol[x]; };
- unsigned int pol2log(int x) { return _pol2log[x]; };
+ }
diff --git a/m4rie.spec b/m4rie.spec
index 55f7e94..b46bf73 100644
--- a/m4rie.spec
+++ b/m4rie.spec
@@ -1,13 +1,13 @@
Name: m4rie
-Version: 20120415
-Release: 4%{?dist}
+Version: 20120613
+Release: 1%{?dist}
Summary: Linear Algebra over F_2^e
Group: Development/Libraries
License: GPLv2+
URL: http://m4ri.sagemath.org/
Source0: http://m4ri.sagemath.org/downloads/%{name}-%{version}.tar.gz
-# Patch sent upstream 25 April 2012. Adapt to changes in givaro 3.5.0.
-Patch0: %{name}-givaro.patch
+# Fix compiler warnings that may indicate runtime / test-time problems
+Patch0: %{name}-warning.patch
BuildRequires: doxygen
BuildRequires: givaro-devel
@@ -82,6 +82,9 @@ make check
%{_libdir}/lib%{name}.a
%changelog
+* Mon Dec 10 2012 Jerry James <loganjerry at gmail.com> - 20120613-1
+- New upstream release
+
* Tue Oct 2 2012 Jerry James <loganjerry at gmail.com> - 20120415-4
- Rebuild for givaro 3.7.1
diff --git a/sources b/sources
index a2d9b52..3f9584c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1135a21acae7a1e1eb30d3ad062b4237 m4rie-20120415.tar.gz
+e1fe916a6a73c2a8835d7e4433369df2 m4rie-20120613.tar.gz
More information about the scm-commits
mailing list