提交 8f2ecc01 authored 作者: Markus Roth's avatar Markus Roth

Surround by try-finally to eventually reset flag properly.

上级 c64a610e
...@@ -21,6 +21,7 @@ def test_unpickle_cudandarray_as_numpy_ndarray_flag0(): ...@@ -21,6 +21,7 @@ def test_unpickle_cudandarray_as_numpy_ndarray_flag0():
oldflag = config.experimental.unpickle_gpu_on_cpu oldflag = config.experimental.unpickle_gpu_on_cpu
config.experimental.unpickle_gpu_on_cpu = False config.experimental.unpickle_gpu_on_cpu = False
try:
testfile_dir = os.path.dirname(os.path.realpath(__file__)) testfile_dir = os.path.dirname(os.path.realpath(__file__))
with open(os.path.join(testfile_dir, 'CudaNdarray.pkl')) as fp: with open(os.path.join(testfile_dir, 'CudaNdarray.pkl')) as fp:
if cuda_available: if cuda_available:
...@@ -32,6 +33,7 @@ def test_unpickle_cudandarray_as_numpy_ndarray_flag0(): ...@@ -32,6 +33,7 @@ def test_unpickle_cudandarray_as_numpy_ndarray_flag0():
assert isinstance(mat, CudaNdarray) assert isinstance(mat, CudaNdarray)
assert numpy.asarray(mat)[0] == -42.0 assert numpy.asarray(mat)[0] == -42.0
finally:
config.experimental.unpickle_gpu_on_cpu = oldflag config.experimental.unpickle_gpu_on_cpu = oldflag
...@@ -39,6 +41,7 @@ def test_unpickle_cudandarray_as_numpy_ndarray_flag1(): ...@@ -39,6 +41,7 @@ def test_unpickle_cudandarray_as_numpy_ndarray_flag1():
oldflag = config.experimental.unpickle_gpu_on_cpu oldflag = config.experimental.unpickle_gpu_on_cpu
config.experimental.unpickle_gpu_on_cpu = True config.experimental.unpickle_gpu_on_cpu = True
try:
testfile_dir = os.path.dirname(os.path.realpath(__file__)) testfile_dir = os.path.dirname(os.path.realpath(__file__))
with open(os.path.join(testfile_dir, 'CudaNdarray.pkl')) as fp: with open(os.path.join(testfile_dir, 'CudaNdarray.pkl')) as fp:
...@@ -47,4 +50,5 @@ def test_unpickle_cudandarray_as_numpy_ndarray_flag1(): ...@@ -47,4 +50,5 @@ def test_unpickle_cudandarray_as_numpy_ndarray_flag1():
assert isinstance(mat, numpy.ndarray) assert isinstance(mat, numpy.ndarray)
assert mat[0] == -42.0 assert mat[0] == -42.0
finally:
config.experimental.unpickle_gpu_on_cpu = oldflag config.experimental.unpickle_gpu_on_cpu = oldflag
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论