From 4c058b516d14dbbd82fa9988d9cb899bfbf29a67 Mon Sep 17 00:00:00 2001
From: "Timothy A. Smith" <2timothy18@gmail.com>
Date: Mon, 4 Nov 2019 23:46:52 -0600
Subject: [PATCH 1/8] add license headers to test files

---
 test/conftest.py                      | 23 +++++++++++++++++++++++
 test/data_for_test.py                 | 20 ++++++++++++++++++++
 test/ideal_gas.py                     | 20 ++++++++++++++++++++
 test/test_eigensystem.py              | 20 ++++++++++++++++++++
 test/test_flux_derivatives.py         | 20 ++++++++++++++++++++
 test/test_weno_flux.py                | 20 ++++++++++++++++++++
 test/utilities.py                     | 20 ++++++++++++++++++++
 test/weno_reference_implementation.py | 20 ++++++++++++++++++++
 8 files changed, 163 insertions(+)

diff --git a/test/conftest.py b/test/conftest.py
index de6aa26..b06aef7 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -1,3 +1,23 @@
+# Copyright (C) 2019 Timothy A. Smith
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 import pytest
 import pyopencl as cl  # noqa: F401
 from pyopencl.tools import (
@@ -32,6 +52,9 @@ def pytest_collection_modifyitems(config, items):
 
 # {{{ pytest_generate_tests
 
+# pytest_generate_tests borrows heavily from
+# pyopencl.tools.pytest_generate_tests_for_pyopencl
+
 def pytest_generate_tests(metafunc):
     class ContextFactory:
         def __init__(self, device):
diff --git a/test/data_for_test.py b/test/data_for_test.py
index 8a8f474..fa8aff8 100644
--- a/test/data_for_test.py
+++ b/test/data_for_test.py
@@ -1,3 +1,23 @@
+# Copyright (C) 2019 Timothy A. Smith
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 import numpy as np
 import pytest
 import utilities as u
diff --git a/test/ideal_gas.py b/test/ideal_gas.py
index 12b8c00..af145a8 100644
--- a/test/ideal_gas.py
+++ b/test/ideal_gas.py
@@ -1,3 +1,23 @@
+# Copyright (C) 2019 Timothy A. Smith
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 import numpy as np
 import numpy.linalg as la  # noqa: F401
 import pyopencl as cl  # noqa: F401
diff --git a/test/test_eigensystem.py b/test/test_eigensystem.py
index 84d03bd..3139ab4 100644
--- a/test/test_eigensystem.py
+++ b/test/test_eigensystem.py
@@ -1,3 +1,23 @@
+# Copyright (C) 2019 Timothy A. Smith
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 import numpy as np
 import numpy.linalg as la  # noqa: F401
 import pyopencl as cl  # noqa: F401
diff --git a/test/test_flux_derivatives.py b/test/test_flux_derivatives.py
index 252fa52..c3a4216 100644
--- a/test/test_flux_derivatives.py
+++ b/test/test_flux_derivatives.py
@@ -1,3 +1,23 @@
+# Copyright (C) 2019 Timothy A. Smith
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 import numpy as np
 import numpy.linalg as la  # noqa: F401
 import pyopencl as cl  # noqa: F401
diff --git a/test/test_weno_flux.py b/test/test_weno_flux.py
index 4a4d682..e241c7b 100644
--- a/test/test_weno_flux.py
+++ b/test/test_weno_flux.py
@@ -1,3 +1,23 @@
+# Copyright (C) 2019 Timothy A. Smith
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 import numpy as np
 import numpy.linalg as la  # noqa: F401
 import pyopencl as cl  # noqa: F401
diff --git a/test/utilities.py b/test/utilities.py
index dbfcc25..9cdeb84 100644
--- a/test/utilities.py
+++ b/test/utilities.py
@@ -1,3 +1,23 @@
+# Copyright (C) 2019 Timothy A. Smith
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 import numpy as np
 import numpy.linalg as la  # noqa: F401
 import pyopencl as cl
diff --git a/test/weno_reference_implementation.py b/test/weno_reference_implementation.py
index b4cd3d8..966cd3d 100644
--- a/test/weno_reference_implementation.py
+++ b/test/weno_reference_implementation.py
@@ -1,3 +1,23 @@
+# Copyright (C) 2019 Timothy A. Smith
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 import numpy as np
 import numpy.linalg as la  # noqa: F401
 import pyopencl as cl  # noqa: F401
-- 
GitLab


From 056ec42dedabc5771c73f7693596468ae1fdf97d Mon Sep 17 00:00:00 2001
From: "Timothy A. Smith" <2timothy18@gmail.com>
Date: Mon, 4 Nov 2019 23:50:28 -0600
Subject: [PATCH 2/8] added license header for benchmark.py

---
 test/benchmark.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/test/benchmark.py b/test/benchmark.py
index cf49ddd..60753c8 100644
--- a/test/benchmark.py
+++ b/test/benchmark.py
@@ -1,3 +1,23 @@
+# Copyright (C) 2019 Andreas Kloeckner
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 import numpy as np  # noqa: F401
 import numpy.linalg as la  # noqa: F401
 import pyopencl as cl
-- 
GitLab


From dc2f114b12d9dfd4f328ea78d939717520cecaef Mon Sep 17 00:00:00 2001
From: "Timothy A. Smith" <2timothy18@gmail.com>
Date: Mon, 4 Nov 2019 23:51:46 -0600
Subject: [PATCH 3/8] move benchmark test to separate directory

---
 {test => benchmark}/benchmark.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {test => benchmark}/benchmark.py (100%)

diff --git a/test/benchmark.py b/benchmark/benchmark.py
similarity index 100%
rename from test/benchmark.py
rename to benchmark/benchmark.py
-- 
GitLab


From c8165a46e0d93f7708bd3557cd8b6d8d83503f2e Mon Sep 17 00:00:00 2001
From: "Timothy A. Smith" <2timothy18@gmail.com>
Date: Mon, 4 Nov 2019 23:52:51 -0600
Subject: [PATCH 4/8] remove transform_for_gpu test since the transforms are
 represented in the benchmark test

---
 test/test_flux_derivatives.py | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/test/test_flux_derivatives.py b/test/test_flux_derivatives.py
index c3a4216..9966e0d 100644
--- a/test/test_flux_derivatives.py
+++ b/test/test_flux_derivatives.py
@@ -72,22 +72,6 @@ def test_compute_flux_derivatives(ctx_factory):
             parameters=dict(ndim=3, nvars=5, nx=16, ny=16, nz=16, d=0))
 
 
