#748: update iml to the 1.0.3 release + our patches
-------------------------------------------+--------------------------------
Reporter: was | Owner: mabshoff
Type: defect | Status: needs_work
Priority: major | Milestone: sage-5.11
Component: packages: standard | Resolution:
Keywords: spkg upgrade iml sd40.5 | Work issues: remove tinyatlas
stuff, rename sage*.patch
Report Upstream: N/A | Reviewers: Jean-Pierre Flori
Authors: Jeroen Demeyer | Merged in:
Dependencies: #14699 | Stopgaps:
-------------------------------------------+--------------------------------
Comment (by jdemeyer):
Applying the following changes:
{{{
#!diff
diff --git a/SPKG.txt b/SPKG.txt
--- a/SPKG.txt
+++ b/SPKG.txt
@@ -32,21 +32,27 @@
=== Patches ===
- * rename_lift.patch: Change lift to iml_lift in padiclift.* and
- nonsingsolve.*, since otherwise on OSX you'll have horrible weird
- conflict problems.
+ * blas_headers.patch: Add BLAS header files from GSL, needed in case
+ ATLAS has not been installed.
+ * build.patch: Made build scripts that work.
* configure_default_cflags.patch: get rid of the following error
during configure:
./configure: line 18624: -O3: command not found
- * Modified some of the examples, and made build scripts that work.
+ * examples.patch: Modified some of the examples.
+ * memleak.patch: use mpz_set_ui instead of mpz_init_set_ui on mpz
+ which is already allocated.
+ * remove_repl.patch: Do not build/install src/repl at all, since it
+ does nothing anyway and creating empty archives fails on OS X.
== Changelog ==
=== iml-1.0.3.p0 (Jeroen Demeyer, 12 June 2013) ===
* #748: Upgrade to latest upstream version, rebase patches.
* Remove rename_lift.patch and sage2.patch, which were upstreamed.
- * Merged tinyatlas.patch into sage1.patch.
- * Apply sage3_memleak.patch in all 3 places with similar code.
+ * Removed tinyatlas.patch and #include "tinyatlas.h"
+ * Removed sage1.patch
+ * Apply sage3_memleak.patch in all 3 places with similar code, rename
+ to memleak.patch
* Use -O3 optimization level by default.
* Add configure_default_cflags.patch.
diff --git a/patches/sage3_memleak.patch b/patches/memleak.patch
rename from patches/sage3_memleak.patch
rename to patches/memleak.patch
diff --git a/patches/sage1.patch b/patches/sage1.patch
deleted file mode 100644
--- a/patches/sage1.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -ruN b/src/RNSop.c a/src/RNSop.c
---- b/src/RNSop.c 2006-11-23 22:25:23.000000000 +0100
-+++ a/src/RNSop.c 2013-06-10 23:05:18.872404179 +0200
-@@ -46,6 +46,7 @@
-
-
- #include "RNSop.h"
-+#include "tinyatlas.h"
-
- /*
- *
-diff -ruN b/src/memalloc.c a/src/memalloc.c
---- b/src/memalloc.c 2006-11-23 22:25:23.000000000 +0100
-+++ a/src/memalloc.c 2013-06-10 23:05:18.872404179 +0200
-@@ -48,13 +48,16 @@
-
- #include "error.h"
- #include "common.h"
-+#include "stdio.h"
-
- void *
- xmalloc (size_t num)
- {
- void * new = malloc(num);
-- if (!new)
-- iml_fatal ("Memory exhausted");
-+ if (!new) {
-+ printf("%ul\n", num);
-+ iml_fatal ("Memory exhausted in xmalloc");
-+ }
- return new;
- }
-
-@@ -65,8 +68,10 @@
- if (!p)
- return xmalloc(num);
- new = realloc(p, num);
-- if (!new)
-- iml_fatal("Memory exhausted");
-+ if (!new) {
-+ printf("%ul\n", num);
-+ iml_fatal("Memory exhausted in xrealloc");
-+ }
- return new;
- }
-
-@@ -76,8 +81,10 @@
- {
- #if HAVE_CALLOC
- void * new = calloc(num, size);
-- if (!new)
-- iml_fatal("Memory exhausted");
-+ if (!new) {
-+ printf("%ul\n", num);
-+ iml_fatal("Memory exhausted in xcalloc");
-+ }
- #else
- void * new = xmalloc(num*size);
- bzero(new, num*size);
-diff -ruN iml-1.0.1-sage/src/tinyatlas.h src/src/tinyatlas.h
---- iml-1.0.1-sage/src/tinyatlas.h 1970-01-01 01:00:00.000000000
+0100
-+++ src/src/tinyatlas.h 2007-03-01 04:11:42.000000000 +0100
-@@ -0,0 +1,17 @@
-+/*
-+Compute Y = alpha * X + beta * Y
-+
-+where
-+ N = degree of each vector
-+ incX = X stride
-+ incY = Y stride
-+*/
-+
-+void catlas_daxpby(const int N, const double alpha, const double *X,
-+const int incX, const double beta, double *Y, const int incY)
-+{
-+ int i;
-+ for(i=0; i < N; i++) {
-+ Y[i*incY] = alpha * X[i*incX] + beta * Y[i*incY];
-+ }
-+}
}}}
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/748#comment:46>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/sage-trac.
For more options, visit https://groups.google.com/groups/opt_out.
