changed malloc_shared to malloc_device

Author: addy419

src/sycl-usm/kernel_initialise.cpp

@@ -230,46 +230,46 @@ void run_kernel_initialise(Chunk *chunk, Settings &settings, int comms_lr_len, i
   chunk->ext->device_queue = new queue(selected);
   print_and_log(settings, " - SYCL device: %s\n", chunk->ext->device_queue->get_device().get_info<info::device::name>().c_str());
 
-  chunk->density0 = sycl::malloc_shared<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
-  chunk->density = sycl::malloc_shared<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
-  chunk->energy0 = sycl::malloc_shared<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
-  chunk->energy = sycl::malloc_shared<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
-  chunk->u = sycl::malloc_shared<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
-  chunk->u0 = sycl::malloc_shared<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
-  chunk->p = sycl::malloc_shared<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
-  chunk->r = sycl::malloc_shared<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
-  chunk->mi = sycl::malloc_shared<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
-  chunk->w = sycl::malloc_shared<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
-  chunk->kx = sycl::malloc_shared<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
-  chunk->ky = sycl::malloc_shared<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
-  chunk->sd = sycl::malloc_shared<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
-  chunk->volume = sycl::malloc_shared<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
-  chunk->x_area = sycl::malloc_shared<double>((chunk->x + 1) * chunk->y, *chunk->ext->device_queue);
-  chunk->y_area = sycl::malloc_shared<double>(chunk->x * (chunk->y + 1), *chunk->ext->device_queue);
-  chunk->cell_x = sycl::malloc_shared<double>(chunk->x, *chunk->ext->device_queue);
-  chunk->cell_y = sycl::malloc_shared<double>(chunk->y, *chunk->ext->device_queue);
-  chunk->cell_dx = sycl::malloc_shared<double>(chunk->x, *chunk->ext->device_queue);
-  chunk->cell_dy = sycl::malloc_shared<double>(chunk->y, *chunk->ext->device_queue);
-  chunk->vertex_dx = sycl::malloc_shared<double>((chunk->x + 1), *chunk->ext->device_queue);
-  chunk->vertex_dy = sycl::malloc_shared<double>((chunk->y + 1), *chunk->ext->device_queue);
-  chunk->vertex_x = sycl::malloc_shared<double>((chunk->x + 1), *chunk->ext->device_queue);
-  chunk->vertex_y = sycl::malloc_shared<double>((chunk->y + 1), *chunk->ext->device_queue);
-
-  chunk->left_send = sycl::malloc_shared<double>(comms_lr_len, *chunk->ext->device_queue);
-  chunk->left_recv = sycl::malloc_shared<double>(comms_lr_len, *chunk->ext->device_queue);
-  chunk->right_send = sycl::malloc_shared<double>(comms_lr_len, *chunk->ext->device_queue);
-  chunk->right_recv = sycl::malloc_shared<double>(comms_lr_len, *chunk->ext->device_queue);
-  chunk->top_send = sycl::malloc_shared<double>(comms_tb_len, *chunk->ext->device_queue);
-  chunk->top_recv = sycl::malloc_shared<double>(comms_tb_len, *chunk->ext->device_queue);
-  chunk->bottom_send = sycl::malloc_shared<double>(comms_tb_len, *chunk->ext->device_queue);
-  chunk->bottom_recv = sycl::malloc_shared<double>(comms_tb_len, *chunk->ext->device_queue);
-
-  chunk->ext->reduction_cg_rro = sycl::malloc_shared<double>(1, *chunk->ext->device_queue);
-  chunk->ext->reduction_cg_pw = sycl::malloc_shared<double>(1, *chunk->ext->device_queue);
-  chunk->ext->reduction_cg_rrn = sycl::malloc_shared<double>(1, *chunk->ext->device_queue);
-  chunk->ext->reduction_jacobi_error = sycl::malloc_shared<double>(1, *chunk->ext->device_queue);
-  chunk->ext->reduction_norm = sycl::malloc_shared<double>(1, *chunk->ext->device_queue);
-  chunk->ext->reduction_field_summary = sycl::malloc_shared<Summary>(1, *chunk->ext->device_queue);
+  chunk->density0 = sycl::malloc_device<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
+  chunk->density = sycl::malloc_device<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
+  chunk->energy0 = sycl::malloc_device<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
+  chunk->energy = sycl::malloc_device<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
+  chunk->u = sycl::malloc_device<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
+  chunk->u0 = sycl::malloc_device<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
+  chunk->p = sycl::malloc_device<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
+  chunk->r = sycl::malloc_device<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
+  chunk->mi = sycl::malloc_device<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
+  chunk->w = sycl::malloc_device<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
+  chunk->kx = sycl::malloc_device<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
+  chunk->ky = sycl::malloc_device<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
+  chunk->sd = sycl::malloc_device<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
+  chunk->volume = sycl::malloc_device<double>(chunk->x * chunk->y, *chunk->ext->device_queue);
+  chunk->x_area = sycl::malloc_device<double>((chunk->x + 1) * chunk->y, *chunk->ext->device_queue);
+  chunk->y_area = sycl::malloc_device<double>(chunk->x * (chunk->y + 1), *chunk->ext->device_queue);
+  chunk->cell_x = sycl::malloc_device<double>(chunk->x, *chunk->ext->device_queue);
+  chunk->cell_y = sycl::malloc_device<double>(chunk->y, *chunk->ext->device_queue);
+  chunk->cell_dx = sycl::malloc_device<double>(chunk->x, *chunk->ext->device_queue);
+  chunk->cell_dy = sycl::malloc_device<double>(chunk->y, *chunk->ext->device_queue);
+  chunk->vertex_dx = sycl::malloc_device<double>((chunk->x + 1), *chunk->ext->device_queue);
+  chunk->vertex_dy = sycl::malloc_device<double>((chunk->y + 1), *chunk->ext->device_queue);
+  chunk->vertex_x = sycl::malloc_device<double>((chunk->x + 1), *chunk->ext->device_queue);
+  chunk->vertex_y = sycl::malloc_device<double>((chunk->y + 1), *chunk->ext->device_queue);
+
+  chunk->left_send = sycl::malloc_device<double>(comms_lr_len, *chunk->ext->device_queue);
+  chunk->left_recv = sycl::malloc_device<double>(comms_lr_len, *chunk->ext->device_queue);
+  chunk->right_send = sycl::malloc_device<double>(comms_lr_len, *chunk->ext->device_queue);
+  chunk->right_recv = sycl::malloc_device<double>(comms_lr_len, *chunk->ext->device_queue);
+  chunk->top_send = sycl::malloc_device<double>(comms_tb_len, *chunk->ext->device_queue);
+  chunk->top_recv = sycl::malloc_device<double>(comms_tb_len, *chunk->ext->device_queue);
+  chunk->bottom_send = sycl::malloc_device<double>(comms_tb_len, *chunk->ext->device_queue);
+  chunk->bottom_recv = sycl::malloc_device<double>(comms_tb_len, *chunk->ext->device_queue);
+
+  chunk->ext->reduction_cg_rro = sycl::malloc_device<double>(1, *chunk->ext->device_queue);
+  chunk->ext->reduction_cg_pw = sycl::malloc_device<double>(1, *chunk->ext->device_queue);
+  chunk->ext->reduction_cg_rrn = sycl::malloc_device<double>(1, *chunk->ext->device_queue);
+  chunk->ext->reduction_jacobi_error = sycl::malloc_device<double>(1, *chunk->ext->device_queue);
+  chunk->ext->reduction_norm = sycl::malloc_device<double>(1, *chunk->ext->device_queue);
+  chunk->ext->reduction_field_summary = sycl::malloc_device<Summary>(1, *chunk->ext->device_queue);
 
   allocate_buffer(&(chunk->cg_alphas), settings.max_iters, 1);
   allocate_buffer(&(chunk->cg_betas), settings.max_iters, 1);