walla (mpiimporter) is working on Shaheen

ahmadia · Jul 10, 2012 · 7cb980a · 7cb980a
1 parent 67c5c55
commit 7cb980a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/importer.c b/importer.c
@@ -970,7 +970,7 @@ static char* sys_files[] = {
 
 	MPI_Bcast(&rc,1,MPI_INT,0,MPI_COMM_WORLD);
 
-	MPI_Bcast(&mtime,1,MPI_LONG_INT,0,MPI_COMM_WORLD);
+	MPI_Bcast(&mtime,sizeof(time_t),MPI_BYTE,0,MPI_COMM_WORLD);
 
         if (rc != 0) {
             PyErr_Format(PyExc_RuntimeError,

diff --git a/makeinc.shaheen b/makeinc.shaheen
@@ -6,7 +6,7 @@ PYTHON_CFLAGS = -I${PYTHONPATH}/include/python2.7
 
 
 CFLAGS = -std=c99 -fPIC -Wall -Wextra ${CFLAGS_DEBUG} -D_LARGEFILE64_SOURCE
-CFLAGS_DEBUG = -g3 -DDEBUG=1 -DMPIDEBUG=1
+CFLAGS_DEBUG = -g3 -DDEBUG=1 
 LIBCPATH = /home/aron/bgpsys/lib
 LIBDL = -ldl
 LDSO = ld-2.4.so

diff --git a/mpiopen.c b/mpiopen.c
@@ -228,8 +228,10 @@ int mpistat(const char *path, struct stat *stat_buf)
 #endif
 
   if(rc==0) {
+#ifdef MPIDEBUG
     MPI_Barrier(MPI_COMM_WORLD);
     printf("rank %d |%d| about to broadcast %zu bytes of stat buf %s\n",rank,__LINE__,sizeof(struct stat),path);
+#endif
     MPI_Bcast(stat_buf,sizeof(struct stat),MPI_BYTE,0,MPI_COMM_WORLD);
 #ifdef MPIDEBUG
     MPI_Barrier(MPI_COMM_WORLD);

diff --git a/shaheen/mpiimporter_test.ll b/shaheen/mpiimporter_test.ll
@@ -36,8 +36,8 @@ cd $testdir
 logdir=${testdir}/test_runs
 mkdir -p ${logdir}
 
-for np in 2  
+for np in 2 4 
 do
     mpirun -env LD_LIBRARY_PATH=${ldpath} -env PYTHONPATH=${bgp_python_path} \
-        -mode VN -exp_env HOME -n $np ${bgp_python} -v test_import_numpy.py &> ${logdir}/bgp_python_${np}.txt
+        -mode VN -exp_env HOME -n $np ${bgp_python}  test_import_numpy.py &> ${logdir}/bgp_python_${np}.txt
 done