Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
pystencils
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pycodegen
pystencils
Commits
a52c20a4
Commit
a52c20a4
authored
2 months ago
by
Frederik Hennig
Browse files
Options
Downloads
Patches
Plain Diff
pad work items tuple with ones in linear3d for rank < 3
parent
8518fe80
No related branches found
No related tags found
1 merge request
!457
Fix Linear3D Indexing if Iteration Space Rank < 3
Pipeline
#75682
failed
2 months ago
Stage: Code Quality
Stage: Unit Tests
Stage: legacy_test
Stage: docs
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/pystencils/codegen/gpu_indexing.py
+5
-0
5 additions, 0 deletions
src/pystencils/codegen/gpu_indexing.py
tests/kernelcreation/test_gpu.py
+47
-1
47 additions, 1 deletion
tests/kernelcreation/test_gpu.py
with
52 additions
and
1 deletion
src/pystencils/codegen/gpu_indexing.py
+
5
−
0
View file @
a52c20a4
...
...
@@ -267,6 +267,11 @@ class GpuIndexing:
f
"
for a
{
rank
}
-dimensional kernel.
"
)
work_items_expr
+=
tuple
(
self
.
_ast_factory
.
parse_index
(
1
)
for
_
in
range
(
3
-
rank
)
)
num_work_items
=
cast
(
_Dim3Lambda
,
tuple
(
self
.
_kernel_factory
.
create_lambda
(
wit
)
for
wit
in
work_items_expr
),
...
...
This diff is collapsed.
Click to expand it.
tests/kernelcreation/test_gpu.py
+
47
−
1
View file @
a52c20a4
...
...
@@ -31,7 +31,7 @@ except ImportError:
@pytest.mark.parametrize
(
"
indexing_scheme
"
,
[
"
linear3d
"
,
"
blockwise4d
"
])
@pytest.mark.parametrize
(
"
omit_range_check
"
,
[
False
,
True
])
@pytest.mark.parametrize
(
"
manual_grid
"
,
[
False
,
True
])
def
test_indexing_options
(
def
test_indexing_options
_3d
(
indexing_scheme
:
str
,
omit_range_check
:
bool
,
manual_grid
:
bool
):
src
,
dst
=
fields
(
"
src, dst: [3D]
"
)
...
...
@@ -76,6 +76,52 @@ def test_indexing_options(
cp
.
testing
.
assert_allclose
(
dst_arr
,
expected
)
@pytest.mark.parametrize
(
"
indexing_scheme
"
,
[
"
linear3d
"
,
"
blockwise4d
"
])
@pytest.mark.parametrize
(
"
omit_range_check
"
,
[
False
,
True
])
@pytest.mark.parametrize
(
"
manual_grid
"
,
[
False
,
True
])
def
test_indexing_options_2d
(
indexing_scheme
:
str
,
omit_range_check
:
bool
,
manual_grid
:
bool
):
src
,
dst
=
fields
(
"
src, dst: [2D]
"
)
asm
=
Assignment
(
dst
.
center
(),
src
[
-
1
,
0
]
+
src
[
1
,
0
]
+
src
[
0
,
-
1
]
+
src
[
0
,
1
]
)
cfg
=
CreateKernelConfig
(
target
=
Target
.
CUDA
)
cfg
.
gpu
.
indexing_scheme
=
indexing_scheme
cfg
.
gpu
.
omit_range_check
=
omit_range_check
cfg
.
gpu
.
manual_launch_grid
=
manual_grid
ast
=
create_kernel
(
asm
,
cfg
)
kernel
=
ast
.
compile
()
src_arr
=
cp
.
ones
((
18
,
34
))
dst_arr
=
cp
.
zeros_like
(
src_arr
)
if
manual_grid
:
match
indexing_scheme
:
case
"
linear3d
"
:
kernel
.
launch_config
.
block_size
=
(
10
,
8
,
1
)
kernel
.
launch_config
.
grid_size
=
(
4
,
4
,
1
)
case
"
blockwise4d
"
:
kernel
.
launch_config
.
block_size
=
(
40
,
1
,
1
)
kernel
.
launch_config
.
grid_size
=
(
32
,
1
,
1
)
elif
indexing_scheme
==
"
linear3d
"
:
kernel
.
launch_config
.
block_size
=
(
10
,
8
,
1
)
kernel
(
src
=
src_arr
,
dst
=
dst_arr
)
expected
=
cp
.
zeros_like
(
src_arr
)
expected
[
1
:
-
1
,
1
:
-
1
].
fill
(
4.0
)
cp
.
testing
.
assert_allclose
(
dst_arr
,
expected
)
def
test_invalid_indexing_schemes
():
src
,
dst
=
fields
(
"
src, dst: [4D]
"
)
asm
=
Assignment
(
src
.
center
(
0
),
dst
.
center
(
0
))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment