Skip to content

Fix #7041: Add charseq registry to CUDA target #7057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sklam merged 16 commits into from
Nov 19, 2021
Merged

Fix #7041: Add charseq registry to CUDA target #7057

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1f40bf4
Fix #7041: Add charseq registry to CUDA target
gmarkall May 26, 2021
cf78441
Add type conversion for StringLiteral to unicode_type and test.
stuartarchibald Apr 12, 2021
b52c31e
test_const_string: add expected result for untouched value
gmarkall May 26, 2021
b246c78
Merge remote-tracking branch 'numba/master' into grm-issue-7041
gmarkall Aug 11, 2021
6f8a307
Merge remote-tracking branch 'gmarkall/grm-issue-7041' into grm-issue…
gmarkall Aug 11, 2021
db00c56
Skip const string test on NVVM 3.4
gmarkall Aug 17, 2021
cf6b26f
Don't check whether to skip test_const_string with CUDASIM
gmarkall Aug 20, 2021
3425b23
CUDA: Prevent use of CharSeq with NVVM 3.4
stuartarchibald Nov 15, 2021
c2ad8e2
Focus on CUDA toolkit version in CharSeq message
gmarkall Nov 15, 2021
a44f854
Disallow char sequences with NVVM 3.4
gmarkall Nov 18, 2021
b302af7
Merge remote-tracking branch 'numba/master' into grm-issue-7041
gmarkall Nov 18, 2021
348c019
TestConstString: test with byte strings as well
gmarkall Nov 19, 2021
1634a7f
Add note on CUDA string support to docs
gmarkall Nov 19, 2021
ffe7992
Check for character sequences in record arrays
gmarkall Nov 19, 2021
1784901
Change dtype string from bytes to unicode
gmarkall Nov 19, 2021
b493f48
Remove string type from record in test_record_dtype
gmarkall Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion numba/cuda/target.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def load_additional_registries(self):
# side effect of import needed for numba.cpython.*, the builtins
# registry is updated at import time.
from numba.cpython import numbers, tupleobj, slicing # noqa: F401
from numba.cpython import rangeobj, unicode # noqa: F401
from numba.cpython import charseq, rangeobj, unicode # noqa: F401
from numba.cpython import cmathimpl
from numba.np import arrayobj # noqa: F401
from numba.np import npdatetime # noqa: F401
Expand Down
28 changes: 26 additions & 2 deletions numba/cuda/tests/cudapy/test_const_string.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import re
from numba.cuda.testing import unittest, skip_on_cudasim
import numpy as np
from numba import cuda
from numba.cuda.testing import unittest, skip_on_cudasim, CUDATestCase
from llvmlite import ir


@skip_on_cudasim("This is testing CUDA backend code generation")
class TestCudaConstString(unittest.TestCase):
class TestConstStringCodegen(unittest.TestCase):
def test_const_string(self):
# These imports are incompatible with CUDASIM
from numba.cuda.descriptor import cuda_target
Expand Down Expand Up @@ -52,5 +54,27 @@ def test_const_string(self):
self.assertEqual(len(matches), 1)


class TestConstString(CUDATestCase):
def test_assign_const_string(self):
# Inspired by the reproducer from Issue #7041.

@cuda.jit
def str_assign(arr):
i = cuda.grid(1)
if i < len(arr):
arr[i] = "XYZ"

n_strings = 8
arr = np.zeros(n_strings + 1, dtype="<U12")
str_assign[1, n_strings](arr)

# Expected result, e.g.:
# ['XYZ' 'XYZ' 'XYZ' 'XYZ' 'XYZ' 'XYZ' 'XYZ' 'XYZ' '']
expected = np.zeros_like(arr)
expected[:-1] = 'XYZ'

Comment thread
gmarkall marked this conversation as resolved.
Resolved
np.testing.assert_equal(arr, expected)


if __name__ == '__main__':
unittest.main()