Merge branch 'master' into 'eliminate-the-dialects'
# Conflicts: # pystencils/cpu/cpujit.py
Showing
- pystencils/integer_functions.py 1 addition, 1 deletionpystencils/integer_functions.py
- pystencils/integer_set_analysis.py 1 addition, 1 deletionpystencils/integer_set_analysis.py
- pystencils/jupyter.py 6 additions, 4 deletionspystencils/jupyter.py
- pystencils/kerncraft_coupling/__init__.py 1 addition, 1 deletionpystencils/kerncraft_coupling/__init__.py
- pystencils/kerncraft_coupling/generate_benchmark.py 7 additions, 5 deletionspystencils/kerncraft_coupling/generate_benchmark.py
- pystencils/kerncraft_coupling/kerncraft_interface.py 7 additions, 6 deletionspystencils/kerncraft_coupling/kerncraft_interface.py
- pystencils/kernel_decorator.py 4 additions, 2 deletionspystencils/kernel_decorator.py
- pystencils/kernelcreation.py 7 additions, 5 deletionspystencils/kernelcreation.py
- pystencils/kernelparameters.py 3 additions, 1 deletionpystencils/kernelparameters.py
- pystencils/llvm/kernelcreation.py 17 additions, 16 deletionspystencils/llvm/kernelcreation.py
- pystencils/llvm/llvm.py 8 additions, 5 deletionspystencils/llvm/llvm.py
- pystencils/llvm/llvmjit.py 7 additions, 4 deletionspystencils/llvm/llvmjit.py
- pystencils/placeholder_function.py 3 additions, 1 deletionpystencils/placeholder_function.py
- pystencils/plot.py 2 additions, 1 deletionpystencils/plot.py
- pystencils/rng.py 2 additions, 1 deletionpystencils/rng.py
- pystencils/runhelper/db.py 4 additions, 2 deletionspystencils/runhelper/db.py
- pystencils/runhelper/parameterstudy.py 5 additions, 5 deletionspystencils/runhelper/parameterstudy.py
- pystencils/session.py 4 additions, 4 deletionspystencils/session.py
- pystencils/simp/__init__.py 5 additions, 3 deletionspystencils/simp/__init__.py
- pystencils/simp/assignment_collection.py 5 additions, 3 deletionspystencils/simp/assignment_collection.py
Please register or sign in to comment