File tree Expand file tree Collapse file tree 2 files changed +13
-3
lines changed Expand file tree Collapse file tree 2 files changed +13
-3
lines changed Original file line number Diff line number Diff line change @@ -390,7 +390,19 @@ def conj(self):
390
390
else :
391
391
return dpnp .conjugate (self )
392
392
393
- # 'conjugate',
393
+ def conjugate (self ):
394
+ """
395
+ Return the complex conjugate, element-wise.
396
+
397
+ For full documentation refer to :obj:`numpy.ndarray.conjugate`.
398
+
399
+ """
400
+
401
+ if not numpy .issubsctype (self .dtype , numpy .complex ):
402
+ return self
403
+ else :
404
+ return dpnp .conjugate (self )
405
+
394
406
# 'copy',
395
407
# 'ctypes',
396
408
# 'cumprod',
Original file line number Diff line number Diff line change @@ -385,8 +385,6 @@ tests/third_party/cupy/core_tests/test_ndarray_complex_ops.py::TestRealImag::tes
385
385
tests/third_party/cupy/core_tests/test_ndarray_complex_ops.py::TestRealImag::test_real_setter_zero_dim
386
386
tests/third_party/cupy/core_tests/test_ndarray_complex_ops.py::TestRealImag::test_real_zero_dim
387
387
tests/third_party/cupy/core_tests/test_ndarray_complex_ops.py::TestScalarConversion::test_scalar_conversion
388
- tests/third_party/cupy/core_tests/test_ndarray_complex_ops.py::TestConj::test_conjugate
389
- tests/third_party/cupy/core_tests/test_ndarray_complex_ops.py::TestConj::test_conjugate_pass
390
388
tests/third_party/cupy/core_tests/test_ndarray_copy_and_view.py::TestArrayCopyAndView::test_astype
391
389
tests/third_party/cupy/core_tests/test_ndarray_copy_and_view.py::TestArrayCopyAndView::test_astype_type
392
390
tests/third_party/cupy/core_tests/test_ndarray_copy_and_view.py::TestArrayCopyAndView::test_astype_strides
You can’t perform that action at this time.
0 commit comments