Merged in prabhuramachandran/pysph/run-all-tests (pull request #163)

Run all tests on shippable.

pysph/parallel/tests/summation_density.py

@@ -92,19 +92,21 @@ def sd_evaluate(nnps, pm, mass, src_index, dst_index):
 Z1 = numpy.zeros( numGlobalPoints ); H1 = numpy.ones_like(X1) * hdx * dx
 RHO1 = numpy.zeros_like(X1)
 
-comm.Gatherv( sendbuf=x1, recvbuf=X1 )
-comm.Gatherv( sendbuf=y1, recvbuf=Y1 )
-comm.Gatherv( sendbuf=z1, recvbuf=Z1 )
-comm.Gatherv( sendbuf=rho1, recvbuf=RHO1)
+gathers = (numpy.ones(size)*numMyPoints, None)
+
+comm.Gatherv( sendbuf=[x1, mpi.DOUBLE], recvbuf=[X1, gathers, mpi.DOUBLE] )
+comm.Gatherv( sendbuf=[y1, mpi.DOUBLE], recvbuf=[Y1, gathers, mpi.DOUBLE] )
+comm.Gatherv( sendbuf=[z1, mpi.DOUBLE], recvbuf=[Z1, gathers, mpi.DOUBLE] )
+comm.Gatherv( sendbuf=[rho1, mpi.DOUBLE], recvbuf=[RHO1, gathers, mpi.DOUBLE])
 
 X2 = numpy.zeros( numGlobalPoints ); Y2 = numpy.zeros( numGlobalPoints )
 Z2 = numpy.zeros( numGlobalPoints ); H2 = numpy.ones_like(X2) * hdx * dx
 RHO2 = numpy.zeros_like(X2)
 
-comm.Gatherv( sendbuf=x2, recvbuf=X2 )
-comm.Gatherv( sendbuf=y2, recvbuf=Y2 )
-comm.Gatherv( sendbuf=z2, recvbuf=Z2 )
-comm.Gatherv( sendbuf=rho2, recvbuf=RHO2)
+comm.Gatherv( sendbuf=[x2, mpi.DOUBLE], recvbuf=[X2, gathers, mpi.DOUBLE])
+comm.Gatherv( sendbuf=[y2, mpi.DOUBLE], recvbuf=[Y2, gathers, mpi.DOUBLE])
+comm.Gatherv( sendbuf=[z2, mpi.DOUBLE], recvbuf=[Z2, gathers, mpi.DOUBLE])
+comm.Gatherv( sendbuf=[rho2, mpi.DOUBLE], recvbuf=[RHO2, gathers, mpi.DOUBLE])
 
 # create the particle arrays and PM
 PA1 = get_particle_array_wcsph(x=X1, y=Y1, z=Z1, h=H1, rho=RHO1)

pysph/tools/run_parallel_script.py

@@ -21,7 +21,7 @@ def kill_process(process):
     print 'KILLING PROCESS ON TIMEOUT'
     process.kill()
 
-def run(filename, args=None, nprocs=2, timeout=20.0, path=None):
+def run(filename, args=None, nprocs=2, timeout=30.0, path=None):
     """Run a python script with MPI or in serial (if nprocs=1).  Kill process
     if it takes longer than the specified timeout.
 

shippable.yml

@@ -35,4 +35,4 @@ before_script:
     - mkdir -p shippable/testresults
 
 script:
-    - nosetests -v --with-xunit --xunit-file=shippable/testresults/nosetests.xml
+    - nosetests -v -A slow --with-xunit --xunit-file=shippable/testresults/nosetests.xml