-@pytest.mark.slow
-def test_compute_flux_derivatives_gpu(ctx_factory, write_code=False):
-    prg = u.get_weno_program()
-    prg = u.transform_weno_for_gpu(prg)
-
-    queue = u.get_queue(ctx_factory)
-    prg = prg.copy(target=lp.PyOpenCLTarget(queue.device))
-    prg = lp.set_options(prg, no_numpy=True)
-
-    if write_code:
-        u.write_target_device_code(prg)
-
-    lp.auto_test_vs_ref(prg, ctx_factory(), warmup_rounds=0,
-            parameters=dict(ndim=3, nvars=5, nx=16, ny=16, nz=16, d=0))
-
-
 # This lets you run 'python test.py test_case(cl._csc)' without pytest.
 if __name__ == "__main__":
     if len(sys.argv) > 1:
-- 
GitLab


From 27466c4622c35830eb67df70850d33167f970405 Mon Sep 17 00:00:00 2001
From: "Timothy A. Smith" <2timothy18@gmail.com>
Date: Mon, 4 Nov 2019 23:54:17 -0600
Subject: [PATCH 5/8] remove auto test of compute_flux_derivatives since it's
 now obsolete

---
 test/test_flux_derivatives.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/test/test_flux_derivatives.py b/test/test_flux_derivatives.py
index 9966e0d..3ae23ab 100644
--- a/test/test_flux_derivatives.py
+++ b/test/test_flux_derivatives.py
@@ -61,17 +61,6 @@ def test_compute_flux_derivatives_uniform_grid(queue, cfd_test_data_fixture):
     u.compare_arrays(flux_derivatives_dev.get(), data.flux_derivatives)
 
 
-@pytest.mark.slow
-def test_compute_flux_derivatives(ctx_factory):
-    prg = u.get_weno_program()
-
-    queue = u.get_queue(ctx_factory)
-    prg = prg.copy(target=lp.PyOpenCLTarget(queue.device))
-
-    lp.auto_test_vs_ref(prg, ctx_factory(), warmup_rounds=0,
-            parameters=dict(ndim=3, nvars=5, nx=16, ny=16, nz=16, d=0))
-
-
 # This lets you run 'python test.py test_case(cl._csc)' without pytest.
 if __name__ == "__main__":
     if len(sys.argv) > 1:
-- 
GitLab


