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
ff05f9d8
Commit
ff05f9d8
authored
4 years ago
by
Markus Holzer
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into 'master'
Fixes for Vector Testcase to Work See merge request
!200
parents
e20f82a3
40af81fe
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!200
Fixes for Vector Testcase to Work
Pipeline
#28821
failed
4 years ago
Stage: test
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pystencils/kerncraft_coupling/kerncraft_interface.py
+2
-1
2 additions, 1 deletion
pystencils/kerncraft_coupling/kerncraft_interface.py
pystencils/sympyextensions.py
+3
-1
3 additions, 1 deletion
pystencils/sympyextensions.py
with
5 additions
and
2 deletions
pystencils/kerncraft_coupling/kerncraft_interface.py
+
2
−
1
View file @
ff05f9d8
...
@@ -342,7 +342,7 @@ class PyStencilsKerncraftKernel(KernelCode):
...
@@ -342,7 +342,7 @@ class PyStencilsKerncraftKernel(KernelCode):
class
KerncraftParameters
(
DotDict
):
class
KerncraftParameters
(
DotDict
):
def
__init__
(
self
,
**
kwargs
):
def
__init__
(
self
,
**
kwargs
):
super
(
KerncraftParameters
,
self
).
__init__
(
**
kwargs
)
super
(
KerncraftParameters
,
self
).
__init__
()
self
[
'
asm_block
'
]
=
'
auto
'
self
[
'
asm_block
'
]
=
'
auto
'
self
[
'
asm_increment
'
]
=
0
self
[
'
asm_increment
'
]
=
0
self
[
'
cores
'
]
=
1
self
[
'
cores
'
]
=
1
...
@@ -353,6 +353,7 @@ class KerncraftParameters(DotDict):
...
@@ -353,6 +353,7 @@ class KerncraftParameters(DotDict):
self
[
'
unit
'
]
=
'
cy/CL
'
self
[
'
unit
'
]
=
'
cy/CL
'
self
[
'
ignore_warnings
'
]
=
True
self
[
'
ignore_warnings
'
]
=
True
self
[
'
incore_model
'
]
=
'
OSACA
'
self
[
'
incore_model
'
]
=
'
OSACA
'
self
.
update
(
**
kwargs
)
# ------------------------------------------- Helper functions ---------------------------------------------------------
# ------------------------------------------- Helper functions ---------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
pystencils/sympyextensions.py
+
3
−
1
View file @
ff05f9d8
...
@@ -10,7 +10,7 @@ from sympy.functions import Abs
...
@@ -10,7 +10,7 @@ from sympy.functions import Abs
from
sympy.core.numbers
import
Zero
from
sympy.core.numbers
import
Zero
from
pystencils.assignment
import
Assignment
from
pystencils.assignment
import
Assignment
from
pystencils.data_types
import
cast_func
,
get_type_of_expression
,
PointerType
from
pystencils.data_types
import
cast_func
,
get_type_of_expression
,
PointerType
,
VectorType
from
pystencils.kernelparameters
import
FieldPointerSymbol
from
pystencils.kernelparameters
import
FieldPointerSymbol
T
=
TypeVar
(
'
T
'
)
T
=
TypeVar
(
'
T
'
)
...
@@ -465,6 +465,8 @@ def count_operations(term: Union[sp.Expr, List[sp.Expr]],
...
@@ -465,6 +465,8 @@ def count_operations(term: Union[sp.Expr, List[sp.Expr]],
base_type
=
get_type_of_expression
(
e
)
base_type
=
get_type_of_expression
(
e
)
except
ValueError
:
except
ValueError
:
return
False
return
False
if
isinstance
(
base_type
,
VectorType
):
return
False
if
isinstance
(
base_type
,
PointerType
):
if
isinstance
(
base_type
,
PointerType
):
return
only_type
==
'
int
'
return
only_type
==
'
int
'
if
only_type
==
'
int
'
and
(
base_type
.
is_int
()
or
base_type
.
is_uint
()):
if
only_type
==
'
int
'
and
(
base_type
.
is_int
()
or
base_type
.
is_uint
()):
...
...
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