Modifications for test runs on Juqueen

Meinersbur · Jan 31, 2013 · 705c948 · 705c948
1 parent 5261f94
commit 705c948
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 19 deletions.
diff --git a/Hopping_Matrix.c b/Hopping_Matrix.c
@@ -78,7 +78,6 @@
 
 #if defined _USE_HALFSPINOR
 #  include "operator/halfspinor_hopping.h"
-wertwert
 #  if ((defined SSE2)||(defined SSE3))
 #    include "sse.h"
 

diff --git a/build-bgq.sh b/build-bgq.sh
@@ -17,7 +17,7 @@ CPPFLAGS="${CPPFLAGS} -DBGQ_QPX=1"
 CPPFLAGS="${CPPFLAGS} -DXLC=1"
 #CPPFLAGS="${CPPFLAGS} -DBGQ=1"
 CPPFLAGS="${CPPFLAGS} -DPAPI=1"
-CPPFLAGS="${CPPFLAGS} -DBGQ_UNVECTORIZE=0"
+CPPFLAGS="${CPPFLAGS} -DBGQ_UNVECTORIZE=1"
 #CPPFLAGS="${CPPFLAGS} -DBGQ_COORDCHECK=1"
 CPPFLAGS="${CPPFLAGS} -DBGQ_REPLACE=0"
 
@@ -58,7 +58,7 @@ LIBS="${LIBS} -lxlopt"
 
 
 LDFLAGS=""
-LDFLAGS="${LDFLAGS} -O5"
+#LDFLAGS="${LDFLAGS} -O5"
 LDFLAGS="${LDFLAGS} -L/opt/ibmcmp/xlf/bg/14.1/lib64"
 LDFLAGS="${LDFLAGS} -L/opt/ibmcmp/xlsmp/bg/3.1/bglib64"
 LDFLAGS="${LDFLAGS} -L/usr/local/bg_soft/lapack/3.3.0"
@@ -100,10 +100,10 @@ CONFIGURE="${CONFIGURE} --with-limedir=${HOME}/lime"
 CONFIGURE="${CONFIGURE} --with-lemondir=${HOME}/lemon"
 CONFIGURE="${CONFIGURE} --enable-mpi"
 CONFIGURE="${CONFIGURE} --with-mpidimension=XYZT"
-#CONFIGURE="${CONFIGURE} --enable-omp"
+CONFIGURE="${CONFIGURE} --enable-omp"
 CONFIGURE="${CONFIGURE} --enable-gaugecopy"
-#CONFIGURE="${CONFIGURE} --enable-halfspinor"
-CONFIGURE="${CONFIGURE} --disable-halfspinor"
+CONFIGURE="${CONFIGURE} --enable-halfspinor"
+#CONFIGURE="${CONFIGURE} --disable-halfspinor"
 CONFIGURE="${CONFIGURE} --enable-largefile"
 CONFIGURE="${CONFIGURE} --with-lapack="\"'${LAPACK}'\"
 #CONFIGURE="${CONFIGURE} CC="\"'tau_cc.sh -tau_options=-optCompInst'\"
@@ -117,7 +117,7 @@ CONFIGURE="${CONFIGURE} CFLAGS="\"'${CFLAGS}'\"
 CONFIGURE="${CONFIGURE} LIBS="\"'${LIBS}'\"
 CONFIGURE="${CONFIGURE} LDFLAGS="\"'${LDFLAGS}'\"
 CONFIGURE="${CONFIGURE} --enable-optimize=no"
-#CONFIGURE="${CONFIGURE} --enable-qpx"
+CONFIGURE="${CONFIGURE} --enable-qpx"
 CONFIGURE="${CONFIGURE} --enable-spi"
 CONFIGURE="${CONFIGURE} --disable-sse2"
 CONFIGURE="${CONFIGURE} --disable-sse3"

diff --git a/job.ll.template b/job.ll.template
@@ -4,11 +4,11 @@
 #@ error  = $(job_name).$(jobid).out
 #@ output = $(job_name).$(jobid).out
 #@ environment = COPY_ALL;
-#@ wall_clock_limit = 05:00:00
+#@ wall_clock_limit = 00:30:00
 #@ notification = error
 #@ notify_user = [email protected]
 #@ job_type = bluegene
-#@ bg_size = 4096
+#@ bg_size = 32
 ##@ bg_shape = 1x1x1x2
 #@ bg_connectivity = TORUS
 #@ queue
@@ -50,20 +50,20 @@ LZ=64
 
 INPUT_FILE_PHMC=hmc_tm.input_phmc.${LOADL_STEP_ID}
 cat > ${INPUT_FILE_PHMC} <<+EOF
-T=256
-#NrTProcs=8
+T=48
+#NrTProcs=4
 
-LX=128
-NrXProcs=8
+LX=40
+NrXProcs=4
 
-LY=128
-NrYProcs=8
+LY=20
+NrYProcs=2
 
-LZ=128
-NrZProcs=8
+LZ=12
+NrZProcs=1
 
 #bg_size=2048 (4 midplanes)
-#local lattice=32 x 16 x 16 x 32 = 2^(5+4+4+4) = 2^17
+#local lattice=12 x 10 x 10 x 12 
 
 OMPNumThreads = 64
 DebugLevel = 1

diff --git a/linalg/assign_add_mul_r.c b/linalg/assign_add_mul_r.c
@@ -93,7 +93,7 @@ void assign_add_mul_r(spinor * const P, spinor * const Q, const double c, const
 #elif (defined BGQ && defined XLC)
 
 void assign_add_mul_r(spinor * const R, spinor * const S, const double c, const int N) {
-	spinorfield_linalg_ur(P, S);
+	spinorfield_linalg_ur(R, S);
 #ifdef OMP
 #pragma omp parallel
   {

diff --git a/update_backward_gauge.c b/update_backward_gauge.c
@@ -65,7 +65,9 @@ void update_backward_gauge(su3 ** const gf) {
   } /* OpenMP closing brace */
 #endif
 
+#if BGQ_REPLACE
   bgq_gaugefield_transferfrom(gf);
+#endif
   g_update_gauge_copy = 0;
   return;
 }
@@ -127,7 +129,9 @@ void update_backward_gauge(su3 ** const gf) {
   } /* OpenMP closing brace */
 #endif
 
+#if BGQ_REPLACE
   bgq_gaugefield_transferfrom(gf);
+#endif
   g_update_gauge_copy = 0;
   return;
 }