[Rcpp-commits] r4597 - in pkg/RcppArmadillo: . debian inst inst/include/armadillo_bits

[noreply at r-forge.r-project.org]

Author: edd
Date: 2013-11-23 20:23:47 +0100 (Sat, 23 Nov 2013)
New Revision: 4597

Removed:
   pkg/RcppArmadillo/test
Modified:
   pkg/RcppArmadillo/.Rbuildignore
   pkg/RcppArmadillo/ChangeLog
   pkg/RcppArmadillo/DESCRIPTION
   pkg/RcppArmadillo/debian/changelog
   pkg/RcppArmadillo/inst/NEWS.Rd
   pkg/RcppArmadillo/inst/include/armadillo_bits/Mat_meat.hpp
   pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp
Log:
sync with github

Modified: pkg/RcppArmadillo/.Rbuildignore
===================================================================
--- pkg/RcppArmadillo/.Rbuildignore	2013-11-22 19:08:36 UTC (rev 4596)
+++ pkg/RcppArmadillo/.Rbuildignore	2013-11-23 19:23:47 UTC (rev 4597)
@@ -1 +1,3 @@
 debian
+.travis.yml
+.git

Modified: pkg/RcppArmadillo/ChangeLog
===================================================================
--- pkg/RcppArmadillo/ChangeLog	2013-11-22 19:08:36 UTC (rev 4596)
+++ pkg/RcppArmadillo/ChangeLog	2013-11-23 19:23:47 UTC (rev 4597)
@@ -1,3 +1,10 @@
+2013-11-19  Dirk Eddelbuettel  <edd at debian.org>
+
+	* DESCRIPTION: Release 0.3.920.3
+	* inst/NEWS: Release 0.3.920.3
+	* inst/include/*: Upgraded to new release 3.920.3 of Armadillo
+        * debian/*: Similarly updated for new release to Debian
+
 2013-09-29  Dirk Eddelbuettel  <edd at debian.org>
 
 	* inst/examples/fastLm.r: Added a 'const ref' example

Modified: pkg/RcppArmadillo/DESCRIPTION
===================================================================
--- pkg/RcppArmadillo/DESCRIPTION	2013-11-22 19:08:36 UTC (rev 4596)
+++ pkg/RcppArmadillo/DESCRIPTION	2013-11-23 19:23:47 UTC (rev 4597)
@@ -1,8 +1,8 @@
 Package: RcppArmadillo
 Type: Package
 Title: Rcpp integration for Armadillo templated linear algebra library
-Version: 0.3.920.1
-Date: $Date$
+Version: 0.3.920.3
+Date: 2013-11-19
 Author: Romain Francois, Dirk Eddelbuettel and Doug Bates
 Maintainer: Dirk Eddelbuettel <edd at debian.org>
 Description: R and Armadillo integration using Rcpp

Modified: pkg/RcppArmadillo/debian/changelog
===================================================================
--- pkg/RcppArmadillo/debian/changelog	2013-11-22 19:08:36 UTC (rev 4596)
+++ pkg/RcppArmadillo/debian/changelog	2013-11-23 19:23:47 UTC (rev 4597)
@@ -1,3 +1,9 @@
+r-cran-rcpparmadillo (0.3.920.3-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Dirk Eddelbuettel <edd at debian.org>  Tue, 19 Nov 2013 21:22:00 -0600
+
 r-cran-rcpparmadillo (0.3.920.1-1) unstable; urgency=low
 
   * New upstream release

Modified: pkg/RcppArmadillo/inst/NEWS.Rd
===================================================================
--- pkg/RcppArmadillo/inst/NEWS.Rd	2013-11-22 19:08:36 UTC (rev 4596)
+++ pkg/RcppArmadillo/inst/NEWS.Rd	2013-11-23 19:23:47 UTC (rev 4597)
@@ -2,6 +2,15 @@
 \title{News for Package 'RcppArmadillo'}
 \newcommand{\cpkg}{\href{http://CRAN.R-project.org/package=#1}{\pkg{#1}}}
 
+\section{Changes in RcppArmadillo version 0.3.920.3 (2013-11-20)}{
+  \itemize{
+    \item Upgraded to Armadillo release Version 3.920.3
+    \itemize{
+      \item fix for handling of tiny matrices by \code{.swap()}
+    }
+  }
+}
+
 \section{Changes in RcppArmadillo version 0.3.920.1 (2013-09-27)}{
   \itemize{
     \item Upgraded to Armadillo release Version 3.920.1 (Agencia

Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/Mat_meat.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/Mat_meat.hpp	2013-11-22 19:08:36 UTC (rev 4596)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/Mat_meat.hpp	2013-11-23 19:23:47 UTC (rev 4597)
@@ -794,12 +794,15 @@
     else
     if( (A_use_local_mem == true) && (B_use_local_mem == true) )
       {
+      eT* A_mem_local = &(A.mem_local[0]);
+      eT* B_mem_local = &(B.mem_local[0]);
+      
+      access::rw(A.mem) = A_mem_local;
+      access::rw(B.mem) = B_mem_local;
+      
       const uword N = (std::max)(A_n_elem, B_n_elem);
       
-      eT* A_mem = A.memptr();
-      eT* B_mem = B.memptr();
-      
-      for(uword ii=0; ii < N; ++ii)  { std::swap( A_mem[ii], B_mem[ii] ); }
+      for(uword ii=0; ii < N; ++ii)  { std::swap( A_mem_local[ii], B_mem_local[ii] ); }
       }
     else
     if( (A_use_local_mem == true) && (B_use_local_mem == false) )

Modified: pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp	2013-11-22 19:08:36 UTC (rev 4596)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/arma_version.hpp	2013-11-23 19:23:47 UTC (rev 4597)
@@ -13,7 +13,7 @@
 
 #define ARMA_VERSION_MAJOR 3
 #define ARMA_VERSION_MINOR 920
-#define ARMA_VERSION_PATCH 1
+#define ARMA_VERSION_PATCH 3
 #define ARMA_VERSION_NAME  "Agencia Nacional Stasi"
 
 

Deleted: pkg/RcppArmadillo/test
===================================================================