From e5725503a8cabe0fb2e92295db92f3d43d920ea8 Mon Sep 17 00:00:00 2001
From: "Timothy A. Smith" <2timothy18@gmail.com>
Date: Tue, 5 Nov 2019 00:02:26 -0600
Subject: [PATCH 6/8] remove benchmark's dependencies on unit test suite --
 this is likely at best accidental duplication in most cases

---
 benchmark/benchmark.py | 84 ++++++++++++++++++++++++++++++++++++------
 test/utilities.py      | 29 ---------------
 2 files changed, 73 insertions(+), 40 deletions(-)

diff --git a/benchmark/benchmark.py b/benchmark/benchmark.py
index 60753c8..accb8b1 100644
--- a/benchmark/benchmark.py
+++ b/benchmark/benchmark.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 Andreas Kloeckner
+# Copyright (C) 2019 Andreas Kloeckner, Timothy A. Smith
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -29,16 +29,78 @@ import sys
 
 import logging
 
-import utilities as u
+
+_WENO_PRG = {}
+
+project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+
+def get_queue(ctx_factory):
+    return cl.CommandQueue(ctx_factory())
+
+
+def get_weno_program():
+    def parse_weno():
+        fn = os.path.join(project_root, "WENO.F90")
+
+        with open(fn, "r") as infile:
+            infile_content = infile.read()
+
+        prg = lp.parse_transformed_fortran(infile_content, filename=fn)
+        _WENO_PRG["default"] = prg
+
+
+    if not _WENO_PRG:
+        parse_weno()
+    return _WENO_PRG["default"]
+
+
+def transform_weno_for_gpu(prg, print_kernel=False):
+    knl = prg["compute_flux_derivatives"]
+
+    for suffix in ["", "_1", "_2", "_3", "_4", "_5"]:
+        knl = lp.split_iname(knl, "i"+suffix, 16,
+                outer_tag="g.0", inner_tag="l.0")
+        knl = lp.split_iname(knl, "j"+suffix, 16,
+                outer_tag="g.1", inner_tag="l.1")
+
+    knl = lp.add_barrier(knl, "tag:flux_x_compute", "tag:flux_x_diff")
+    knl = lp.add_barrier(knl, "tag:flux_x_diff", "tag:flux_y_compute")
+    knl = lp.add_barrier(knl, "tag:flux_y_compute", "tag:flux_y_diff")
+    knl = lp.add_barrier(knl, "tag:flux_y_diff", "tag:flux_z_compute")
+    knl = lp.add_barrier(knl, "tag:flux_z_compute", "tag:flux_z_diff")
+
+    prg = prg.with_kernel(knl)
+
+    if print_kernel:
+        print(prg["convert_to_generalized_frozen"])
+        1/0
+
+    return prg
+
+
+def empty_array_on_device(queue, *shape):
+    return cl.array.empty(queue, shape, dtype=np.float64, order="F")
+
+
+def random_array_on_device(queue, *shape):
+    ary = empty_array_on_device(queue, *shape)
+    cl.clrandom.fill_rand(ary)
+    return ary
+
+
+def write_target_device_code(prg, outfilename="gen-code.cl"):
+    with open(outfilename, "w") as outf:
+        outf.write(lp.generate_code_v2(prg).device_code())
 
 
 def benchmark_compute_flux_derivatives_gpu(ctx_factory, write_code=False):
     logging.basicConfig(level="INFO")
 
-    prg = u.get_weno_program()
-    prg = u.transform_weno_for_gpu(prg)
+    prg = get_weno_program()
+    prg = transform_weno_for_gpu(prg)
 
-    queue = u.get_queue(ctx_factory)
+    queue = get_queue(ctx_factory)
     prg = prg.copy(target=lp.PyOpenCLTarget(queue.device))
     prg = lp.set_options(prg, no_numpy=True)
     prg = lp.set_options(prg, ignore_boostable_into=True)
@@ -54,17 +116,17 @@ def benchmark_compute_flux_derivatives_gpu(ctx_factory, write_code=False):
     nz = n
 
     print("ARRAY GEN")
-    states = u.random_array_on_device(queue, nvars, nx+6, ny+6, nz+6)
-    fluxes = u.random_array_on_device(queue, nvars, ndim, nx+6, ny+6, nz+6)
-    metrics = u.random_array_on_device(queue, ndim, ndim, nx+6, ny+6, nz+6)
-    metric_jacobians = u.random_array_on_device(queue, nx+6, ny+6, nz+6)
+    states = random_array_on_device(queue, nvars, nx+6, ny+6, nz+6)
+    fluxes = random_array_on_device(queue, nvars, ndim, nx+6, ny+6, nz+6)
+    metrics = random_array_on_device(queue, ndim, ndim, nx+6, ny+6, nz+6)
+    metric_jacobians = random_array_on_device(queue, nx+6, ny+6, nz+6)
     print("END ARRAY GEN")
 
