check fixes

Author: montyvesselinov

src/RobustPmap.jl

@@ -14,11 +14,11 @@ import FileIO
 function checkexceptions(x::Any, t::Type=Any, args...)
 	for i in eachindex(x)
 		if isa(x[i], Exception)
-			@error("Execution failed for one of the runs (run #$(i)) with exception error $(typeof(x[i]))!")
+			@error("Execution failed for one of the runs (run $(i) out of $(length(x))) with exception error $(typeof(x[i]))!")
 			@error("Failing input parameter set: $(args[1][i])")
-			throw(TypeError(:RobustPmap, t, x[i]))
+			throw(ErrorException("Run failed with exception error $(typeof(x[i]))!"))
 		elseif !isa(x[i], t)
-			@error("Execution failed for one of the runs (run #$(i))")
+			@error("Execution failed for one of the runs (run $(i) out of $(length(x))) producing an expected output of type $(typeof(x[i]))!")
 			@error("Failing input parameter set: $(args[1][i])")
 			throw(TypeError(:RobustPmap, t, x[i]))
 		end
@@ -27,14 +27,14 @@ function checkexceptions(x::Any, t::Type=Any, args...)
 end
 
 "Robust pmap call"
-function rpmap(f::Function, args...; t::Type=Any)
+function rpmap(f::Function, args...; t::Type=Any, checkoutputs::Bool=true)
 	x = Distributed.pmap(f, args...; on_error=x->x)
-	checkexceptions(x, t, args...)
-	return convert(Vector{t}, x)
+	checkoutputs && checkexceptions(x, t, args...)
+	return convert(Array{t}, x) # x can be either a matrix or vector
 end
 
 "Robust pmap call with checkpoints"
-function crpmap(f::Function, checkpointfrequency::Int, filerootname::AbstractString, args...; t::Type=Any)
+function crpmap(f::Function, checkpointfrequency::Int, filerootname::AbstractString, args...; t::Type=Any, checkoutputs::Bool=true)
 	fullresult = t[]
 	hashargs = hash(args)
 	if checkpointfrequency <= 0
@@ -47,7 +47,7 @@ function crpmap(f::Function, checkpointfrequency::Int, filerootname::AbstractStr
 		if isfile(filename)
 			partialresult = FileIO.load(filename, "partialresult")
 		else
-			partialresult = rpmap(f, map(x->x[r], args)...; t=t)
+			partialresult = rpmap(f, map(x->x[r], args)...; t=t, checkoutputs=checkoutputs)
 			FileIO.save(filename, "partialresult", partialresult)
 		end
 		append!(fullresult, partialresult)

test/runtests.jl

@@ -9,6 +9,7 @@ if Distributed.nworkers() < 2
 end
 
 @Distributed.everywhere rpmfn(x) = x > 0 ? 1 : 1.
+
 function testtypecheck()
 	@Test.test_throws TypeError RobustPmap.rpmap(rpmfn, [-1, 0, 1]; t=Int)
 end