diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ae645a37fba2cc0d8ce197d1bf6b0bb0bd5ce76..96fb4a49bf500e4e70494a6c5839385222c4c835 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -100,7 +100,7 @@ jobs: CONDA_ENVIRONMENT=.test-conda-env-py3.yml curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh . ci-support.sh - EXTRA_INSTALL="pillow cgen mako" + EXTRA_INSTALL="pillow cgen mako imageio" build_py_project_in_conda_env (cd examples; rm -f gl_*) run_examples --no-require-main diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c0442a73c99f5d1570e67b9ee1261d8fb320f503..fa83e362b87c93eb1692d1db82cccc48462e62e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -226,7 +226,7 @@ Examples: script: | curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh . ci-support.sh - EXTRA_INSTALL="pillow cgen mako" + EXTRA_INSTALL="pillow cgen mako imageio" build_py_project_in_venv (cd examples; rm -f gl_*) run_examples --no-require-main diff --git a/examples/median-filter.py b/examples/median-filter.py index 010e2851d7ee9567732ac45b4a46d08d2d8fb212..7f787500ccf82a77b5961413f86e16dbf3cfe8a9 100644 --- a/examples/median-filter.py +++ b/examples/median-filter.py @@ -1,25 +1,14 @@ import pyopencl as cl import numpy as np -from scipy.misc import imread, imsave +from imageio import imread, imsave #Read in image -img = imread('noisyImage.jpg', flatten=True).astype(np.float32) +img = imread('noisyImage.jpg').astype(np.float32) +print(img.shape) +img = np.mean(img, axis=2) +print(img.shape) -# Get platforms, both CPU and GPU -plat = cl.get_platforms() -CPU = plat[0].get_devices() -try: - GPU = plat[1].get_devices() -except IndexError: - GPU = "none" - -#Create context for GPU/CPU -if GPU!= "none": - ctx = cl.Context(GPU) -else: - ctx = cl.Context(CPU) - -# Create queue for each kernel execution +ctx = cl.create_some_context() queue = cl.CommandQueue(ctx) mf = cl.mem_flags @@ -97,4 +86,4 @@ result = np.empty_like(img) cl.enqueue_copy(queue, result, result_g) # Show the blurred image -imsave('medianFilter-OpenCL.jpg',result) \ No newline at end of file +imsave('medianFilter-OpenCL.jpg', result) diff --git a/examples/noisyImage.jpg b/examples/noisyImage.jpg new file mode 100644 index 0000000000000000000000000000000000000000..64db427319e4f2e4ce20d76f44cec3cca51a9697 Binary files /dev/null and b/examples/noisyImage.jpg differ