-    flux_derivatives_dev = u.empty_array_on_device(
+    flux_derivatives_dev = empty_array_on_device(
             queue, nvars, ndim, nx+6, ny+6, nz+6)
 
     if write_code:
-        u.write_target_device_code(prg)
+        write_target_device_code(prg)
 
     allocator = pyopencl.tools.MemoryPool(pyopencl.tools.ImmediateAllocator(queue))
 
diff --git a/test/utilities.py b/test/utilities.py
index 9cdeb84..a6885fc 100644
--- a/test/utilities.py
+++ b/test/utilities.py
@@ -148,35 +148,6 @@ def get_weno_program_with_root_kernel(knl):
         setup_weno_program_with_root_kernel(knl)
     return _WENO_PRG[knl]
 
-
-def transform_weno_for_gpu(prg, print_kernel=False):
-    knl = prg["compute_flux_derivatives"]
-
-    for suffix in ["", "_1", "_2", "_3", "_4", "_5"]:
-        knl = lp.split_iname(knl, "i"+suffix, 16,
-                outer_tag="g.0", inner_tag="l.0")
-        knl = lp.split_iname(knl, "j"+suffix, 16,
-                outer_tag="g.1", inner_tag="l.1")
-
-    knl = lp.add_barrier(knl, "tag:flux_x_compute", "tag:flux_x_diff")
-    knl = lp.add_barrier(knl, "tag:flux_x_diff", "tag:flux_y_compute")
-    knl = lp.add_barrier(knl, "tag:flux_y_compute", "tag:flux_y_diff")
-    knl = lp.add_barrier(knl, "tag:flux_y_diff", "tag:flux_z_compute")
-    knl = lp.add_barrier(knl, "tag:flux_z_compute", "tag:flux_z_diff")
-
-    prg = prg.with_kernel(knl)
-
-    if print_kernel:
-        print(prg["convert_to_generalized_frozen"])
-        1/0
-
-    return prg
-
-
-def write_target_device_code(prg, outfilename="gen-code.cl"):
-    with open(outfilename, "w") as outf:
-        outf.write(lp.generate_code_v2(prg).device_code())
-
 # }}}
 
 # vim: foldmethod=marker
-- 
GitLab


From 539d0c948cf656d9c3214f392a68f04194739098 Mon Sep 17 00:00:00 2001
From: "Timothy A. Smith" <2timothy18@gmail.com>
Date: Thu, 7 Nov 2019 19:25:50 -0600
Subject: [PATCH 7/8] adopt license header style that uses module variables

---
 benchmark/benchmark.py                | 40 ++++++++++++++-------------
 test/conftest.py                      | 40 ++++++++++++++-------------
 test/data_for_test.py                 | 40 ++++++++++++++-------------
 test/ideal_gas.py                     | 40 ++++++++++++++-------------
 test/test_eigensystem.py              | 40 ++++++++++++++-------------
 test/test_flux_derivatives.py         | 40 ++++++++++++++-------------
 test/test_weno_flux.py                | 40 ++++++++++++++-------------
 test/utilities.py                     | 40 ++++++++++++++-------------
 test/weno_reference_implementation.py | 40 ++++++++++++++-------------
 9 files changed, 189 insertions(+), 171 deletions(-)

diff --git a/benchmark/benchmark.py b/benchmark/benchmark.py
index accb8b1..935b717 100644
--- a/benchmark/benchmark.py
+++ b/benchmark/benchmark.py
@@ -1,22 +1,24 @@
-# Copyright (C) 2019 Andreas Kloeckner, Timothy A. Smith
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+__copyright__ = "Copyright (C) 2019 Andreas Kloeckner, Timothy A. Smith"
+
+__license__ = """
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+"""
 
 import numpy as np  # noqa: F401
 import numpy.linalg as la  # noqa: F401
diff --git a/test/conftest.py b/test/conftest.py
index b06aef7..116f579 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -1,22 +1,24 @@
-# Copyright (C) 2019 Timothy A. Smith
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+__copyright__ = "Copyright (C) 2019 Timothy A. Smith"
+
+__license__ = """
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+"""
 
 import pytest
 import pyopencl as cl  # noqa: F401
diff --git a/test/data_for_test.py b/test/data_for_test.py
index fa8aff8..3bba73d 100644
--- a/test/data_for_test.py
+++ b/test/data_for_test.py
@@ -1,22 +1,24 @@
-# Copyright (C) 2019 Timothy A. Smith
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+__copyright__ = "Copyright (C) 2019 Timothy A. Smith"
+
+__license__ = """
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+"""
 
 import numpy as np
 import pytest
diff --git a/test/ideal_gas.py b/test/ideal_gas.py
index af145a8..a062acb 100644
--- a/test/ideal_gas.py
+++ b/test/ideal_gas.py
@@ -1,22 +1,24 @@
-# Copyright (C) 2019 Timothy A. Smith
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+__copyright__ = "Copyright (C) 2019 Timothy A. Smith"
+
+__license__ = """
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+"""
 
 import numpy as np
 import numpy.linalg as la  # noqa: F401
diff --git a/test/test_eigensystem.py b/test/test_eigensystem.py
index 3139ab4..bc7df0a 100644
--- a/test/test_eigensystem.py
+++ b/test/test_eigensystem.py
@@ -1,22 +1,24 @@
-# Copyright (C) 2019 Timothy A. Smith
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+__copyright__ = "Copyright (C) 2019 Timothy A. Smith"
+
+__license__ = """
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+"""
 
 import numpy as np
 import numpy.linalg as la  # noqa: F401
diff --git a/test/test_flux_derivatives.py b/test/test_flux_derivatives.py
index 3ae23ab..33b8430 100644
--- a/test/test_flux_derivatives.py
+++ b/test/test_flux_derivatives.py
@@ -1,22 +1,24 @@
-# Copyright (C) 2019 Timothy A. Smith
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+__copyright__ = "Copyright (C) 2019 Timothy A. Smith"
+
+__license__ = """
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+"""
 
 import numpy as np
 import numpy.linalg as la  # noqa: F401
diff --git a/test/test_weno_flux.py b/test/test_weno_flux.py
index e241c7b..40f9b2f 100644
--- a/test/test_weno_flux.py
+++ b/test/test_weno_flux.py
@@ -1,22 +1,24 @@
-# Copyright (C) 2019 Timothy A. Smith
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+__copyright__ = "Copyright (C) 2019 Timothy A. Smith"
+
+__license__ = """
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+"""
 
 import numpy as np
 import numpy.linalg as la  # noqa: F401
diff --git a/test/utilities.py b/test/utilities.py
index a6885fc..f69fb0f 100644
--- a/test/utilities.py
+++ b/test/utilities.py
@@ -1,22 +1,24 @@
-# Copyright (C) 2019 Timothy A. Smith
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+__copyright__ = "Copyright (C) 2019 Timothy A. Smith"
+
+__license__ = """
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+"""
 
 import numpy as np
 import numpy.linalg as la  # noqa: F401
diff --git a/test/weno_reference_implementation.py b/test/weno_reference_implementation.py
index 966cd3d..bd4f7bc 100644
--- a/test/weno_reference_implementation.py
+++ b/test/weno_reference_implementation.py
@@ -1,22 +1,24 @@
-# Copyright (C) 2019 Timothy A. Smith
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+__copyright__ = "Copyright (C) 2019 Timothy A. Smith"
+
+__license__ = """
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+"""
 
 import numpy as np
 import numpy.linalg as la  # noqa: F401
-- 
GitLab


From f831853ae2a38774d12e0b59e50cd58e5b4f7996 Mon Sep 17 00:00:00 2001
From: "Timothy A. Smith" <2timothy18@gmail.com>
Date: Thu, 7 Nov 2019 19:33:36 -0600
Subject: [PATCH 8/8] update copyright for conftest.py

---
 test/conftest.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/conftest.py b/test/conftest.py
index 116f579..32cf14b 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -1,4 +1,7 @@
-__copyright__ = "Copyright (C) 2019 Timothy A. Smith"
+__copyright__ = """
+Copyright (C) 2010-2019 Timothy A. Smith, Andreas Kloeckner,
+Holger Krekel and pytest-dev team
+"""
 
 __license__ = """
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -31,9 +34,9 @@ import utilities as u
 
 # {{{ mark for slow tests
 
-# setup to mark slow tests with @pytest.mark.slow, so that they don't run by
+# Setup to mark slow tests with @pytest.mark.slow, so that they don't run by
 # default, but can be forced to run with the command-line option --runslow
-# taken from
+# Taken from
 # https://docs.pytest.org/en/latest/example/simple.html#control-skipping-of-tests-according-to-command-line-option
 
 def pytest_addoption(parser):
-- 
GitLab