[apophenia] 01/01: RC #793998 - eg/test_updating - fix

[Jerome Benoit]

This is an automated email from the git hooks/post-receive script.

calculus-guest pushed a commit to branch master
in repository apophenia.

commit b9c1badc33a44ba83d90b319452e1793b628f82b
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Sat Aug 29 04:02:48 2015 +0200

    RC #793998 - eg/test_updating - fix
---
 debian/changelog                                   |  8 +++++++
 debian/patches/series                              |  1 +
 .../upstream-bug-793998-eg_test_updating.patch     | 27 ++++++++++++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6501576..b279cff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apophenia (0.999e+ds-3) UNRELEASED; urgency=medium
+
+  * RC bug fix release (Closes: #793998):
+    - eg/test_updating FAILURE on some architectures: intricate type conversion
+      in apop_mcmc.c, unfold.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Sat, 29 Aug 2015 01:56:36 +0000
+
 apophenia (0.999e+ds-2) unstable; urgency=medium
 
   * RC bug fix release (Closes: #793998), disable extended tests.
diff --git a/debian/patches/series b/debian/patches/series
index b9404bf..4c1d111 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+upstream-bug-793998-eg_test_updating.patch
 debianization.patch
 debianization-help2man.patch
 debianization-documentation.patch
diff --git a/debian/patches/upstream-bug-793998-eg_test_updating.patch b/debian/patches/upstream-bug-793998-eg_test_updating.patch
new file mode 100644
index 0000000..4bf4379
--- /dev/null
+++ b/debian/patches/upstream-bug-793998-eg_test_updating.patch
@@ -0,0 +1,27 @@
+Description: upstream -- RC bug fix 793998 -- eg/test_updating
+ Fix a type conversion bug that failed the eg/test_updating test on some
+ architectures (e.g., arm64 and ppc64el).
+Origin: debian
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2015-08-29
+
+--- a/apop_mcmc.c
++++ b/apop_mcmc.c
+@@ -196,13 +196,13 @@
+ }
+ 
+ 
+-void main_mcmc_loop(apop_data *d, apop_model *m, apop_data *out, gsl_vector *draw, 
++void main_mcmc_loop(apop_data *d, apop_model *m, apop_data *out, gsl_vector *draw,
+                         apop_mcmc_settings *s, gsl_rng *rng, int *constraint_fails){
+     s->accept_count = 0;
++    int out_row = - s->periods*s->burnin;
+     int block = 0;
+-    for (s->proposal_count=1; s->proposal_count< s->periods+1; s->proposal_count++){
+-        one_step(d, draw, m, s, rng, constraint_fails, out, block
+-                               , s->proposal_count-1 - s->periods*s->burnin);
++    for (s->proposal_count=1; s->proposal_count< s->periods+1; s->proposal_count++, out_row++){
++        one_step(d, draw, m, s, rng, constraint_fails, out, block, out_row);
+         block = (block+1) % s->block_count;
+         s->proposals[block].adapt_fn(s->proposals+block, s);
+         //if (constraint_fails>10000) break;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/apophenia.git