From 2d25bd933e4341f40a318739e4581e01d8b133df Mon Sep 17 00:00:00 2001 From: Ryan Curtin Date: Thu, 16 Apr 2020 20:37:08 -0400 Subject: [PATCH 1/5] Update HISTORY for release. --- HISTORY.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 3bf2bd11e..52a16a1df 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -2,12 +2,10 @@ ###### ????-??-?? * Fix total number of epochs and time estimation for ProgressBar callback ([#181](https://github.com/mlpack/ensmallen/pull/181)). - + * Handle SpSubview_col and SpSubview_row in Armadillo 9.870 ([#194](https://github.com/mlpack/ensmallen/pull/194)). - * ... - ### ensmallen 2.12.0: "Stir Crazy" ###### 2020-03-28 * Correction in the formulation of sigma in CMA-ES From c0e08158b2bd1297cc5716df61ab4adb9f66e23c Mon Sep 17 00:00:00 2001 From: Ryan Curtin Date: Thu, 16 Apr 2020 20:39:35 -0400 Subject: [PATCH 2/5] Allow SSH remotes. --- scripts/ensmallen-release.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ensmallen-release.sh b/scripts/ensmallen-release.sh index 878f7a7f4..bcc394a41 100755 --- a/scripts/ensmallen-release.sh +++ b/scripts/ensmallen-release.sh @@ -33,7 +33,7 @@ fi # Make sure that the mlpack repository exists. dest_remote_name=`git remote -v |\ - grep "https://github.com/mlpack/ensmallen (fetch)" |\ + grep "mlpack/ensmallen (fetch)" |\ head -1 |\ awk -F' ' '{ print $1 }'`; @@ -77,11 +77,11 @@ fi # Check git remotes: we need to make sure we have a fork to push to. github_user=$1; remote_name=`git remote -v |\ - grep "https://github.com/$github_user/ensmallen (push)" |\ + grep "$github_user/ensmallen (push)" |\ head -1 |\ awk -F' ' '{ print $1 }'`; if [ "a$remote_name" == "a" ]; then - echo "No git remote found for https://github.com/$github_user/ensmallen!"; + echo "No git remote found for $github_user/ensmallen!"; echo "Adding remote '$github_user'."; git remote add $github_user https://github.com/$github_user/ensmallen; remote_name="$github_user"; From 09fccad4a4bc5a391e14b42e1d2fd976fffdfa6e Mon Sep 17 00:00:00 2001 From: Ryan Curtin Date: Thu, 16 Apr 2020 20:40:32 -0400 Subject: [PATCH 3/5] Update and release version 2.12.1. --- CONTRIBUTING.md | 4 ++-- HISTORY.md | 4 ++-- include/ensmallen_bits/ens_version.hpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d310d6862..13ae21d4c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -108,8 +108,8 @@ $ cd ensmallen # - or - -$ wget http://ensmallen.org/files/ensmallen-2.12.0.tar.gz -$ tar -xvzpf ensmallen-2.12.0.tar.gz +$ wget http://ensmallen.org/files/ensmallen-2.12.1.tar.gz +$ tar -xvzpf ensmallen-2.12.1.tar.gz $ cd ensmallen-latest ``` diff --git a/HISTORY.md b/HISTORY.md index 52a16a1df..3d92ff587 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,5 @@ -### ensmallen ?.??.?: "???" -###### ????-??-?? +### ensmallen 2.12.1: "Stir Crazy" +###### 2020-04-16 * Fix total number of epochs and time estimation for ProgressBar callback ([#181](https://github.com/mlpack/ensmallen/pull/181)). diff --git a/include/ensmallen_bits/ens_version.hpp b/include/ensmallen_bits/ens_version.hpp index 3ef250b29..3d65770a3 100644 --- a/include/ensmallen_bits/ens_version.hpp +++ b/include/ensmallen_bits/ens_version.hpp @@ -16,7 +16,7 @@ // 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 12 -#define ENS_VERSION_PATCH 0 +#define ENS_VERSION_PATCH 1 // 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 From 7064fbeb60bfec8f4c9a41e1e381e13fb1822e55 Mon Sep 17 00:00:00 2001 From: Ryan Curtin Date: Thu, 16 Apr 2020 20:40:32 -0400 Subject: [PATCH 4/5] Add new block for next release to HISTORY.md. --- HISTORY.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/HISTORY.md b/HISTORY.md index 3d92ff587..6359d20ac 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,6 @@ +### ensmallen ?.??.?: "???" +###### ????-??-?? + ### ensmallen 2.12.1: "Stir Crazy" ###### 2020-04-16 * Fix total number of epochs and time estimation for ProgressBar callback From 86e5f679bca7da9f4261a6489724ddfc87086453 Mon Sep 17 00:00:00 2001 From: Ryan Birmingham Date: Mon, 20 Apr 2020 14:53:46 -0400 Subject: [PATCH 5/5] Remove extra lines --- HISTORY.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index ce4be1582..fea698f6e 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -12,9 +12,6 @@ * Minor documentation fixes ([#197](https://github.com/mlpack/ensmallen/pull/197)). - - - ### ensmallen 2.12.0: "Stir Crazy" ###### 2020-03-28 * Correction in the formulation of sigma in CMA-ES