merge fix
nuke cuda
Merge commit '850418eec4098f6865bca405eef477a8bb49c309' into reffed_repo
Merge commit 'd6f0787819b51fbf6a0674ed1d4c035ec960806b' into reffed_repo
merge
default device selection
fixed termination criteria for jacobi