Separated modules into subfolders with own setup.py

This restructuring allows for easier separation of modules into separate repositories later. Also, now pip install with repo url can be used. The setup.py files have also been updated to correctly reference each other. Module versions are not extracted from git state

Separated modules into subfolders with own setup.py
This restructuring allows for easier separation of modules into separate repositories later. Also, now pip install with repo url can be used. The setup.py files have also been updated to correctly reference each other. Module versions are not extracted from git state
1e02cdc7 · Martin Bauer · b91e6990 · 1e02cdc7 · 1e02cdc7 · 1e02cdc7
Commit 1e02cdc7 authored Mar 20, 2019 by Martin Bauer
--- a/COPYING.txt
+++ b/COPYING.txt
--- a/MANIFEST.in
+++ b/MANIFEST.in
+include README.md
+include COPYING.txt
--- a/README.md
+++ b/README.md
+pystencils
+==========
+
+
+![alt text](doc/img/logo.png)
+
--- a/assignment_collection/nestedscopes.py
+++ b/assignment_collection/nestedscopes.py
-class NestedScopes:
-    """Symbol visibility model using nested scopes
-
-    - every accessed symbol that was not defined before, is added as a "free parameter"
-    - free parameters are global, i.e. they are not in scopes
-    - push/pop adds or removes a scope
-
-    >>> s = NestedScopes()
-    >>> s.access_symbol("a")
-    >>> s.is_defined("a")
-    False
-    >>> s.free_parameters
-    {'a'}
-    >>> s.define_symbol("b")
-    >>> s.is_defined("b")
-    True
-    >>> s.push()
-    >>> s.is_defined_locally("b")
-    False
-    >>> s.define_symbol("c")
-    >>> s.pop()
-    >>> s.is_defined("c")
-    False
-    """
-
-    def __init__(self):
-        self.free_parameters = set()
-        self._defined = [set()]
-
-    def access_symbol(self, symbol):
-        if not self.is_defined(symbol):
-            self.free_parameters.add(symbol)
-
-    def define_symbol(self, symbol):
-        self._defined[-1].add(symbol)
-
-    def is_defined(self, symbol):
-        return any(symbol in scopes for scopes in self._defined)
-
-    def is_defined_locally(self, symbol):
-        return symbol in self._defined[-1]
-
-    def push(self):
-        self._defined.append(set())
-
-    def pop(self):
-        self._defined.pop()
-        assert self.depth >= 1
-
-    @property
-    def depth(self):
-        return len(self._defined)
--- a/doc/conf.py
+++ b/doc/conf.py
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+import os
+import sys
+
+sys.path.insert(0, os.path.abspath('..'))
+sys.path.insert(0, os.path.abspath('../..'))
+from sphinx_doc_conf import *
+
+project = 'pystencils'
+html_logo = "img/logo.png"
--- a/doc/img/c_backend.svg
+++ b/doc/img/c_backend.svg
--- a/doc/img/logo.png
+++ b/doc/img/logo.png
--- a/doc/img/logo.svg
+++ b/doc/img/logo.svg
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="53.913792mm"
+   height="53.913792mm"
+   viewBox="0 0 191.03312 191.03312"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="logo.svg"
+   inkscape:export-filename="/local/bauer/code/lbmpy/pystencils/doc/img/logo.png"
+   inkscape:export-xdpi="350"
+   inkscape:export-ydpi="350">
+  <defs
+     id="defs4">
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect4188"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect4188-5"
+       is_visible="true" />
+    <filter
+       y="-0.25"
+       height="1.5"
+       inkscape:menu-tooltip="Darkens the edge with an inner blur and adds a flexible glow"
+       inkscape:menu="Shadows and Glows"
+       inkscape:label="Dark And Glow"
+       style="color-interpolation-filters:sRGB"
+       id="filter4596">
+      <feGaussianBlur
+         stdDeviation="5"
+         result="result6"
+         id="feGaussianBlur4598" />
+      <feComposite
+         result="result8"
+         in="SourceGraphic"
+         operator="atop"
+         in2="result6"
+         id="feComposite4600" />
+      <feComposite
+         result="result9"
+         operator="over"
+         in2="SourceAlpha"
+         in="result8"
+         id="feComposite4602" />
+      <feColorMatrix
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 "
+         result="result10"
+         id="feColorMatrix4604" />
+      <feBlend
+         in="result10"
+         mode="normal"
+         in2="result6"
+         id="feBlend4606" />
+    </filter>
+    <filter
+       y="-0.25"
+       height="1.5"
+       inkscape:menu-tooltip="Darkens the edge with an inner blur and adds a flexible glow"
+       inkscape:menu="Shadows and Glows"
+       inkscape:label="Dark And Glow"
+       style="color-interpolation-filters:sRGB"
+       id="filter4608">
+      <feGaussianBlur
+         stdDeviation="5"
+         result="result6"
+         id="feGaussianBlur4610" />
+      <feComposite
+         result="result8"
+         in="SourceGraphic"
+         operator="atop"
+         in2="result6"
+         id="feComposite4612" />
+      <feComposite
+         result="result9"
+         operator="over"
+         in2="SourceAlpha"
+         in="result8"
+         id="feComposite4614" />
+      <feColorMatrix
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 "
+         result="result10"
+         id="feColorMatrix4616" />
+      <feBlend
+         in="result10"
+         mode="normal"
+         in2="result6"
+         id="feBlend4618" />
+    </filter>
+    <filter
+       y="-0.25"
+       height="1.5"
+       inkscape:menu-tooltip="Darkens the edge with an inner blur and adds a flexible glow"
+       inkscape:menu="Shadows and Glows"
+       inkscape:label="Dark And Glow"
+       style="color-interpolation-filters:sRGB"
+       id="filter4620">
+      <feGaussianBlur
+         stdDeviation="5"
+         result="result6"
+         id="feGaussianBlur4622" />
+      <feComposite
+         result="result8"
+         in="SourceGraphic"
+         operator="atop"
+         in2="result6"
+         id="feComposite4624" />
+      <feComposite
+         result="result9"
+         operator="over"
+         in2="SourceAlpha"
+         in="result8"
+         id="feComposite4626" />
+      <feColorMatrix
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 "
+         result="result10"
+         id="feColorMatrix4628" />
+      <feBlend
+         in="result10"
+         mode="normal"
+         in2="result6"
+         id="feBlend4630" />
+    </filter>
+    <filter
+       y="-0.25"
+       height="1.5"
+       inkscape:menu-tooltip="Darkens the edge with an inner blur and adds a flexible glow"
+       inkscape:menu="Shadows and Glows"
+       inkscape:label="Dark And Glow"
+       style="color-interpolation-filters:sRGB"
+       id="filter4632">
+      <feGaussianBlur
+         stdDeviation="5"
+         result="result6"
+         id="feGaussianBlur4634" />
+      <feComposite
+         result="result8"
+         in="SourceGraphic"
+         operator="atop"
+         in2="result6"
+         id="feComposite4636" />
+      <feComposite
+         result="result9"
+         operator="over"
+         in2="SourceAlpha"
+         in="result8"
+         id="feComposite4638" />
+      <feColorMatrix
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 "
+         result="result10"
+         id="feColorMatrix4640" />
+      <feBlend
+         in="result10"
+         mode="normal"
+         in2="result6"
+         id="feBlend4642" />
+    </filter>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect4188-7"
+       is_visible="true" />
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect4188-5-6"
+       is_visible="true" />
+    <filter
+       y="-0.25"
+       height="1.5"
+       inkscape:menu-tooltip="Darkens the edge with an inner blur and adds a flexible glow"
+       inkscape:menu="Shadows and Glows"
+       inkscape:label="Dark And Glow"
+       style="color-interpolation-filters:sRGB"
+       id="filter4596-6">
+      <feGaussianBlur
+         stdDeviation="5"
+         result="result6"
+         id="feGaussianBlur4598-6" />
+      <feComposite
+         result="result8"
+         in="SourceGraphic"
+         operator="atop"
+         in2="result6"
+         id="feComposite4600-9" />
+      <feComposite
+         result="result9"
+         operator="over"
+         in2="SourceAlpha"
+         in="result8"
+         id="feComposite4602-1" />
+      <feColorMatrix
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 "
+         result="result10"
+         id="feColorMatrix4604-4" />
+      <feBlend
+         in="result10"
+         mode="normal"
+         in2="result6"
+         id="feBlend4606-3" />
+    </filter>
+    <filter
+       y="-0.25"
+       height="1.5"
+       inkscape:menu-tooltip="Darkens the edge with an inner blur and adds a flexible glow"
+       inkscape:menu="Shadows and Glows"
+       inkscape:label="Dark And Glow"
+       style="color-interpolation-filters:sRGB"
+       id="filter4620-1">
+      <feGaussianBlur
+         stdDeviation="5"
+         result="result6"
+         id="feGaussianBlur4622-1" />
+      <feComposite
+         result="result8"
+         in="SourceGraphic"
+         operator="atop"
+         in2="result6"
+         id="feComposite4624-4" />
+      <feComposite
+         result="result9"
+         operator="over"
+         in2="SourceAlpha"
+         in="result8"
+         id="feComposite4626-8" />
+      <feColorMatrix
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 "
+         result="result10"
+         id="feColorMatrix4628-5" />
+      <feBlend
+         in="result10"
+         mode="normal"
+         in2="result6"
+         id="feBlend4630-7" />
+    </filter>
+    <filter
+       y="-0.25"
+       height="1.5"
+       inkscape:menu-tooltip="Darkens the edge with an inner blur and adds a flexible glow"
+       inkscape:menu="Shadows and Glows"
+       inkscape:label="Dark And Glow"
+       style="color-interpolation-filters:sRGB"
+       id="filter4632-1">
+      <feGaussianBlur
+         stdDeviation="5"
+         result="result6"
+         id="feGaussianBlur4634-9" />
+      <feComposite
+         result="result8"
+         in="SourceGraphic"
+         operator="atop"
+         in2="result6"
+         id="feComposite4636-8" />
+      <feComposite
+         result="result9"
+         operator="over"
+         in2="SourceAlpha"
+         in="result8"
+         id="feComposite4638-7" />
+      <feColorMatrix
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 "
+         result="result10"
+         id="feColorMatrix4640-6" />
+      <feBlend
+         in="result10"
+         mode="normal"
+         in2="result6"
+         id="feBlend4642-5" />
+    </filter>
+    <filter
+       y="-0.25"
+       height="1.5"
+       inkscape:menu-tooltip="Darkens the edge with an inner blur and adds a flexible glow"
+       inkscape:menu="Shadows and Glows"
+       inkscape:label="Dark And Glow"
+       style="color-interpolation-filters:sRGB"
+       id="filter4608-0">
+      <feGaussianBlur
+         stdDeviation="5"
+         result="result6"
+         id="feGaussianBlur4610-2" />
+      <feComposite
+         result="result8"
+         in="SourceGraphic"
+         operator="atop"
+         in2="result6"
+         id="feComposite4612-5" />
+      <feComposite
+         result="result9"
+         operator="over"
+         in2="SourceAlpha"
+         in="result8"
+         id="feComposite4614-7" />
+      <feColorMatrix
+         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0 "
+         result="result10"
+         id="feColorMatrix4616-6" />
+      <feBlend
+         in="result10"
+         mode="normal"
+         in2="result6"
+         id="feBlend4618-9" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.979899"
+     inkscape:cx="-48.443059"
+     inkscape:cy="134.59857"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1447"
+     inkscape:window-height="1154"
+     inkscape:window-x="2586"
+     inkscape:window-y="191"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4176"
+       originx="-375.0827"
+       originy="-543.01469" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-375.08269,-318.31438)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#d2d2d2;stroke-width:1.80409861;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect1396-1"
+       width="189.22902"
+       height="189.22902"
+       x="375.98474"
+       y="319.21643"
+       ry="10.417198"
+       inkscape:export-xdpi="70.669998"
+       inkscape:export-ydpi="70.669998" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.49999952px;line-height:125%;font-family:'Latin Modern Mono Light';-inkscape-font-specification:'Latin Modern Mono Light, ';letter-spacing:0px;word-spacing:0px;fill:#252525;fill-opacity:1;stroke:none;stroke-width:0.93749994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="382.84055"
+       y="485.91989"
+       id="text1392-1"
+       inkscape:export-xdpi="70.669998"
+       inkscape:export-ydpi="70.669998"><tspan
+         sodipodi:role="line"
+         id="tspan1390-1"
+         x="382.84055"
+         y="485.91989"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:33.75000381px;font-family:'Latin Modern Mono Light';-inkscape-font-specification:'Latin Modern Mono Light, Bold';fill:#252525;fill-opacity:1;stroke-width:0.93749994px">pystencils</tspan></text>
+    <g
+       id="g9986"
+       transform="matrix(1.7743145,0,0,1.7743145,311.73549,345.04841)"
+       inkscape:export-xdpi="70.669998"
+       inkscape:export-ydpi="70.669998">
+      <path
+         inkscape:connector-curvature="0"
+         inkscape:original-d="M 60.891002,27.333516 H 118.64865"
+         inkscape:path-effect="#path-effect4188-7"
+         id="path4186-6"
+         d="M 60.891002,27.333516 H 118.64865"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.78799796;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.70388345" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         inkscape:original-d="M 89.922623,-0.47572315 C 31.237244,132.88729 89.846228,36.88339 89.846228,56.13594"
+         inkscape:path-effect="#path-effect4188-5-6"
+         id="path4186-3-9"
+         d="M 89.922623,-0.47572315 89.846228,56.13594"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.78799796;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.70388345" />
+      <circle
+         transform="matrix(0.21391721,0,0,0.21391721,27.733834,-23.442344)"
+         r="34.345188"
+         cy="108.02044"
+         cx="291.42902"
+         id="path4136-76"
+         style="opacity:1;fill:#e69f00;fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4596-6)" />
+      <circle
+         transform="matrix(0.21391721,0,0,0.21391721,27.733834,-23.442344)"
+         r="34.345188"
+         cy="365.43817"
+         cx="290.41885"
+         id="path4136-6-0"
+         style="opacity:1;fill:#0072b2;fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4620-1)" />
+      <circle
+         transform="matrix(0.21391721,0,0,0.21391721,27.733834,-23.442344)"
+         r="34.345188"
+         cy="236.72931"
+         cx="422.24377"
+         id="path4136-3-9"
+         style="opacity:1;fill:#999999;fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4632-1)" />
+      <circle
+         transform="matrix(0.21391721,0,0,0.21391721,27.733834,-23.442344)"
+         r="34.345188"
+         cy="236.72931"
+         cx="155.56349"
+         id="path4136-7-0"
+         style="opacity:1;fill:#009e73;fill-opacity:1;stroke:none;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4608-0)" />
+    </g>
+  </g>
+</svg>
--- a/doc/img/pystencils_arch_block_diagram.svg
+++ b/doc/img/pystencils_arch_block_diagram.svg
--- a/doc/img/pystencils_stencil_four_points_with_arrows.svg
+++ b/doc/img/pystencils_stencil_four_points_with_arrows.svg
--- a/doc/img/staggered_grid.svg
+++ b/doc/img/staggered_grid.svg
--- a/doc/img/walberla_blocks.svg
+++ b/doc/img/walberla_blocks.svg
--- a/doc/index.rst
+++ b/doc/index.rst
+pystencils
+==========
+
+Welcome to the documentation of the pystencils code generation tool for stencil codes.
+pystencils can help you to generate blazingly fast code for image processing, numerical simulations or any other task involving numpy arrays.
+
+
+.. toctree::
+   :maxdepth: 2
+
+   sphinx/tutorials.rst
+   sphinx/api.rst
+
+
+.. image:: /img/pystencils_arch_block_diagram.svg
+    :height: 450px
+
+
--- a/doc/notebooks/01_tutorial_getting_started.ipynb
+++ b/doc/notebooks/01_tutorial_getting_started.ipynb
--- a/doc/notebooks/02_tutorial_basic_kernels.ipynb
+++ b/doc/notebooks/02_tutorial_basic_kernels.ipynb
--- a/doc/notebooks/03_tutorial_advection_diffusion.ipynb
+++ b/doc/notebooks/03_tutorial_advection_diffusion.ipynb
--- a/doc/notebooks/04_tutorial_phasefield_spinodal_decomposition.ipynb
+++ b/doc/notebooks/04_tutorial_phasefield_spinodal_decomposition.ipynb
--- a/doc/notebooks/05_tutorial_phasefield_dentritic_growth.ipynb
+++ b/doc/notebooks/05_tutorial_phasefield_dentritic_growth.ipynb
--- a/doc/notebooks/06_tutorial_datahandling.ipynb
+++ b/doc/notebooks/06_tutorial_datahandling.ipynb
--- a/doc/notebooks/demo_assignment_collection.ipynb
+++ b/doc/notebooks/demo_assignment_collection.ipynb