From 05bd760bc7a9d0a9c79d0d1de2439167a58c2ca1 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Fri, 5 May 2017 11:49:15 -0400 Subject: [PATCH 1/2] removed debug message that broke stack unlimiting --- DAMASK_env.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/DAMASK_env.sh b/DAMASK_env.sh index 0ae3a2abf..264ae9c94 100644 --- a/DAMASK_env.sh +++ b/DAMASK_env.sh @@ -46,8 +46,7 @@ if [ "x$FREE" != "x" ]; then ulimit -d unlimited 2>/dev/null \ || ulimit -d $(expr $freeMem / 2) 2>/dev/null # maximum heap size (kB) ulimit -s unlimited 2>/dev/null \ - || echo "cannot unlimit stack..." \ - && ulimit -s $(expr $freeMem / $DAMASK_NUM_THREADS / 2) 2>/dev/null # maximum stack size (kB) + || ulimit -s $(expr $freeMem / $DAMASK_NUM_THREADS / 2) 2>/dev/null # maximum stack size (kB) fi ulimit -v unlimited 2>/dev/null # maximum virtual memory size ulimit -m unlimited 2>/dev/null # maximum physical memory size From 153f49fd1c6325224af45e0ad4d789c9a929694b Mon Sep 17 00:00:00 2001 From: Test User Date: Sat, 6 May 2017 02:10:02 +0200 Subject: [PATCH 2/2] [skip ci] updated version information after successful test of v2.0.1-692-g05bd760 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index b69932daf..9135e0cbb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.1-684-gb7a138e +v2.0.1-692-g05bd760