make run on CPU
change the opencl code to match
Merge remote-tracking branch 'origin/pr_find_cl_files_locally' into all_prs
Merge remote-tracking branch 'origin/pr_run_on_cpu' into all_prs