Skip to content

Commit

Permalink
Merge pull request #1220 from not522/remove-_multiprocess_can_split_
Browse files Browse the repository at this point in the history
Remove _multiprocess_can_split_
  • Loading branch information
okuta committed May 7, 2018
2 parents d8000bb + c0ec46a commit 707f1e9
Show file tree
Hide file tree
Showing 67 changed files with 5 additions and 275 deletions.
2 changes: 0 additions & 2 deletions tests/cupy_tests/binary_tests/test_elementwise.py
Expand Up @@ -6,8 +6,6 @@
@testing.gpu
class TestElementwise(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_int_dtypes()
@testing.numpy_cupy_array_equal()
def check_unary_int(self, name, xp, dtype):
Expand Down
2 changes: 0 additions & 2 deletions tests/cupy_tests/binary_tests/test_packing.py
Expand Up @@ -7,8 +7,6 @@
@testing.gpu
class TestPacking(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.with_requires('numpy>=1.10')
@testing.for_int_dtypes()
@testing.numpy_cupy_array_equal()
Expand Down
4 changes: 0 additions & 4 deletions tests/cupy_tests/core_tests/test_elementwise.py
Expand Up @@ -13,8 +13,6 @@
@testing.gpu
class TestElementwise(unittest.TestCase):

_multiprocess_can_split_ = True

def check_copy(self, dtype, src_id, dst_id):
with cuda.Device(src_id):
src = testing.shaped_arange((2, 3, 4), dtype=dtype)
Expand Down Expand Up @@ -66,8 +64,6 @@ def test_copy_orders(self, order):
@testing.gpu
class TestElementwiseInvalidArgument(unittest.TestCase):

_multiprocess_can_split_ = True

def test_invalid_kernel_name(self):
with six.assertRaisesRegex(self, ValueError, 'Invalid kernel name'):
cupy.ElementwiseKernel('T x', '', '', '1')
Expand Down
24 changes: 0 additions & 24 deletions tests/cupy_tests/core_tests/test_fusion.py
Expand Up @@ -25,8 +25,6 @@ def g(*args):
@testing.gpu
class TestFusionElementwise(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_int_dtypes()
@testing.numpy_cupy_array_equal()
@fusion_default_array_equal()
Expand Down Expand Up @@ -64,8 +62,6 @@ def test_right_shift(self):
@testing.gpu
class TestFusionComparison(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes(no_complex=True)
@testing.numpy_cupy_allclose(atol=1e-5)
@fusion_default_array_equal()
Expand Down Expand Up @@ -96,8 +92,6 @@ def test_equal(self):
@testing.gpu
class TestFusionContent(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_float_dtypes()
@testing.numpy_cupy_array_equal()
@fusion_default_array_equal()
Expand Down Expand Up @@ -128,8 +122,6 @@ def test_isnan(self):
@testing.gpu
class TestFusionOps(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes(no_complex=True)
@testing.numpy_cupy_allclose(atol=1e-5)
@fusion_default_array_equal()
Expand Down Expand Up @@ -161,8 +153,6 @@ def test_logical_not(self):
@testing.gpu
class TestFusionTrigonometric(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes(no_complex=True)
@testing.numpy_cupy_allclose(atol=1e-5)
@fusion_default_array_equal()
Expand Down Expand Up @@ -219,8 +209,6 @@ def test_rad2deg(self):
@testing.gpu
class TestFusionHyperbolic(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes(no_complex=True)
@testing.numpy_cupy_allclose(atol=1e-5)
@fusion_default_array_equal()
Expand Down Expand Up @@ -264,8 +252,6 @@ def test_arctanh(self):
@testing.gpu
class TestFusionRounding(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes(no_complex=True)
@testing.numpy_cupy_allclose(atol=1e-5)
@fusion_default_array_equal()
Expand Down Expand Up @@ -302,8 +288,6 @@ def test_fix(self):
@testing.gpu
class TestFusionExplog(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes(no_complex=True)
@testing.numpy_cupy_allclose(atol=1e-5)
@fusion_default_array_equal()
Expand Down Expand Up @@ -353,8 +337,6 @@ def test_logaddexp2(self):
@testing.gpu
class TestFusionFloating(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes(no_complex=True)
@testing.numpy_cupy_allclose(atol=1e-5)
@fusion_default_array_equal()
Expand Down Expand Up @@ -413,8 +395,6 @@ def test_nextafter(self):
@testing.gpu
class TestFusionArithmetic(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes()
@testing.numpy_cupy_allclose(atol=1e-5)
@fusion_default_array_equal()
Expand Down Expand Up @@ -895,8 +875,6 @@ def test_reduce(self):
@testing.gpu
class TestFusionMisc(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes(no_complex=True)
@testing.numpy_cupy_allclose(atol=1e-5)
def check_unary(self, name, xp, dtype, no_bool=False):
Expand Down Expand Up @@ -1006,8 +984,6 @@ def test_fmin_nan(self):
@testing.gpu
class TestFusionFuse(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes(no_complex=True)
@testing.numpy_cupy_array_equal()
def test_fuse1(self, xp, dtype):
Expand Down
8 changes: 0 additions & 8 deletions tests/cupy_tests/core_tests/test_ndarray_complex_ops.py
Expand Up @@ -8,8 +8,6 @@
@testing.gpu
class TestConj(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes()
@testing.numpy_cupy_array_almost_equal()
def test_conj(self, xp, dtype):
Expand All @@ -28,8 +26,6 @@ def test_conj_pass(self, xp, dtype):
@testing.gpu
class TestAngle(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes()
@testing.numpy_cupy_array_almost_equal()
def test_angle(self, xp, dtype):
Expand All @@ -40,8 +36,6 @@ def test_angle(self, xp, dtype):
@testing.gpu
class TestRealImag(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes()
@testing.numpy_cupy_array_almost_equal(accept_error=False)
def test_real(self, xp, dtype):
Expand Down Expand Up @@ -98,8 +92,6 @@ def test_imag_inplace(self, dtype):
@testing.gpu
class TestScalarConversion(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes()
@testing.with_requires('numpy>=1.12.0')
def test_scalar_conversion(self, dtype):
Expand Down
2 changes: 0 additions & 2 deletions tests/cupy_tests/core_tests/test_ndarray_contiguity.py
Expand Up @@ -6,8 +6,6 @@
@testing.gpu
class TestArrayContiguity(unittest.TestCase):

_multiprocess_can_split_ = True

def test_is_contiguous(self):
a = testing.shaped_arange((2, 3, 4))
self.assertTrue(a.flags.c_contiguous)
Expand Down
2 changes: 0 additions & 2 deletions tests/cupy_tests/core_tests/test_ndarray_copy_and_view.py
Expand Up @@ -9,8 +9,6 @@
@testing.gpu
class TestArrayCopyAndView(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.numpy_cupy_array_equal()
def test_view(self, xp):
a = testing.shaped_arange((4,), xp, dtype=numpy.float32)
Expand Down
4 changes: 0 additions & 4 deletions tests/cupy_tests/core_tests/test_ndarray_elementwise_op.py
Expand Up @@ -11,8 +11,6 @@
@testing.gpu
class TestArrayElementwiseOp(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes_combination(names=['x_type', 'y_type'],
no_complex=True)
@testing.numpy_cupy_allclose(rtol=1e-6, accept_error=TypeError)
Expand Down Expand Up @@ -517,8 +515,6 @@ def test_typecast_float2(self):
@testing.gpu
class TestArrayIntElementwiseOp(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes_combination(names=['x_type', 'y_type'])
@testing.numpy_cupy_allclose(accept_error=TypeError)
def check_array_scalar_op(self, op, xp, x_type, y_type, swap=False):
Expand Down
2 changes: 0 additions & 2 deletions tests/cupy_tests/core_tests/test_ndarray_get.py
Expand Up @@ -10,8 +10,6 @@
@testing.gpu
class TestArrayGet(unittest.TestCase):

_multiprocess_can_split_ = True

def setUp(self):
self.stream = cuda.Stream.null

Expand Down
4 changes: 0 additions & 4 deletions tests/cupy_tests/core_tests/test_ndarray_indexing.py
Expand Up @@ -73,8 +73,6 @@
@testing.gpu
class TestArrayIndexingParameterized(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes()
@testing.numpy_cupy_array_equal()
def test_getitem(self, xp, dtype):
Expand Down Expand Up @@ -117,8 +115,6 @@ def test_invalid_getitem(self, xp, dtype):
@testing.gpu
class TestArrayIndex(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes()
@testing.numpy_cupy_array_equal()
def test_setitem_constant(self, xp, dtype):
Expand Down
2 changes: 0 additions & 2 deletions tests/cupy_tests/core_tests/test_ndarray_owndata.py
Expand Up @@ -7,8 +7,6 @@
@testing.gpu
class TestArrayOwndata(unittest.TestCase):

_multiprocess_can_split_ = True

def setUp(self):
self.a = core.ndarray(())

Expand Down
2 changes: 0 additions & 2 deletions tests/cupy_tests/core_tests/test_ndarray_reduction.py
Expand Up @@ -6,8 +6,6 @@
@testing.gpu
class TestArrayReduction(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes(no_complex=True)
@testing.numpy_cupy_allclose()
def test_max_all(self, xp, dtype):
Expand Down
6 changes: 0 additions & 6 deletions tests/cupy_tests/core_tests/test_ndarray_unary_op.py
Expand Up @@ -10,8 +10,6 @@
@testing.gpu
class TestArrayBoolOp(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes()
def test_bool_empty(self, dtype):
self.assertFalse(bool(cupy.array((), dtype=dtype)))
Expand Down Expand Up @@ -43,8 +41,6 @@ def test_bool_two_elements(self, dtype):
@testing.gpu
class TestArrayUnaryOp(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes()
@testing.numpy_cupy_allclose()
def check_array_op(self, op, xp, dtype):
Expand Down Expand Up @@ -85,8 +81,6 @@ def test_abs_zerodim(self):
@testing.gpu
class TestArrayIntUnaryOp(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_int_dtypes()
@testing.numpy_cupy_allclose()
def check_array_op(self, op, xp, dtype):
Expand Down
6 changes: 0 additions & 6 deletions tests/cupy_tests/core_tests/test_reduction.py
Expand Up @@ -10,8 +10,6 @@
@testing.gpu
class SimpleReductionFunction(unittest.TestCase):

_multiprocess_can_split_ = True

def setUp(self):
self.my_int8_sum = core.create_reduction_func(
'my_sum', ('b->b',), ('in0', 'a + b', 'out0 = a', None))
Expand Down Expand Up @@ -60,8 +58,6 @@ def test_shape5(self):
@testing.gpu
class TestReductionKernel(unittest.TestCase):

_multiprocess_can_split_ = True

def setUp(self):
self.my_sum = core.ReductionKernel(
'T x', 'T out', 'x', 'a + b', 'out = a', '0', 'my_sum')
Expand Down Expand Up @@ -103,8 +99,6 @@ def test_shape4(self):
@testing.gpu
class TestReductionKernelInvalidArgument(unittest.TestCase):

_multiprocess_can_split_ = True

def test_invalid_kernel_name(self):
with six.assertRaisesRegex(self, ValueError, 'Invalid kernel name'):
core.ReductionKernel(
Expand Down
2 changes: 0 additions & 2 deletions tests/cupy_tests/creation_tests/test_basic.py
Expand Up @@ -9,8 +9,6 @@
@testing.gpu
class TestBasic(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_CF_orders()
@testing.for_all_dtypes()
@testing.numpy_cupy_array_equal()
Expand Down
2 changes: 0 additions & 2 deletions tests/cupy_tests/creation_tests/test_from_data.py
Expand Up @@ -9,8 +9,6 @@
@testing.gpu
class TestFromData(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_orders('CFAK')
@testing.for_all_dtypes()
@testing.numpy_cupy_array_equal()
Expand Down
2 changes: 0 additions & 2 deletions tests/cupy_tests/creation_tests/test_matrix.py
Expand Up @@ -6,8 +6,6 @@
@testing.gpu
class TestMatrix(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.numpy_cupy_array_equal()
def test_diag1(self, xp):
a = testing.shaped_arange((3, 3), xp)
Expand Down
2 changes: 0 additions & 2 deletions tests/cupy_tests/creation_tests/test_ranges.py
Expand Up @@ -9,8 +9,6 @@
@testing.gpu
class TestRanges(unittest.TestCase):

_multiprocess_can_split_ = True

@testing.for_all_dtypes(no_bool=True)
@testing.numpy_cupy_array_equal()
def test_arange(self, xp, dtype):
Expand Down

0 comments on commit 707f1e9

Please sign in to comment.