Upgrade ensmallen to 2.18.2 (#47)

* Upgrade ensmallen to 2.18.2 * Update URLs Co-authored-by: coatless <coatless@users.noreply.github.com> Co-authored-by: James Balamuta <balamut2@illinois.edu>
coatless-rpkg · Feb 20, 2022 · 86adefb · 86adefb
1 parent 72f0e20
commit 86adefb
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 35 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,16 @@
+2022-02-18  James Balamuta  <balamut2@illinois.edu>
+
+	* DESCRIPTION: Update URLs
+	* NEWS.md: ditto
+	* README.md: ditto
+
+2022-02-18  James Balamuta  <balamut2@illinois.edu>
+
+	* DESCRIPTION (Version): Release 2.18.2
+	* NEWS.md: Update for Ensmallen release 2.18.2
+	* inst/include/ensmallen_bits: Upgraded to Ensmallen 2.18.2
+	* inst/include/ensmallen.hpp: ditto
+
 2021-11-20  James Balamuta  <balamut2@illinois.edu>
 
 	* DESCRIPTION (Version): Release 2.18.1

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: RcppEnsmallen
 Title: Header-Only C++ Mathematical Optimization Library for 'Armadillo'
-Version: 0.2.18.1.1
+Version: 0.2.18.2.1
 Authors@R: c(
     person("James Joseph", "Balamuta", email = "balamut2@illinois.edu", 
            role = c("aut", "cre", "cph"), 
@@ -25,12 +25,12 @@ Description: 'Ensmallen' is a templated C++ mathematical optimization library
  'C++11' and 'Armadillo' 9.800 or later.
 Depends: R (>= 3.3.0)
 License: GPL (>= 2)
-URL: https://github.com/coatless/rcppensmallen, https://github.com/mlpack/ensmallen, http://ensmallen.org/
-BugReports: https://github.com/coatless/rcppensmallen/issues
+URL: https://github.com/coatless-rpkg/rcppensmallen, https://github.com/mlpack/ensmallen, http://ensmallen.org/
+BugReports: https://github.com/coatless-rpkg/rcppensmallen/issues
 Encoding: UTF-8
 LinkingTo: Rcpp, RcppArmadillo (>= 0.9.800.0.0)
 Imports: Rcpp
-RoxygenNote: 7.1.1
+RoxygenNote: 7.1.2
 Roxygen: list(markdown = TRUE)
 SystemRequirements: C++11
 Suggests: 

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,12 @@
+# RcppEnsmallen 0.2.18.2.1
+
+- Upgraded to ensmallen 2.18.2: "Fairmount Bagel" (2022-02-14)
+  - Update Catch2 to 2.13.8
+   ([#336](https://github.com/mlpack/ensmallen/pull/336)).
+  - Fix epoch timing output
+   ([#337](https://github.com/mlpack/ensmallen/pull/337)).
+- Update _R_ package URLs.
+
 # RcppEnsmallen 0.2.18.1.1
 
 - Upgraded to ensmallen 2.18.1: "Fairmount Bagel" (2021-11-20)
@@ -24,7 +33,7 @@
   - Fix MOEAD test stability
     (mlpack/ensmallen#327).
 - Update GitHub Actions to the standard `r-lib/actions` configuration.
-  ([#45](https://github.com/coatless/rcppensmallen/pull/45))
+  ([#45](https://github.com/coatless-rpkg/rcppensmallen/pull/45))
 
 # RcppEnsmallen 0.2.17.0.1
 
@@ -126,10 +135,10 @@
   - Clarify and fix documentation for constrained optimizers (mlpack/ensmallen#201). 
   - Fix L-BFGS convergence when starting from a minimum (mlpack/ensmallen#201).
 - Switch GitHub Actions to use reference tags to always be up-to-date with 
-  CRAN's check grid (`oldrel`, `release`, `devel`). ([#29](https://github.com/coatless/rcppensmallen/pull/29), 
-  [#32](https://github.com/coatless/rcppensmallen/pull/32))
+  CRAN's check grid (`oldrel`, `release`, `devel`). ([#29](https://github.com/coatless-rpkg/rcppensmallen/pull/29), 
+  [#32](https://github.com/coatless-rpkg/rcppensmallen/pull/32))
 - Added a GitHub Action to automatically create a PR with the new version of
-  Ensmallen when a new release is detected. ([#30](https://github.com/coatless/rcppensmallen/pull/30), [#33](https://github.com/coatless/rcppensmallen/pull/33))
+  Ensmallen when a new release is detected. ([#30](https://github.com/coatless-rpkg/rcppensmallen/pull/30), [#33](https://github.com/coatless-rpkg/rcppensmallen/pull/33))
 
 # RcppEnsmallen 0.2.13.0.1
 
@@ -189,8 +198,8 @@
  (mlpack/ensmallen#141).
   - Make code samples collapsible in the documentation.
  (mlpack/ensmallen#140).
-- Switched deployment from TravisCI to GitHub Actions. ([#17](https://github.com/coatless/rcppensmallen/pull/17), [#22](https://github.com/coatless/rcppensmallen/pull/22))
-- Removed check on header file inclusion ([#21](https://github.com/coatless/rcppensmallen/pull/21))
+- Switched deployment from TravisCI to GitHub Actions. ([#17](https://github.com/coatless-rpkg/rcppensmallen/pull/17), [#22](https://github.com/coatless-rpkg/rcppensmallen/pull/22))
+- Removed check on header file inclusion ([#21](https://github.com/coatless-rpkg/rcppensmallen/pull/21))
 
 # RcppEnsmallen 0.2.10.3.1
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # RcppEnsmallen
 
 <!-- badges: start -->
-[![R build status](https://github.com/coatless/rcppensmallen/workflows/R-CMD-check/badge.svg)](https://github.com/coatless/rcppensmallen/actions)
+[![R build status](https://github.com/coatless-rpkg/rcppensmallen/workflows/R-CMD-check/badge.svg)](https://github.com/coatless-rpkg/rcppensmallen/actions)
 [![License](https://eddelbuettel.github.io/badges/GPL2+.svg)](https://www.gnu.org/licenses/gpl-2.0.html) 
 [![CRAN](https://www.r-pkg.org/badges/version/RcppEnsmallen)](https://cran.r-project.org/package=RcppEnsmallen) 
 [![Downloads](https://cranlogs.r-pkg.org/badges/RcppEnsmallen?color=brightgreen)](https://www.r-pkg.org/pkg/RcppEnsmallen)

diff --git a/inst/include/ensmallen_bits/callbacks/progress_bar.hpp b/inst/include/ensmallen_bits/callbacks/progress_bar.hpp
@@ -216,10 +216,10 @@ class ProgressBar
         output << ".";
       }
     }
-
-    const size_t stepTime = epochTimer.toc() / (double) epochSize * 1000;
-    output << "] " << progress << "% - " << (size_t) epochTimer.toc() % 60
-        << "s " << stepTime << "ms/step " << "- loss: " << objective  <<  "\n";
+    const double epochTimerElapsed = epochTimer.toc();
+    const size_t stepTime = epochTimerElapsed / (double) epochSize * 1000;
+    output << "] " << progress << "% - " << epochTimerElapsed
+        << "s/epoch; " << stepTime << "ms/step; loss: " << objective  <<  "\n";
     output.flush();
   }
 

diff --git a/inst/include/ensmallen_bits/ens_version.hpp b/inst/include/ensmallen_bits/ens_version.hpp
@@ -16,16 +16,16 @@
 // The minor version is two digits so regular numerical comparisons of versions
 // work right.  The first minor version of a release is always 10.
 #define ENS_VERSION_MINOR 18
-#define ENS_VERSION_PATCH 1
+#define ENS_VERSION_PATCH 2
 // If this is a release candidate, it will be reflected in the version name
 // (i.e. the version name will be "RC1", "RC2", etc.).  Otherwise the version
 // name will typically be a seemingly arbitrary set of words that does not
 // contain the capitalized string "RC".
 #define ENS_VERSION_NAME "Fairmount Bagel"
 // Incorporate the date the version was released.
-#define ENS_VERSION_YEAR "2021"
-#define ENS_VERSION_MONTH "11"
-#define ENS_VERSION_DAY "19"
+#define ENS_VERSION_YEAR "2022"
+#define ENS_VERSION_MONTH "02"
+#define ENS_VERSION_DAY "13"
 
 namespace ens {
 

diff --git a/man/RcppEnsmallen-package.Rd b/man/RcppEnsmallen-package.Rd
diff --git a/tools/HISTORYold.md b/tools/HISTORYold.md
@@ -1,3 +1,11 @@
+### ensmallen 2.18.2: "Fairmount Bagel"
+###### 2022-02-13
+ * Update Catch2 to 2.13.8
+  ([#336](https://github.com/mlpack/ensmallen/pull/336)).
+
+ * Fix epoch timing output
+  ([#337](https://github.com/mlpack/ensmallen/pull/337)).
+
 ### ensmallen 2.18.1: "Fairmount Bagel"
 ###### 2021-11-19
  * Accelerate SGD test time