Merge branch 'master' into 'eliminate-the-dialects'
# Conflicts: # pystencils/cpu/cpujit.py
Showing
- pystencils/simp/simplifications.py 3 additions, 3 deletionspystencils/simp/simplifications.py
- pystencils/simp/simplificationstrategy.py 4 additions, 2 deletionspystencils/simp/simplificationstrategy.py
- pystencils/slicing.py 1 addition, 0 deletionspystencils/slicing.py
- pystencils/stencil.py 3 additions, 2 deletionspystencils/stencil.py
- pystencils/sympyextensions.py 7 additions, 5 deletionspystencils/sympyextensions.py
- pystencils/transformations.py 14 additions, 13 deletionspystencils/transformations.py
- pystencils/utils.py 3 additions, 3 deletionspystencils/utils.py
- pystencils_tests/benchmark/benchmark.py 6 additions, 4 deletionspystencils_tests/benchmark/benchmark.py
- pystencils_tests/benchmark/generate.py 3 additions, 4 deletionspystencils_tests/benchmark/generate.py
- pystencils_tests/test_address_of.py 3 additions, 2 deletionspystencils_tests/test_address_of.py
- pystencils_tests/test_assignment_collection.py 1 addition, 0 deletionspystencils_tests/test_assignment_collection.py
- pystencils_tests/test_assignment_from_stencil.py 2 additions, 1 deletionpystencils_tests/test_assignment_from_stencil.py
- pystencils_tests/test_blocking.py 2 additions, 2 deletionspystencils_tests/test_blocking.py
- pystencils_tests/test_blocking_staggered.py 1 addition, 0 deletionspystencils_tests/test_blocking_staggered.py
- pystencils_tests/test_boundary.py 4 additions, 3 deletionspystencils_tests/test_boundary.py
- pystencils_tests/test_buffer.py 5 additions, 4 deletionspystencils_tests/test_buffer.py
- pystencils_tests/test_buffer_gpu.py 8 additions, 5 deletionspystencils_tests/test_buffer_gpu.py
- pystencils_tests/test_conditional_vec.py 4 additions, 3 deletionspystencils_tests/test_conditional_vec.py
- pystencils_tests/test_cudagpu.py 7 additions, 6 deletionspystencils_tests/test_cudagpu.py
- pystencils_tests/test_datahandling.py 4 additions, 2 deletionspystencils_tests/test_datahandling.py
Please register or sign in to comment