From 531a1827c7ac154c9623a3f21752f28a40c16f9c Mon Sep 17 00:00:00 2001 From: Jacques Kvam Date: Fri, 13 Feb 2015 12:11:43 -0800 Subject: [PATCH 1/7] latest miniconda --- bin/steps/conda_compile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/steps/conda_compile b/bin/steps/conda_compile index f77bdb4..612788d 100755 --- a/bin/steps/conda_compile +++ b/bin/steps/conda_compile @@ -1,8 +1,8 @@ if [ ! -d /app/.heroku/miniconda ]; then - puts-step "Preparing Python/Miniconda Environment (3.5.2)" - curl -Os http://repo.continuum.io/miniconda/Miniconda-3.7.3-Linux-x86_64.sh - bash Miniconda-3.7.3-Linux-x86_64.sh -p /app/.heroku/miniconda/ -b | indent - rm -fr Miniconda-3.7.3-Linux-x86_64.sh + puts-step "Preparing Python/Miniconda Environment" + curl -Os http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh + bash Miniconda-latest-Linux-x86_64.sh -p /app/.heroku/miniconda/ -b | indent + rm -fr Miniconda-latest-Linux-x86_64.sh conda install pip --yes | indent fi From 6fa5b7a3467a9bfeea237190c4179a6c07ceae62 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 22 Jul 2016 13:42:07 -0700 Subject: [PATCH 2/7] add nomkl to post compile --- bin/post_compile | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 bin/post_compile diff --git a/bin/post_compile b/bin/post_compile new file mode 100755 index 0000000..219df0d --- /dev/null +++ b/bin/post_compile @@ -0,0 +1,3 @@ +#!/bin/sh +echo "nomkl" > ./.heroku/miniconda/conda-meta/pinned + From 0d415b4d88f68f31b593d4a27658bec335740cb3 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 22 Jul 2016 13:48:26 -0700 Subject: [PATCH 3/7] update to pinned file --- bin/post_compile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/post_compile b/bin/post_compile index 219df0d..1f5506d 100755 --- a/bin/post_compile +++ b/bin/post_compile @@ -1,3 +1,3 @@ #!/bin/sh -echo "nomkl" > ./.heroku/miniconda/conda-meta/pinned - +echo "nomkl" > $HOME/.heroku/miniconda/conda-meta/pinned +echo "Placed pinned file into $HOME/.heroku/miniconda/conda-meta/pinned" From 5a5b8c1107ba48728b9079347713d3ab9acbbe2c Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 22 Jul 2016 13:52:57 -0700 Subject: [PATCH 4/7] more nomkl stuff --- bin/post_compile | 3 --- bin/steps/conda_compile | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100755 bin/post_compile diff --git a/bin/post_compile b/bin/post_compile deleted file mode 100755 index 1f5506d..0000000 --- a/bin/post_compile +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -echo "nomkl" > $HOME/.heroku/miniconda/conda-meta/pinned -echo "Placed pinned file into $HOME/.heroku/miniconda/conda-meta/pinned" diff --git a/bin/steps/conda_compile b/bin/steps/conda_compile index 612788d..2f9460d 100755 --- a/bin/steps/conda_compile +++ b/bin/steps/conda_compile @@ -7,6 +7,8 @@ if [ ! -d /app/.heroku/miniconda ]; then conda install pip --yes | indent fi +echo "nomkl" > $HOME/.heroku/miniconda/conda-meta/pinned + if [ -f conda-requirements.txt ]; then puts-step "Installing dependencies using Conda" From 16dbdbc4e6e9536c48dbb82ca843748ccdc8a61b Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 22 Jul 2016 13:57:40 -0700 Subject: [PATCH 5/7] more nomkl --- bin/steps/conda_compile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/steps/conda_compile b/bin/steps/conda_compile index 2f9460d..972987e 100755 --- a/bin/steps/conda_compile +++ b/bin/steps/conda_compile @@ -8,6 +8,8 @@ if [ ! -d /app/.heroku/miniconda ]; then fi echo "nomkl" > $HOME/.heroku/miniconda/conda-meta/pinned +conda remove mkl +echo "added pinned file in $HOME/.heroku/miniconda/conda-meta/pinned" if [ -f conda-requirements.txt ]; then From 58b11a1b8fd18905fb363200d7b4c2051b2a441b Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 22 Jul 2016 14:01:31 -0700 Subject: [PATCH 6/7] more nomkl --- bin/steps/conda_compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/steps/conda_compile b/bin/steps/conda_compile index 972987e..8c310e9 100755 --- a/bin/steps/conda_compile +++ b/bin/steps/conda_compile @@ -8,8 +8,8 @@ if [ ! -d /app/.heroku/miniconda ]; then fi echo "nomkl" > $HOME/.heroku/miniconda/conda-meta/pinned -conda remove mkl echo "added pinned file in $HOME/.heroku/miniconda/conda-meta/pinned" +conda remove mkl if [ -f conda-requirements.txt ]; then From 32eae9000743d50e9bf65d9a62989790eab9fcd6 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 22 Jul 2016 14:03:34 -0700 Subject: [PATCH 7/7] more nomkl --- bin/steps/conda_compile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/steps/conda_compile b/bin/steps/conda_compile index 8c310e9..5ef775d 100755 --- a/bin/steps/conda_compile +++ b/bin/steps/conda_compile @@ -9,7 +9,7 @@ fi echo "nomkl" > $HOME/.heroku/miniconda/conda-meta/pinned echo "added pinned file in $HOME/.heroku/miniconda/conda-meta/pinned" -conda remove mkl +conda install nomkl if [ -f conda-requirements.txt ]; then