From fd75b40a122290acdd42a002bad44f309981eb9f Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Wed, 22 Mar 2017 09:39:50 +0000 Subject: [PATCH 1/2] Use .s[0] instead of .x in example_ctrsm.c .s is more portable, and .x does not work with -std=c99 which does not have anonymous structs. Fix #307. --- src/samples/example_ctrsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/samples/example_ctrsm.c b/src/samples/example_ctrsm.c index 44664810..0dc659b3 100644 --- a/src/samples/example_ctrsm.c +++ b/src/samples/example_ctrsm.c @@ -71,7 +71,7 @@ printResult(const char* str) nrows = (sizeof(result) / sizeof(FloatComplex)) / ldb; for (i = 0; i < nrows; i++) { for (j = 0; j < ldb; j++) { - printf("%.5f ", result[i * ldb + j].x); + printf("%.5f ", result[i * ldb + j].s[0]); } printf("\n"); } From 7ec40a205abdc7ae7d0b771136b578b89f75f0fb Mon Sep 17 00:00:00 2001 From: Ciro Santilli Date: Thu, 23 Mar 2017 08:22:47 +0000 Subject: [PATCH 2/2] Use CL_DEVICE_TYPE_ALL for all samples. This increases the chance that they will just work for most users. Previously there was a mixture of CPU and GPU, which only works if users have both CPU and GPU OpenCL devices. --- src/samples/example_chbmv.c | 2 +- src/samples/example_cher.c | 2 +- src/samples/example_cher2k.c | 2 +- src/samples/example_chpmv.c | 2 +- src/samples/example_chpr.c | 2 +- src/samples/example_csscal.c | 2 +- src/samples/example_ctrsm.c | 4 ++-- src/samples/example_dtrmv.c | 2 +- src/samples/example_isamax.c | 2 +- src/samples/example_sasum.c | 2 +- src/samples/example_saxpy.c | 2 +- src/samples/example_scopy.c | 2 +- src/samples/example_sdot.c | 2 +- src/samples/example_sgbmv.c | 2 +- src/samples/example_sgemm.c | 2 +- src/samples/example_sgemv.c | 2 +- src/samples/example_sger.c | 2 +- src/samples/example_snrm2.c | 2 +- src/samples/example_srot.c | 4 ++-- src/samples/example_srotg.c | 2 +- src/samples/example_srotm.c | 2 +- src/samples/example_srotmg.c | 2 +- src/samples/example_ssbmv.c | 2 +- src/samples/example_sscal.c | 2 +- src/samples/example_sspmv.c | 2 +- src/samples/example_sspr.c | 2 +- src/samples/example_sspr2.c | 2 +- src/samples/example_sswap.c | 2 +- src/samples/example_ssymm.c | 2 +- src/samples/example_ssymv.c | 2 +- src/samples/example_ssyr.c | 2 +- src/samples/example_ssyr2.c | 2 +- src/samples/example_ssyr2k.c | 2 +- src/samples/example_ssyrk.c | 2 +- src/samples/example_stbmv.c | 2 +- src/samples/example_stbsv.c | 2 +- src/samples/example_stpmv.c | 2 +- src/samples/example_stpsv.c | 2 +- src/samples/example_strmm.c | 2 +- src/samples/example_strmv.c | 2 +- src/samples/example_strsm.c | 2 +- src/samples/example_strsm.cpp | 13 ++++--------- src/samples/example_strsv.c | 2 +- src/samples/example_zher2.c | 2 +- src/samples/example_zhpr2.c | 2 +- 45 files changed, 50 insertions(+), 55 deletions(-) diff --git a/src/samples/example_chbmv.c b/src/samples/example_chbmv.c index 82d15344..b7aa0ad4 100644 --- a/src/samples/example_chbmv.c +++ b/src/samples/example_chbmv.c @@ -91,7 +91,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_cher.c b/src/samples/example_cher.c index 13a0d80b..81da92b4 100644 --- a/src/samples/example_cher.c +++ b/src/samples/example_cher.c @@ -84,7 +84,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_cher2k.c b/src/samples/example_cher2k.c index 53cc2b8d..c1290b08 100644 --- a/src/samples/example_cher2k.c +++ b/src/samples/example_cher2k.c @@ -100,7 +100,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_chpmv.c b/src/samples/example_chpmv.c index 4a48f189..fff4d1d8 100644 --- a/src/samples/example_chpmv.c +++ b/src/samples/example_chpmv.c @@ -88,7 +88,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_chpr.c b/src/samples/example_chpr.c index 6426ba9d..d4e2c55f 100644 --- a/src/samples/example_chpr.c +++ b/src/samples/example_chpr.c @@ -90,7 +90,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_csscal.c b/src/samples/example_csscal.c index c78bc550..e05011a3 100644 --- a/src/samples/example_csscal.c +++ b/src/samples/example_csscal.c @@ -73,7 +73,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_ctrsm.c b/src/samples/example_ctrsm.c index 0dc659b3..bb68c311 100644 --- a/src/samples/example_ctrsm.c +++ b/src/samples/example_ctrsm.c @@ -81,7 +81,7 @@ int main(void) { cl_int err; - cl_platform_id platform[] = { 0, 0 }; + cl_platform_id platform = 0; cl_device_id device = 0; cl_context_properties props[3] = { CL_CONTEXT_PLATFORM, 0, 0 }; cl_context ctx = 0; @@ -97,7 +97,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform[0], CL_DEVICE_TYPE_CPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_dtrmv.c b/src/samples/example_dtrmv.c index 205a1061..8fd12e4b 100644 --- a/src/samples/example_dtrmv.c +++ b/src/samples/example_dtrmv.c @@ -95,7 +95,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_isamax.c b/src/samples/example_isamax.c index 0e637c38..bc634afc 100644 --- a/src/samples/example_isamax.c +++ b/src/samples/example_isamax.c @@ -63,7 +63,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_sasum.c b/src/samples/example_sasum.c index 713bbcb1..be8c1f64 100644 --- a/src/samples/example_sasum.c +++ b/src/samples/example_sasum.c @@ -61,7 +61,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_CPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_saxpy.c b/src/samples/example_saxpy.c index 43ea6ead..49ace1d2 100644 --- a/src/samples/example_saxpy.c +++ b/src/samples/example_saxpy.c @@ -86,7 +86,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_scopy.c b/src/samples/example_scopy.c index 16244684..a61d110b 100644 --- a/src/samples/example_scopy.c +++ b/src/samples/example_scopy.c @@ -90,7 +90,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_sdot.c b/src/samples/example_sdot.c index 83e7b00f..3e259d2c 100644 --- a/src/samples/example_sdot.c +++ b/src/samples/example_sdot.c @@ -73,7 +73,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_sgbmv.c b/src/samples/example_sgbmv.c index 6df4b974..e4fc2973 100644 --- a/src/samples/example_sgbmv.c +++ b/src/samples/example_sgbmv.c @@ -97,7 +97,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_sgemm.c b/src/samples/example_sgemm.c index fe47ba33..df0a5e4c 100644 --- a/src/samples/example_sgemm.c +++ b/src/samples/example_sgemm.c @@ -108,7 +108,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_sgemv.c b/src/samples/example_sgemv.c index d4816c5e..9a38b57f 100644 --- a/src/samples/example_sgemv.c +++ b/src/samples/example_sgemv.c @@ -101,7 +101,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_sger.c b/src/samples/example_sger.c index 1098a1a5..d4b47c14 100644 --- a/src/samples/example_sger.c +++ b/src/samples/example_sger.c @@ -96,7 +96,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_snrm2.c b/src/samples/example_snrm2.c index ce7f48ec..13237740 100644 --- a/src/samples/example_snrm2.c +++ b/src/samples/example_snrm2.c @@ -61,7 +61,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_srot.c b/src/samples/example_srot.c index 62bc95de..1575d8f0 100644 --- a/src/samples/example_srot.c +++ b/src/samples/example_srot.c @@ -83,13 +83,13 @@ main(void) /* Setup OpenCL environment. */ err = clGetPlatformIDs(1, &platform, NULL); - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_CPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetPlatformIDs() failed with %d\n", err ); return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); diff --git a/src/samples/example_srotg.c b/src/samples/example_srotg.c index b1fca0a1..c9661e77 100644 --- a/src/samples/example_srotg.c +++ b/src/samples/example_srotg.c @@ -59,7 +59,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_srotm.c b/src/samples/example_srotm.c index 8b608587..39d92c88 100644 --- a/src/samples/example_srotm.c +++ b/src/samples/example_srotm.c @@ -97,7 +97,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_srotmg.c b/src/samples/example_srotmg.c index 71dea219..86983c8e 100644 --- a/src/samples/example_srotmg.c +++ b/src/samples/example_srotmg.c @@ -68,7 +68,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_ssbmv.c b/src/samples/example_ssbmv.c index 50b03327..c0a8bc94 100644 --- a/src/samples/example_ssbmv.c +++ b/src/samples/example_ssbmv.c @@ -93,7 +93,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_sscal.c b/src/samples/example_sscal.c index 44de9695..5132a6e6 100644 --- a/src/samples/example_sscal.c +++ b/src/samples/example_sscal.c @@ -73,7 +73,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_sspmv.c b/src/samples/example_sspmv.c index 504af797..4e45f2fb 100644 --- a/src/samples/example_sspmv.c +++ b/src/samples/example_sspmv.c @@ -90,7 +90,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_sspr.c b/src/samples/example_sspr.c index 550d37eb..1275fa1f 100644 --- a/src/samples/example_sspr.c +++ b/src/samples/example_sspr.c @@ -90,7 +90,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_sspr2.c b/src/samples/example_sspr2.c index a17b68b4..55753259 100644 --- a/src/samples/example_sspr2.c +++ b/src/samples/example_sspr2.c @@ -99,7 +99,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_sswap.c b/src/samples/example_sswap.c index 5f62575f..aa6bd18a 100644 --- a/src/samples/example_sswap.c +++ b/src/samples/example_sswap.c @@ -91,7 +91,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_ssymm.c b/src/samples/example_ssymm.c index ee8b3038..49bfcbb3 100644 --- a/src/samples/example_ssymm.c +++ b/src/samples/example_ssymm.c @@ -98,7 +98,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_ssymv.c b/src/samples/example_ssymv.c index da3fa689..222e4af1 100644 --- a/src/samples/example_ssymv.c +++ b/src/samples/example_ssymv.c @@ -102,7 +102,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_ssyr.c b/src/samples/example_ssyr.c index 9996554e..acc79cda 100644 --- a/src/samples/example_ssyr.c +++ b/src/samples/example_ssyr.c @@ -84,7 +84,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_ssyr2.c b/src/samples/example_ssyr2.c index 183e9193..9a6463df 100644 --- a/src/samples/example_ssyr2.c +++ b/src/samples/example_ssyr2.c @@ -94,7 +94,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_ssyr2k.c b/src/samples/example_ssyr2k.c index 92fb778d..28bec01a 100644 --- a/src/samples/example_ssyr2k.c +++ b/src/samples/example_ssyr2k.c @@ -108,7 +108,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_ssyrk.c b/src/samples/example_ssyrk.c index 0fd76ea0..7b390c52 100644 --- a/src/samples/example_ssyrk.c +++ b/src/samples/example_ssyrk.c @@ -98,7 +98,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_stbmv.c b/src/samples/example_stbmv.c index 236af453..aa9b555c 100644 --- a/src/samples/example_stbmv.c +++ b/src/samples/example_stbmv.c @@ -80,7 +80,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_stbsv.c b/src/samples/example_stbsv.c index c7e80dc4..2e6a3bbb 100644 --- a/src/samples/example_stbsv.c +++ b/src/samples/example_stbsv.c @@ -83,7 +83,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_stpmv.c b/src/samples/example_stpmv.c index dd73822d..9872a310 100644 --- a/src/samples/example_stpmv.c +++ b/src/samples/example_stpmv.c @@ -78,7 +78,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_stpsv.c b/src/samples/example_stpsv.c index 0f5a3cf6..9dd84bf1 100644 --- a/src/samples/example_stpsv.c +++ b/src/samples/example_stpsv.c @@ -82,7 +82,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_strmm.c b/src/samples/example_strmm.c index 932c4a46..c9d1a142 100644 --- a/src/samples/example_strmm.c +++ b/src/samples/example_strmm.c @@ -96,7 +96,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_strmv.c b/src/samples/example_strmv.c index bfc6f501..ff301068 100644 --- a/src/samples/example_strmv.c +++ b/src/samples/example_strmv.c @@ -79,7 +79,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_strsm.c b/src/samples/example_strsm.c index 186f02de..81717064 100644 --- a/src/samples/example_strsm.c +++ b/src/samples/example_strsm.c @@ -97,7 +97,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_strsm.cpp b/src/samples/example_strsm.cpp index da515147..a327d89f 100644 --- a/src/samples/example_strsm.cpp +++ b/src/samples/example_strsm.cpp @@ -80,8 +80,7 @@ int main(void) { cl_int err; - // Increase platforms array for system needs; 2 covers most situations - cl_platform_id platforms[] = { 0,0 }; + cl_platform_id platform = 0; cl_device_id device = 0; cl_context_properties props[3] = { CL_CONTEXT_PLATFORM, 0, 0 }; cl_context ctx = 0; @@ -95,23 +94,19 @@ main(void) makeScaledIdentity( result, M, N, 0.0f); /* Setup OpenCL environment. */ - err = clGetPlatformIDs( sizeof( platforms )/ sizeof( cl_platform_id ), &platforms[0], NULL); + err = clGetPlatformIDs( 1, &platform, NULL); if (err != CL_SUCCESS) { printf( "clGetPlatformIDs() failed with %d\n", err ); return 1; } - // Change this statement to pick the desired platform under test - cl_platform_id test_platform = platforms[1]; - - //!!! Change device type to validate; works on GPU, faults on CPU - err = clGetDeviceIDs(test_platform, CL_DEVICE_TYPE_CPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; } - props[1] = (cl_context_properties)test_platform; + props[1] = (cl_context_properties)platform; ctx = clCreateContext(props, 1, &device, NULL, NULL, &err); if (err != CL_SUCCESS) { printf( "clCreateContext() failed with %d\n", err ); diff --git a/src/samples/example_strsv.c b/src/samples/example_strsv.c index 3db93dcd..055e5eae 100644 --- a/src/samples/example_strsv.c +++ b/src/samples/example_strsv.c @@ -80,7 +80,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_zher2.c b/src/samples/example_zher2.c index b2b078cc..643269c6 100644 --- a/src/samples/example_zher2.c +++ b/src/samples/example_zher2.c @@ -93,7 +93,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1; diff --git a/src/samples/example_zhpr2.c b/src/samples/example_zhpr2.c index 811663f2..840f0451 100644 --- a/src/samples/example_zhpr2.c +++ b/src/samples/example_zhpr2.c @@ -99,7 +99,7 @@ main(void) return 1; } - err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 1, &device, NULL); + err = clGetDeviceIDs(platform, CL_DEVICE_TYPE_ALL, 1, &device, NULL); if (err != CL_SUCCESS) { printf( "clGetDeviceIDs() failed with %d\n", err ); return 1;