Skip to content
This repository was archived by the owner on May 18, 2019. It is now read-only.

Commit 3f9d53f

Browse files
perostOpenModelica-Hudson
authored andcommitted
Fix ParModelica compilation with Clang 6.0.
Belonging to [master]: - #2345
1 parent 4204ff0 commit 3f9d53f

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

SimulationRuntime/ParModelica/explicit/openclrt/omc_ocl_builtin_kernels.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ void ocl_real_arr_arr_arr(const char* kernel_name, modelica_real* src_1, modelic
8181
ocl_error_check(OCL_SET_KER_ARGS, err);
8282

8383

84-
size_t WorkSize[1] = {size_}; // one dimensional Range
84+
size_t WorkSize[1] = {static_cast<size_t>(size_)}; // one dimensional Range
8585
c0 = clock();
8686
err = clEnqueueNDRangeKernel(device_comm_queue, OpenCLfunction, 1, NULL,
8787
WorkSize, NULL, 0, NULL, NULL);
@@ -111,7 +111,7 @@ void ocl_real_arr_arr_sca(const char* kernel_name, modelica_real* src_1, modelic
111111
inc1=1;
112112
inc2=1;
113113

114-
size_t WorkSize[1] = {size_};
114+
size_t WorkSize[1] = {static_cast<size_t>(size_)};
115115
size_t localWorkSize[1] = {32}; // one dimensional Range
116116

117117
if (!device_comm_queue)
@@ -187,7 +187,7 @@ void ocl_real_arr_sca_arr(const char* kernel_name, modelica_real* src_1, modelic
187187
err |= clSetKernelArg(OpenCLfunction, 2, sizeof(cl_mem), (void*)&device_array_output);
188188
ocl_error_check(OCL_SET_KER_ARGS, err);
189189

190-
size_t WorkSize[1] = {size_};
190+
size_t WorkSize[1] = {static_cast<size_t>(size_)};
191191
//size_t localWorkSize[1] = {32}; // one dimensional Range
192192
c0 = clock();
193193
err = clEnqueueNDRangeKernel(device_comm_queue, OpenCLfunction, 1, NULL,
@@ -236,7 +236,7 @@ void ocl_real_arr_arr(const char* kernel_name, modelica_real* src_1, modelica_re
236236
err |= clSetKernelArg(OpenCLfunction, 1, sizeof(cl_mem), (void*)&device_array_output);
237237

238238

239-
size_t WorkSize[1] = {size_};
239+
size_t WorkSize[1] = {static_cast<size_t>(size_)};
240240
//size_t localWorkSize[1] = {32}; // one dimensional Range
241241
c0 = clock();
242242
err = clEnqueueNDRangeKernel(device_comm_queue, OpenCLfunction, 1, NULL,
@@ -286,7 +286,7 @@ void ocl_real_arr_sca(const char* kernel_name, modelica_real* src_1, modelica_re
286286
err |= clSetKernelArg(OpenCLfunction, 3, sizeof(cl_int), (void*)&size_);
287287
ocl_error_check(OCL_SET_KER_ARGS, err);
288288

289-
size_t WorkSize[1] = {size_};
289+
size_t WorkSize[1] = {static_cast<size_t>(size_)};
290290
//size_t localWorkSize[1] = {32}; // one dimensional Range
291291
c0 = clock();
292292
err = clEnqueueNDRangeKernel(device_comm_queue, OpenCLfunction, 1, NULL,
@@ -313,7 +313,7 @@ void ocl_real_matrix_matrix_matrix(const char* kernel_name, modelica_real* src_1
313313
cl_int err;
314314

315315

316-
size_t WorkSize[2] = {M, N};
316+
size_t WorkSize[2] = {static_cast<size_t>(M), static_cast<size_t>(N)};
317317
size_t localWorkSize[2] = {16,16};
318318

319319
if (!device_comm_queue){
@@ -369,7 +369,7 @@ void ocl_real_matrix_matrix_matrix2(const char* kernel_name, modelica_real* src_
369369
if (!device_comm_queue)
370370
ocl_initialize();
371371

372-
size_t WorkSize[2] = {M/4, N/4};
372+
size_t WorkSize[2] = {static_cast<size_t>(M/4), static_cast<size_t>(N/4)};
373373
size_t localWorkSize[2] = {16,16};
374374

375375
//This can be moved out. left here hoping that similar ops will be called
@@ -419,8 +419,8 @@ void ocl_real_matrix_matrix(const char* kernel_name, modelica_real* src_1, int M
419419
cl_int err;
420420
cl_int block_size = 16;
421421

422-
size_t WorkSize[2] = {M, N};
423-
size_t localWorkSize[2] = {block_size,block_size};
422+
size_t WorkSize[2] = {static_cast<size_t>(M), static_cast<size_t>(N)};
423+
size_t localWorkSize[2] = {static_cast<size_t>(block_size), static_cast<size_t>(block_size)};
424424

425425
if (!device_comm_queue)
426426
ocl_initialize();

0 commit comments

Comments
 (0)