diff --git a/test/test_apps.py b/test/test_apps.py index 862b3946324051e39f6b9f170bb23ea65b06a4f4..bf86148aac409d2b14261cfdedfffc63b2c51fbf 100644 --- a/test/test_apps.py +++ b/test/test_apps.py @@ -21,39 +21,23 @@ THE SOFTWARE. """ import logging -import sys import numpy as np import pytest -import pyopencl as cl +import pyopencl as cl # noqa: F401 import pyopencl.clmath -import pyopencl.clrandom # noqa +import pyopencl.clrandom # noqa: F401 +from pyopencl.tools import ( # noqa: F401 + pytest_generate_tests_for_pyopencl as pytest_generate_tests, +) import loopy as lp - - -logger = logging.getLogger(__name__) - -try: - import faulthandler -except ImportError: - pass -else: - faulthandler.enable() - -from pyopencl.tools import pytest_generate_tests_for_pyopencl as pytest_generate_tests - from loopy.diagnostic import LoopyError +from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa: F401 -__all__ = [ - "cl", # "cl.create_some_context" - "pytest_generate_tests" -] - - -from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa: F401 +logger = logging.getLogger(__name__) # {{{ convolutions @@ -750,6 +734,7 @@ def test_sumpy_p2p_reduced(): if __name__ == "__main__": + import sys if len(sys.argv) > 1: exec(sys.argv[1]) else: diff --git a/test/test_c_execution.py b/test/test_c_execution.py index 699c8f16a8dcbbe393efcdd438f6233b119c3470..adcd8e407e6fe767db8cb54f84bae354de16d21d 100644 --- a/test/test_c_execution.py +++ b/test/test_c_execution.py @@ -21,27 +21,17 @@ THE SOFTWARE. """ import logging -import sys import numpy as np import pytest import loopy as lp from loopy import CACHING_ENABLED +from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa: F401 logger = logging.getLogger(__name__) -try: - import faulthandler -except ImportError: - pass -else: - faulthandler.enable() - - -from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa - def test_c_target(): from loopy.target.c import ExecutableCTarget @@ -377,6 +367,7 @@ def test_scalar_global_args(): if __name__ == "__main__": + import sys if len(sys.argv) > 1: exec(sys.argv[1]) else: diff --git a/test/test_callables.py b/test/test_callables.py index eabba3fed2ee4de5df63f58cfd126da7c29e889c..17289b3bc1c8d63de85b23478a84a3f9bc63e263 100644 --- a/test/test_callables.py +++ b/test/test_callables.py @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ -import sys +import logging import numpy as np import pytest @@ -36,6 +36,9 @@ import loopy as lp from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa: F401 +logger = logging.getLogger(__name__) + + def test_register_function_lookup(ctx_factory): ctx = ctx_factory() queue = cl.CommandQueue(ctx) @@ -1529,6 +1532,7 @@ def test_inline_constant_access(): if __name__ == "__main__": + import sys if len(sys.argv) > 1: exec(sys.argv[1]) else: diff --git a/test/test_dg.py b/test/test_dg.py index 47d02a61101d4b2754e30d803ba85db83250a5c5..25e7405c839913c6c20f07b7654b19539a995f0f 100644 --- a/test/test_dg.py +++ b/test/test_dg.py @@ -38,8 +38,6 @@ logger = logging.getLogger(__name__) def test_dg_volume(ctx_factory): - # logging.basicConfig(level=logging.DEBUG) - dtype = np.float32 dtype4 = cl.array.vec.float4 ctx = ctx_factory() diff --git a/test/test_diff.py b/test/test_diff.py index d1d81b13380234f7f6cd294ec98d01e78d26ae0b..b1fdc7e8672e856ae49953f2776644f3f2246645 100644 --- a/test/test_diff.py +++ b/test/test_diff.py @@ -21,37 +21,22 @@ THE SOFTWARE. """ import logging -import sys import numpy as np import numpy.linalg as la import pyopencl as cl import pyopencl.clrandom +from pyopencl.tools import ( # noqa: F401 + pytest_generate_tests_for_pyopencl as pytest_generate_tests, +) import loopy as lp +from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa: F401 logger = logging.getLogger(__name__) -try: - import faulthandler -except ImportError: - pass -else: - faulthandler.enable() - -from pyopencl.tools import pytest_generate_tests_for_pyopencl as pytest_generate_tests - - -__all__ = [ - "cl", # 'cl.create_some_context' - "pytest_generate_tests" -] - - -from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa - def test_diff(ctx_factory): ctx = ctx_factory() @@ -109,6 +94,7 @@ def test_diff(ctx_factory): if __name__ == "__main__": + import sys if len(sys.argv) > 1: exec(sys.argv[1]) else: diff --git a/test/test_domain.py b/test/test_domain.py index c915498ed73a90d018bb85c29f34c903a7d79297..8209777bc6f8784439a07a8f88984b16e55811dc 100644 --- a/test/test_domain.py +++ b/test/test_domain.py @@ -21,7 +21,6 @@ THE SOFTWARE. """ import logging -import sys import numpy as np import pytest @@ -29,30 +28,16 @@ import pytest import pyopencl as cl import pyopencl.clmath import pyopencl.clrandom +from pyopencl.tools import ( # noqa: F401 + pytest_generate_tests_for_pyopencl as pytest_generate_tests, +) import loopy as lp +from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa: F401 logger = logging.getLogger(__name__) -try: - import faulthandler -except ImportError: - pass -else: - faulthandler.enable() - -from pyopencl.tools import pytest_generate_tests_for_pyopencl as pytest_generate_tests - - -__all__ = [ - "cl", # 'cl.create_some_context' - "pytest_generate_tests" -] - - -from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa - def test_assume(): knl = lp.make_kernel( @@ -378,6 +363,7 @@ def test_triangle_domain(): if __name__ == "__main__": + import sys if len(sys.argv) > 1: exec(sys.argv[1]) else: diff --git a/test/test_einsum.py b/test/test_einsum.py index b641e3b0d961544acdb7239f21ec92ed23050f38..29753fa6f75bd5d3d0d3be3a1ecd448f99361362 100644 --- a/test/test_einsum.py +++ b/test/test_einsum.py @@ -20,21 +20,23 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ - -import sys +import logging import numpy as np import pytest import pyopencl as cl import pyopencl.array -from pyopencl.tools import ( - pytest_generate_tests_for_pyopencl as pytest_generate_tests, # noqa +from pyopencl.tools import ( # noqa: F401 + pytest_generate_tests_for_pyopencl as pytest_generate_tests, ) import loopy as lp +logger = logging.getLogger(__name__) + + def test_make_einsum_error_handling(): with pytest.raises(ValueError): lp.make_einsum("ij,j->j", ("a",)) @@ -173,6 +175,7 @@ def test_einsum_with_variable_strides(ctx_factory): if __name__ == "__main__": + import sys if len(sys.argv) > 1: exec(sys.argv[1]) else: diff --git a/test/test_expression.py b/test/test_expression.py index ca033cbff26f126e7c34bd0be30713ce4b7d1d11..acb5572f0fbbe9cc808679c5555e6d758b9e6def 100644 --- a/test/test_expression.py +++ b/test/test_expression.py @@ -21,7 +21,6 @@ THE SOFTWARE. """ import logging -import sys import numpy as np import pytest @@ -30,30 +29,16 @@ import pyopencl as cl import pyopencl.clmath import pyopencl.clrandom from pymbolic.mapper.evaluator import EvaluationMapper +from pyopencl.tools import ( # noqa: F401 + pytest_generate_tests_for_pyopencl as pytest_generate_tests, +) import loopy as lp +from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa: F401 logger = logging.getLogger(__name__) -try: - import faulthandler -except ImportError: - pass -else: - faulthandler.enable() - -from pyopencl.tools import pytest_generate_tests_for_pyopencl as pytest_generate_tests - - -__all__ = [ - "cl", # "cl.create_some_context" - "pytest_generate_tests" -] - - -from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa - # {{{ code generator fuzzing @@ -719,6 +704,7 @@ def test_complex_functions_with_real_args(ctx_factory, target): if __name__ == "__main__": + import sys if len(sys.argv) > 1: exec(sys.argv[1]) else: diff --git a/test/test_fortran.py b/test/test_fortran.py index 7a5d73a9543d39fdf9c4838b9539d8604a66250d..f237ec7934347b949db53b3d4031016b496a8c50 100644 --- a/test/test_fortran.py +++ b/test/test_fortran.py @@ -20,31 +20,22 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ - import logging -import sys import numpy as np import pytest import pyopencl as cl import pyopencl.clrandom +from pyopencl.tools import ( # noqa: F401 + pytest_generate_tests_for_pyopencl as pytest_generate_tests, +) import loopy as lp -logger = logging.getLogger(__name__) - -from pyopencl.tools import pytest_generate_tests_for_pyopencl as pytest_generate_tests - - -__all__ = [ - "cl", # "cl.create_some_context" - "pytest_generate_tests" -] - - pytest.importorskip("fparser") +logger = logging.getLogger(__name__) def test_fp_prec_comparison(): @@ -684,6 +675,7 @@ def test_division_in_shapes(ctx_factory): if __name__ == "__main__": + import sys if len(sys.argv) > 1: exec(sys.argv[1]) else: diff --git a/test/test_linalg.py b/test/test_linalg.py index b09b3fb6288fec7dca3b2caf73754fe2f44758f3..6990889baacb137c78169c363af15d8b379688cb 100644 --- a/test/test_linalg.py +++ b/test/test_linalg.py @@ -74,9 +74,9 @@ def test_axpy(ctx_factory): for dtype, check, a, b in [ (np.complex64, None, 5, 7), - (cltypes.float4, check_float4, # pylint:disable=no-member - cltypes.make_float4(1, 2, 3, 4), # pylint:disable=no-member - cltypes.make_float4(6, 7, 8, 9)), # pylint:disable=no-member + (cl.cltypes.float4, check_float4, # pylint:disable=no-member + cl.cltypes.make_float4(1, 2, 3, 4), # pylint:disable=no-member + cl.cltypes.make_float4(6, 7, 8, 9)), # pylint:disable=no-member (np.float32, None, 5, 7), ]: knl = lp.make_kernel( @@ -162,7 +162,7 @@ def test_plain_matrix_mul(ctx_factory): n = get_suitable_size(ctx) for dtype, check, vec_size in [ - (cltypes.float4, check_float4, 4), # pylint:disable=no-member + (cl.cltypes.float4, check_float4, 4), # pylint:disable=no-member (np.float32, None, 1), ]: knl = lp.make_kernel( diff --git a/test/test_loopy.py b/test/test_loopy.py index 4983d8df499d6a3d73fa73734191153197a7aa77..3412238c620704bd8d9a77de424afda671a436b6 100644 --- a/test/test_loopy.py +++ b/test/test_loopy.py @@ -21,7 +21,6 @@ THE SOFTWARE. """ import logging -import sys import numpy as np import pytest @@ -30,30 +29,16 @@ import pyopencl as cl import pyopencl.array import pyopencl.clmath import pyopencl.clrandom +from pyopencl.tools import ( # noqa: F401 + pytest_generate_tests_for_pyopencl as pytest_generate_tests, +) import loopy as lp +from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa: F401 logger = logging.getLogger(__name__) -try: - import faulthandler -except ImportError: - pass -else: - faulthandler.enable() - -from pyopencl.tools import pytest_generate_tests_for_pyopencl as pytest_generate_tests - - -__all__ = [ - "cl", # "cl.create_some_context" - "pytest_generate_tests" -] - - -from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa - def test_globals_decl_once_with_multi_subprogram(ctx_factory): ctx = ctx_factory() @@ -3725,6 +3710,7 @@ def test_loop_imperfect_nest_priorities_in_v2_scheduler(): if __name__ == "__main__": + import sys if len(sys.argv) > 1: exec(sys.argv[1]) else: diff --git a/test/test_misc.py b/test/test_misc.py index 184b720b683f7c3bb60e015531167918f955780e..79c7698e7b07416082399bd2fa89cbdfe32c66e1 100644 --- a/test/test_misc.py +++ b/test/test_misc.py @@ -21,20 +21,17 @@ THE SOFTWARE. """ import logging -import sys from pickle import dumps, loads import pytest import loopy as lp +from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa: F401 logger = logging.getLogger(__name__) -from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa - - def test_kernel_pickling_and_hashing(): knl = lp.make_kernel("{[i]: 0<=i<10}", """ @@ -342,6 +339,7 @@ def test_memoize_on_disk_with_pym_expr(): if __name__ == "__main__": + import sys if len(sys.argv) > 1: exec(sys.argv[1]) else: diff --git a/test/test_nbody.py b/test/test_nbody.py index 02dcb17438b7fb960cde197e473ebbfbd9e66972..7d75fe15513d318fe1cdc9345dda426f21737ad6 100644 --- a/test/test_nbody.py +++ b/test/test_nbody.py @@ -20,28 +20,23 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. """ - import logging import numpy as np -import pyopencl as cl # noqa -from pyopencl.tools import ( # noqa +import pyopencl as cl # noqa: F401 +from pyopencl.tools import ( # noqa: F401 pytest_generate_tests_for_pyopencl as pytest_generate_tests, ) import loopy as lp +from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa: F401 logger = logging.getLogger(__name__) -from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa - - def test_nbody(ctx_factory): - logging.basicConfig(level=logging.INFO) - dtype = np.float32 ctx = ctx_factory() diff --git a/test/test_numa_diff.py b/test/test_numa_diff.py index 0bc5981822110e5f3caa5a6970cd38cbf2c2ab85..da7b4387d1733680e13274e1104baa5bf47722ea 100644 --- a/test/test_numa_diff.py +++ b/test/test_numa_diff.py @@ -23,29 +23,20 @@ THE SOFTWARE. """ import logging -import os -import sys import pytest -import pyopencl as cl +import pyopencl as cl # noqa: F401 +from pyopencl.tools import ( # noqa: F401 + pytest_generate_tests_for_pyopencl as pytest_generate_tests, +) import loopy as lp +from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa: F401 logger = logging.getLogger(__name__) -from pyopencl.tools import pytest_generate_tests_for_pyopencl as pytest_generate_tests - - -__all__ = [ - "cl", # 'cl.create_some_context' - "pytest_generate_tests" -] - - -from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa - @pytest.mark.parametrize("ilp_multiple", [1, 2]) @pytest.mark.parametrize("Nq", [7]) @@ -59,6 +50,8 @@ def test_gnuma_horiz_kernel(ctx_factory, ilp_multiple, Nq, opt_level): # noqa: # about 400s, cf. https://gitlab.tiker.net/inducer/loopy/-/jobs/421250#L937 pytest.skip("takes a very long time to compile on pocl") + import os + filename = os.path.join(os.path.dirname(__file__), "strongVolumeKernels.f90") with open(filename) as sourcef: source = sourcef.read() @@ -274,6 +267,7 @@ def test_gnuma_horiz_kernel(ctx_factory, ilp_multiple, Nq, opt_level): # noqa: if __name__ == "__main__": + import sys if len(sys.argv) > 1: exec(sys.argv[1]) else: diff --git a/test/test_reduction.py b/test/test_reduction.py index 7b2a98c5de72335b5cd5ca11f074252481dc16d6..eef8ffa6e7c1603482e4400ebe8d851cbbddac1d 100644 --- a/test/test_reduction.py +++ b/test/test_reduction.py @@ -30,30 +30,16 @@ import pyopencl as cl import pyopencl.clmath import pyopencl.clrandom import pyopencl.version +from pyopencl.tools import ( # noqa: F401 + pytest_generate_tests_for_pyopencl as pytest_generate_tests, +) import loopy as lp +from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa: F401 logger = logging.getLogger(__name__) -try: - import faulthandler -except ImportError: - pass -else: - faulthandler.enable() - -from pyopencl.tools import pytest_generate_tests_for_pyopencl as pytest_generate_tests - - -__all__ = [ - "cl", # 'cl.create_some_context' - "pytest_generate_tests" -] - - -from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa - def test_nonsense_reduction(ctx_factory): diff --git a/test/test_scan.py b/test/test_scan.py index 36deb9f6034900ba768d4e35a262767e7239f458..f9d55aa9a0467a52efdefa048da24e40f4fe2187 100644 --- a/test/test_scan.py +++ b/test/test_scan.py @@ -24,7 +24,6 @@ THE SOFTWARE. """ import logging -import sys import numpy as np import pytest @@ -32,34 +31,20 @@ import pytest import pyopencl as cl import pyopencl.clmath import pyopencl.clrandom +from pyopencl.tools import ( # noqa: F401 + pytest_generate_tests_for_pyopencl as pytest_generate_tests, +) import loopy as lp +from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa: F401 logger = logging.getLogger(__name__) -try: - import faulthandler -except ImportError: - pass -else: - faulthandler.enable() - -from pyopencl.tools import pytest_generate_tests_for_pyopencl as pytest_generate_tests - - -__all__ = [ - "cl", # 'cl.create_some_context' - "pytest_generate_tests" -] - - -# More things to test. +# TODO: More things to test. # - scan(a) + scan(b) # - test for badly tagged inames -from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa - @pytest.mark.parametrize("n", [1, 2, 3, 16]) @pytest.mark.parametrize("stride", [1, 2]) @@ -422,6 +407,7 @@ def test_segmented_scan(ctx_factory, n, segment_boundaries_indices, iname_tag): if __name__ == "__main__": + import sys if len(sys.argv) > 1: exec(sys.argv[1]) else: diff --git a/test/test_statistics.py b/test/test_statistics.py index adaffcbec1c5f87bca0c23a1024a194ce91d6275..ce3f0d0f9cea473a1879ad3a0c55432ba6b88681 100644 --- a/test/test_statistics.py +++ b/test/test_statistics.py @@ -1570,6 +1570,7 @@ def test_within_stats(): if __name__ == "__main__": + import sys if len(sys.argv) > 1: exec(sys.argv[1]) else: diff --git a/test/test_target.py b/test/test_target.py index b0cb5e73c6484343ae77e94b0dbb9ca5f6e25ee8..32ca21ed571394e4bdeababdcaec5ebb4d83dd4e 100644 --- a/test/test_target.py +++ b/test/test_target.py @@ -21,7 +21,6 @@ THE SOFTWARE. """ import logging -import sys import numpy as np import pytest @@ -32,33 +31,19 @@ import pyopencl.clmath import pyopencl.clrandom import pyopencl.tools import pyopencl.version +from pyopencl.tools import ( # noqa: F401 + pytest_generate_tests_for_pyopencl as pytest_generate_tests, +) import loopy as lp from loopy.diagnostic import LoopyError from loopy.target.c import CTarget from loopy.target.opencl import OpenCLTarget +from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa: F401 logger = logging.getLogger(__name__) -try: - import faulthandler -except ImportError: - pass -else: - faulthandler.enable() - -from pyopencl.tools import pytest_generate_tests_for_pyopencl as pytest_generate_tests - - -__all__ = [ - "cl", # "cl.create_some_context" - "pytest_generate_tests" -] - - -from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa - def test_ispc_target(): from loopy.target.ispc import ISPCTarget @@ -868,6 +853,7 @@ def test_cl_vectorize_ternary(ctx_factory): if __name__ == "__main__": + import sys if len(sys.argv) > 1: exec(sys.argv[1]) else: diff --git a/test/test_transform.py b/test/test_transform.py index 4c42b4dc27a697da606a216d6a9b8f1ad97c2ad9..a4d04e61da5e36ab3de82eae1f7d3bb69c83ef34 100644 --- a/test/test_transform.py +++ b/test/test_transform.py @@ -21,7 +21,6 @@ THE SOFTWARE. """ import logging -import sys import numpy as np import pytest @@ -29,31 +28,17 @@ import pytest import pyopencl as cl import pyopencl.clmath import pyopencl.clrandom +from pyopencl.tools import ( # noqa: F401 + pytest_generate_tests_for_pyopencl as pytest_generate_tests, +) from pytools.tag import Tag import loopy as lp +from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa: F401 logger = logging.getLogger(__name__) -try: - import faulthandler -except ImportError: - pass -else: - faulthandler.enable() - -from pyopencl.tools import pytest_generate_tests_for_pyopencl as pytest_generate_tests - - -__all__ = [ - "cl", # "cl.create_some_context" - "pytest_generate_tests" -] - - -from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2 # noqa - # {{{ ContainsFloorDiv @@ -1760,6 +1745,7 @@ def test_duplicate_iname_not_read_only_nested(ctx_factory): if __name__ == "__main__": + import sys if len(sys.argv) > 1: exec(sys.argv[1]) else: