summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2011-11-07 13:50:46 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2011-11-07 13:50:46 (GMT)
commit264fa3562aa40b083bbfea7bd27731086e19aa9e (patch)
treee7f6481f3484429b4a42de9c7483c1eca35b1d29
parenta5994e1fb6787f63ada4e017afdebb89f04a3028 (diff)
downloadhdf5-264fa3562aa40b083bbfea7bd27731086e19aa9e.zip
hdf5-264fa3562aa40b083bbfea7bd27731086e19aa9e.tar.gz
hdf5-264fa3562aa40b083bbfea7bd27731086e19aa9e.tar.bz2
[svn-r21725] Bug HDFFV-2511: h5repack: failed in -q32 AIX due to memory
Description: removed the temporary patch of RUNSERIAL=${RUNSERIAL="env LDR_CNTRL=MAXDATA=0x20000000@DSA"} and similaryly for RUNPARALLEL since the h5repack test failure was fixed and this patch is no longer needed. (IBM also advices not to hardset MAXDATA if possible.) Tested: NASA G-ADA AIX machine, both 32 and 64 bits modes. (No parallel test because not able to build or run MPI executables yet.)
-rw-r--r--config/ibm-aix5
1 files changed, 1 insertions, 4 deletions
diff --git a/config/ibm-aix b/config/ibm-aix
index 7022ab6..ff541bc 100644
--- a/config/ibm-aix
+++ b/config/ibm-aix
@@ -36,10 +36,7 @@ fi
# Ask for more memory so that "make check" will pass. Not necessary for -q64
# mode but it does no harm.
if test "X-$enable_parallel" = "X-yes" -o X-$CC_BASENAME = X-mpcc_r; then
- RUNPARALLEL=${RUNPARALLEL="env LDR_CNTRL=MAXDATA=0x20000000@DSA MP_PROCS=\$\${NPROCS:=6} MP_TASKS_PER_NODE=\$\${NPROCS:=6} poe"}
- RUNSERIAL=${RUNSERIAL="env LDR_CNTRL=MAXDATA=0x20000000@DSA MP_PROCS=1 MP_TASKS_PER_NODE=1 poe"}
-else
- RUNSERIAL=${RUNSERIAL="env LDR_CNTRL=MAXDATA=0x20000000@DSA"}
+ RUNPARALLEL=${RUNPARALLEL="env MP_PROCS=\$\${NPROCS:=6} MP_TASKS_PER_NODE=\$\${NPROCS:=6} poe"}
fi