From 921430b84fa6d4fd9bd402583c15d2a643825e46 Mon Sep 17 00:00:00 2001 From: Stephane Rigaud Date: Tue, 19 Nov 2024 18:47:47 +0100 Subject: [PATCH 1/4] trim names --- clic/src/opencldevice.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/clic/src/opencldevice.cpp b/clic/src/opencldevice.cpp index e87d0fbd..33979936 100644 --- a/clic/src/opencldevice.cpp +++ b/clic/src/opencldevice.cpp @@ -68,15 +68,19 @@ OpenCLDevice::Ressources::Ressources(const cl_platform_id & platform, const cl_d char _platform_name[256]; clGetPlatformInfo(platform_ptr, CL_PLATFORM_NAME, sizeof(char) * 256, &_platform_name, nullptr); platform_name = std::string(_platform_name); + platform_name.erase(platform_name.find_last_not_of(" ") + 1); char _platform_vendor[256]; clGetPlatformInfo(platform_ptr, CL_PLATFORM_VENDOR, sizeof(char) * 256, &_platform_vendor, nullptr); platform_vendor = std::string(_platform_vendor); + platform_vendor.erase(platform_vendor.find_last_not_of(" ") + 1); char _device_name[256]; clGetDeviceInfo(device_ptr, CL_DEVICE_NAME, sizeof(char) * 256, &_device_name, nullptr); device_name = std::string(_device_name); + device_name.erase(device_name.find_last_not_of(" ") + 1); clGetDeviceInfo(device_ptr, CL_DEVICE_TYPE, sizeof(cl_device_type), &device_type, nullptr); clGetDeviceInfo(device_ptr, CL_DEVICE_IMAGE_SUPPORT, sizeof(cl_bool), &image_support, nullptr); } + OpenCLDevice::Ressources::~Ressources() { if (device_ptr != nullptr) From d83e6d8b9134b443cb949d9d3c4a1dc39a8aabf9 Mon Sep 17 00:00:00 2001 From: Stephane Rigaud Date: Tue, 19 Nov 2024 18:47:54 +0100 Subject: [PATCH 2/4] take latest device --- clic/src/openclbackend.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/clic/src/openclbackend.cpp b/clic/src/openclbackend.cpp index d2c59345..23f7d615 100644 --- a/clic/src/openclbackend.cpp +++ b/clic/src/openclbackend.cpp @@ -92,6 +92,7 @@ OpenCLBackend::initialiseRessources() -> void // explore ressources available std::unordered_map> ressources; + size_t device_counter = 0; cl_uint platformCount = 0; cl_int err = clGetPlatformIDs(0, nullptr, &platformCount); @@ -121,6 +122,7 @@ OpenCLBackend::initialiseRessources() -> void continue; } ressources[platform_id] = deviceIds; + device_counter += deviceCount; } if (ressources.empty()) { @@ -128,6 +130,7 @@ OpenCLBackend::initialiseRessources() -> void } // allocate ressources + device_list_.reserve(device_counter); for (const auto & [platform_id, device_ids] : ressources) { cl_uint num_devices = device_ids.size(); @@ -168,6 +171,7 @@ OpenCLBackend::getDevices(const std::string & type) const -> std::vectorgetDeviceType() == type; }); + filtered_devices.shrink_to_fit(); // Reduce memory usage if the filtered list is smaller return filtered_devices; } @@ -189,7 +193,7 @@ OpenCLBackend::getDevice(const std::string & name, const std::string & type) con } if (!devices.empty()) { - return devices.front(); + return device_list_.back(); } std::cerr << "Warning: Fail to find any OpenCL compatible devices." << std::endl; return nullptr; @@ -209,7 +213,7 @@ OpenCLBackend::getDeviceFromIndex(size_t index, const std::string & type) const } if (!devices.empty()) { - return devices.front(); + return device_list_.back(); } std::cerr << "Warning: Fail to find any OpenCL compatible devices." << std::endl; return nullptr; From 55fa5f78c24f9dd96fc28d527caf4c425341a990 Mon Sep 17 00:00:00 2001 From: Stephane Rigaud Date: Tue, 19 Nov 2024 18:48:08 +0100 Subject: [PATCH 3/4] update tests to use gpu if possible --- tests/core/test_array.cpp | 16 ++++++------ tests/core/test_create_dst.cpp | 22 ++++++++-------- tests/core/test_device.cpp | 18 +++++++++++++ tests/core/test_execute.cpp | 10 ++++---- tests/core/test_image.cpp | 16 ++++++------ tests/tier1/test_absolute.cpp | 2 +- tests/tier1/test_add_image_and_scalar.cpp | 2 +- tests/tier1/test_add_image_weighted.cpp | 2 +- tests/tier1/test_binary_and.cpp | 2 +- tests/tier1/test_binary_edge_detection.cpp | 2 +- tests/tier1/test_binary_inf_sup.cpp | 4 +-- tests/tier1/test_binary_not.cpp | 2 +- tests/tier1/test_binary_or.cpp | 2 +- tests/tier1/test_binary_subtract.cpp | 2 +- tests/tier1/test_binary_sup_inf.cpp | 4 +-- tests/tier1/test_binary_xor.cpp | 2 +- tests/tier1/test_block_enumerate.cpp | 2 +- tests/tier1/test_convolve.cpp | 2 +- tests/tier1/test_copy.cpp | 2 +- tests/tier1/test_copy_horizontal_slice.cpp | 6 ++--- tests/tier1/test_copy_slice.cpp | 10 ++++---- tests/tier1/test_copy_vertical_slice.cpp | 6 ++--- tests/tier1/test_crop.cpp | 2 +- tests/tier1/test_cubic_root.cpp | 2 +- tests/tier1/test_detect_label_edge.cpp | 2 +- tests/tier1/test_dilate.cpp | 8 +++--- tests/tier1/test_dilation.cpp | 2 +- tests/tier1/test_divide_images.cpp | 2 +- tests/tier1/test_divide_scalar_by_image.cpp | 2 +- tests/tier1/test_equal.cpp | 2 +- tests/tier1/test_equal_constant.cpp | 2 +- tests/tier1/test_erode.cpp | 8 +++--- tests/tier1/test_erosion.cpp | 2 +- tests/tier1/test_exponential.cpp | 2 +- tests/tier1/test_flip.cpp | 2 +- tests/tier1/test_gaussian_blur.cpp | 2 +- tests/tier1/test_generate_distance_matrix.cpp | 2 +- tests/tier1/test_gradient_x.cpp | 2 +- tests/tier1/test_gradient_y.cpp | 2 +- tests/tier1/test_gradient_z.cpp | 2 +- tests/tier1/test_greater.cpp | 2 +- tests/tier1/test_greater_constant.cpp | 2 +- tests/tier1/test_greater_or_equal.cpp | 2 +- .../tier1/test_greater_or_equal_constant.cpp | 2 +- tests/tier1/test_laplace.cpp | 8 +++--- tests/tier1/test_local_cross_correlation.cpp | 2 +- tests/tier1/test_logarithm.cpp | 2 +- tests/tier1/test_mask.cpp | 2 +- tests/tier1/test_mask_label.cpp | 2 +- tests/tier1/test_maximum.cpp | 8 +++--- tests/tier1/test_maximum_image_and_scalar.cpp | 2 +- tests/tier1/test_maximum_images.cpp | 2 +- tests/tier1/test_maximum_x_projection.cpp | 2 +- tests/tier1/test_maximum_y_projection.cpp | 2 +- tests/tier1/test_maximum_z_projection.cpp | 2 +- tests/tier1/test_mean.cpp | 8 +++--- tests/tier1/test_mean_x_projection.cpp | 2 +- tests/tier1/test_mean_y_projection.cpp | 2 +- tests/tier1/test_mean_z_projection.cpp | 2 +- tests/tier1/test_median.cpp | 8 +++--- tests/tier1/test_minimum.cpp | 8 +++--- tests/tier1/test_minimum_image_and_scalar.cpp | 2 +- tests/tier1/test_minimum_images.cpp | 2 +- tests/tier1/test_minimum_x_projection.cpp | 2 +- tests/tier1/test_minimum_y_projection.cpp | 2 +- tests/tier1/test_minimum_z_projection.cpp | 2 +- tests/tier1/test_mode.cpp | 8 +++--- tests/tier1/test_modulo_images.cpp | 2 +- .../test_multiply_image_and_position.cpp | 4 +-- .../tier1/test_multiply_image_and_scalar.cpp | 2 +- tests/tier1/test_multiply_images.cpp | 2 +- tests/tier1/test_multiply_matrix.cpp | 2 +- tests/tier1/test_nan_to_num.cpp | 2 +- tests/tier1/test_nonzero_maximum.cpp | 25 +++++++++++++------ tests/tier1/test_nonzero_minimum.cpp | 24 ++++++++++++------ tests/tier1/test_not_equal.cpp | 2 +- tests/tier1/test_not_equal_constant.cpp | 2 +- .../tier1/test_onlyzero_overwrite_maximum.cpp | 8 +++--- tests/tier1/test_paste.cpp | 2 +- tests/tier1/test_power.cpp | 2 +- tests/tier1/test_power_images.cpp | 2 +- tests/tier1/test_range.cpp | 6 ++--- .../test_read_intensities_from_positions.cpp | 2 +- .../tier1/test_read_write_with_positions.cpp | 4 +-- tests/tier1/test_reciprocal.cpp | 2 +- tests/tier1/test_replace_intensities.cpp | 2 +- tests/tier1/test_replace_intensity.cpp | 2 +- tests/tier1/test_set.cpp | 2 +- tests/tier1/test_set_column.cpp | 2 +- tests/tier1/test_set_image_border.cpp | 2 +- .../test_set_nonzero_pixels_to_pixelindex.cpp | 2 +- tests/tier1/test_set_plane.cpp | 2 +- tests/tier1/test_set_ramp.cpp | 6 ++--- tests/tier1/test_set_row.cpp | 2 +- tests/tier1/test_sign.cpp | 2 +- tests/tier1/test_smaller.cpp | 2 +- tests/tier1/test_smaller_constant.cpp | 2 +- tests/tier1/test_smaller_or_equal.cpp | 2 +- .../tier1/test_smaller_or_equal_constant.cpp | 2 +- tests/tier1/test_sobel.cpp | 2 +- tests/tier1/test_square_root.cpp | 2 +- tests/tier1/test_std_z_projection.cpp | 2 +- .../tier1/test_subtract_image_and_scalar.cpp | 2 +- tests/tier1/test_sum_reduction_x.cpp | 2 +- tests/tier1/test_sum_x_projection.cpp | 2 +- tests/tier1/test_sum_y_projection.cpp | 2 +- tests/tier1/test_sum_z_projection.cpp | 2 +- tests/tier1/test_transpose.cpp | 6 ++--- tests/tier1/test_undefined_to_zero.cpp | 2 +- tests/tier1/test_variance.cpp | 8 +++--- tests/tier1/test_where_x.cpp | 6 ++--- .../tier1/test_write_values_to_positions.cpp | 4 +-- tests/tier2/test_absolute_difference.cpp | 2 +- tests/tier2/test_bottom_hat.cpp | 4 +-- tests/tier2/test_clip.cpp | 2 +- tests/tier2/test_closing.cpp | 4 +-- tests/tier2/test_concatenate.cpp | 6 ++--- tests/tier2/test_count_neighbour.cpp | 4 +-- tests/tier2/test_crop_border.cpp | 4 +-- tests/tier2/test_deg_to_rad.cpp | 2 +- tests/tier2/test_detect_maxima.cpp | 4 +-- tests/tier2/test_detect_minima.cpp | 4 +-- tests/tier2/test_difference_of_gaussian.cpp | 2 +- .../test_extend_labeling_via_voronoi.cpp | 2 +- tests/tier2/test_hessian_eigenvalues.cpp | 6 ++--- tests/tier2/test_images_operations.cpp | 6 ++--- tests/tier2/test_invert.cpp | 2 +- tests/tier2/test_label_spots.cpp | 2 +- tests/tier2/test_maximum_all_pixels.cpp | 2 +- tests/tier2/test_minimum_all_pixels.cpp | 2 +- tests/tier2/test_minimum_of_masked_pixels.cpp | 2 +- tests/tier2/test_opening.cpp | 4 +-- tests/tier2/test_rad_deg.cpp | 4 +-- .../test_reduce_labels_to_label_edges.cpp | 2 +- tests/tier2/test_standard_deviation.cpp | 4 +-- tests/tier2/test_sum_all_pixels.cpp | 2 +- tests/tier2/test_top_hat.cpp | 4 +-- tests/tier3/test_bounding_box.cpp | 6 ++--- tests/tier3/test_exclude_labels.cpp | 4 +-- tests/tier3/test_flag_existing_labels.cpp | 2 +- tests/tier3/test_gamma_correction.cpp | 2 +- .../test_generate_binary_overlap_matrix.cpp | 2 +- tests/tier3/test_generate_touch_mat.cpp | 2 +- tests/tier3/test_histogram.cpp | 2 +- tests/tier3/test_jaccard_index.cpp | 4 +-- tests/tier3/test_label_spot_to_pointlist.cpp | 2 +- tests/tier3/test_label_statistics.cpp | 8 +++--- tests/tier3/test_minmax_position.cpp | 4 +-- tests/tier3/test_morphological_chan_vese.cpp | 4 +-- tests/tier4/test_centroids_of_labels.cpp | 2 +- tests/tier4/test_label_bounding_box.cpp | 2 +- tests/tier4/test_label_pixelcount_map.cpp | 2 +- tests/tier4/test_mean_intensity_map.cpp | 2 +- tests/tier4/test_mean_square_error.cpp | 2 +- tests/tier4/test_spots_to_pointlist.cpp | 2 +- tests/tier4/test_threshold_otsu.cpp | 6 ++--- tests/tier5/test_array_comparison.cpp | 2 +- tests/tier5/test_combide_labels.cpp | 2 +- .../test_connected_component_labeling.cpp | 4 +-- tests/tier5/test_filter_labels_by_size.cpp | 2 +- .../tier5/test_reduce_labels_to_centroids.cpp | 2 +- tests/tier6/test_gauss_otsu_labeling.cpp | 2 +- tests/tier6/test_masked_voronoi_labeling.cpp | 2 +- tests/tier6/test_voronoi_labeling.cpp | 2 +- tests/tier7/test_affine_transform.cpp | 4 +-- tests/tier7/test_erode_connected_labels.cpp | 2 +- tests/tier7/test_eroded_otsu_labeling.cpp | 2 +- tests/tier7/test_label_operations.cpp | 8 +++--- tests/tier7/test_rigid_transform.cpp | 4 +-- tests/tier7/test_rotate.cpp | 6 ++--- tests/tier7/test_scale.cpp | 6 ++--- tests/tier7/test_translation.cpp | 2 +- tests/tier7/test_voronoi_otsu_labeling.cpp | 2 +- tests/tier8/test_smooth_connected_labels.cpp | 2 +- tests/tier8/test_smooth_labels.cpp | 2 +- 175 files changed, 339 insertions(+), 304 deletions(-) diff --git a/tests/core/test_array.cpp b/tests/core/test_array.cpp index 203bf32c..0b5856b8 100644 --- a/tests/core/test_array.cpp +++ b/tests/core/test_array.cpp @@ -10,7 +10,7 @@ TEST_P(TestArray, allocate) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); // Create a new Array @@ -40,7 +40,7 @@ TEST_P(TestArray, typeDataMemory) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); // Create a new Array @@ -57,7 +57,7 @@ TEST_P(TestArray, allocateWrite) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); // Write some data to the array @@ -85,7 +85,7 @@ TEST_P(TestArray, readWrite) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); // Create a new Array @@ -117,7 +117,7 @@ TEST_P(TestArray, copyFill) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); // Create a new Array @@ -162,7 +162,7 @@ TEST_P(TestArray, stringCout) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); // Create a new Array @@ -183,7 +183,7 @@ TEST_P(TestArray, regionOperation) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); // Create a new Array @@ -258,7 +258,7 @@ TEST_P(TestArray, throwErrors) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); // Create a new Array diff --git a/tests/core/test_create_dst.cpp b/tests/core/test_create_dst.cpp index 4b45c191..1e57c565 100644 --- a/tests/core/test_create_dst.cpp +++ b/tests/core/test_create_dst.cpp @@ -14,7 +14,7 @@ TEST_P(TestCreate, notNullPtr) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -125,7 +125,7 @@ TEST_P(TestCreate, create_dst) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -158,7 +158,7 @@ TEST_P(TestCreate, create_like) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -190,7 +190,7 @@ TEST_P(TestCreate, create_one) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -222,7 +222,7 @@ TEST_P(TestCreate, create_vector) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -254,7 +254,7 @@ TEST_P(TestCreate, create_xy) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -286,7 +286,7 @@ TEST_P(TestCreate, create_yx) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -318,7 +318,7 @@ TEST_P(TestCreate, create_zy) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -350,7 +350,7 @@ TEST_P(TestCreate, create_yz) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -382,7 +382,7 @@ TEST_P(TestCreate, create_xz) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -413,7 +413,7 @@ TEST_P(TestCreate, create_zx) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/core/test_device.cpp b/tests/core/test_device.cpp index 35222815..a9b78eea 100644 --- a/tests/core/test_device.cpp +++ b/tests/core/test_device.cpp @@ -32,6 +32,24 @@ TEST_P(TestDevice, availableDevices) } +TEST_P(TestDevice, defaultDevice) +{ + std::string param = GetParam(); + cle::BackendManager::getInstance().setBackend(param); + + auto list = cle::BackendManager::getInstance().getBackend().getDevicesList("all"); + for (auto &&i : list) + { + std::cout << i << " "; + } + std::cout << std::endl; + + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + device->setWaitToFinish(true); + std::cout << device->getName() << std::endl; +} + + TEST_P(TestDevice, type) { std::string param = GetParam(); diff --git a/tests/core/test_execute.cpp b/tests/core/test_execute.cpp index 671e931e..05a8d04f 100644 --- a/tests/core/test_execute.cpp +++ b/tests/core/test_execute.cpp @@ -11,7 +11,7 @@ TEST_P(TestExecution, parameterType) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); // Test assignment of cle::Array::Pointer @@ -34,7 +34,7 @@ TEST_P(TestExecution, parameterList) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto src = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -57,7 +57,7 @@ TEST_P(TestExecution, rangeArray) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); size_t width = 5, height = 10, depth = 15; @@ -87,7 +87,7 @@ TEST_P(TestExecution, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto arr_a = cle::Array::create(10, 1, 1, 1, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -130,7 +130,7 @@ TEST_P(TestExecution, executeNative) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto arr_a = cle::Array::create(10, 1, 1, 1, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/core/test_image.cpp b/tests/core/test_image.cpp index 1535e493..7377e2ec 100644 --- a/tests/core/test_image.cpp +++ b/tests/core/test_image.cpp @@ -12,7 +12,7 @@ TEST_P(TestArray, allocate) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); @@ -45,7 +45,7 @@ TEST_P(TestArray, typeDataMemory) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); @@ -65,7 +65,7 @@ TEST_P(TestArray, allocateWrite) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); @@ -96,7 +96,7 @@ TEST_P(TestArray, readWrite) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); @@ -131,7 +131,7 @@ TEST_P(TestArray, copyFill) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); @@ -179,7 +179,7 @@ TEST_P(TestArray, stringCout) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); @@ -203,7 +203,7 @@ TEST_P(TestArray, regionOperation) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); @@ -281,7 +281,7 @@ TEST_P(TestArray, throwErrors) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); diff --git a/tests/tier1/test_absolute.cpp b/tests/tier1/test_absolute.cpp index 5b56817e..5471995f 100644 --- a/tests/tier1/test_absolute.cpp +++ b/tests/tier1/test_absolute.cpp @@ -23,7 +23,7 @@ TEST_P(TestAbsolute, execute) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_add_image_and_scalar.cpp b/tests/tier1/test_add_image_and_scalar.cpp index ea971a0e..abd1c4c2 100644 --- a/tests/tier1/test_add_image_and_scalar.cpp +++ b/tests/tier1/test_add_image_and_scalar.cpp @@ -24,7 +24,7 @@ TEST_P(TestAddImageAndScalar, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_add_image_weighted.cpp b/tests/tier1/test_add_image_weighted.cpp index 5119d608..40847fbb 100644 --- a/tests/tier1/test_add_image_weighted.cpp +++ b/tests/tier1/test_add_image_weighted.cpp @@ -29,7 +29,7 @@ TEST_P(TestAddImagesWeighted, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_binary_and.cpp b/tests/tier1/test_binary_and.cpp index 8e936ac7..8ae3ce31 100644 --- a/tests/tier1/test_binary_and.cpp +++ b/tests/tier1/test_binary_and.cpp @@ -28,7 +28,7 @@ TEST_P(TestBinaryAND, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(10, 5, 3, 3, cle::dType::UINT8, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_binary_edge_detection.cpp b/tests/tier1/test_binary_edge_detection.cpp index 1ad721ad..84b8220d 100644 --- a/tests/tier1/test_binary_edge_detection.cpp +++ b/tests/tier1/test_binary_edge_detection.cpp @@ -21,7 +21,7 @@ TEST_P(TestBinaryEdgeDetection, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 5, 3, 3, cle::dType::UINT8, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_binary_inf_sup.cpp b/tests/tier1/test_binary_inf_sup.cpp index c33fe3f7..f86fc653 100644 --- a/tests/tier1/test_binary_inf_sup.cpp +++ b/tests/tier1/test_binary_inf_sup.cpp @@ -64,7 +64,7 @@ TEST_P(TestBinaryInfSup, infsup_2d) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(14, 14, 1, 2, cle::dType::BINARY, cle::mType::BUFFER, device); @@ -84,7 +84,7 @@ TEST_P(TestBinaryInfSup, infsup_3d) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 10, 5, 3, cle::dType::BINARY, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_binary_not.cpp b/tests/tier1/test_binary_not.cpp index dd2a293e..b3b5a952 100644 --- a/tests/tier1/test_binary_not.cpp +++ b/tests/tier1/test_binary_not.cpp @@ -31,7 +31,7 @@ TEST_P(TestBinaryNOT, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::UINT8, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_binary_or.cpp b/tests/tier1/test_binary_or.cpp index b3aad832..54d7bbe6 100644 --- a/tests/tier1/test_binary_or.cpp +++ b/tests/tier1/test_binary_or.cpp @@ -28,7 +28,7 @@ TEST_P(TestBinaryOR, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(10, 5, 3, 3, cle::dType::UINT8, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_binary_subtract.cpp b/tests/tier1/test_binary_subtract.cpp index ece27464..244f0a5a 100644 --- a/tests/tier1/test_binary_subtract.cpp +++ b/tests/tier1/test_binary_subtract.cpp @@ -31,7 +31,7 @@ TEST_P(TestBinarySubtract, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(10, 5, 3, 3, cle::dType::UINT8, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_binary_sup_inf.cpp b/tests/tier1/test_binary_sup_inf.cpp index 35ee9ff1..325af13a 100644 --- a/tests/tier1/test_binary_sup_inf.cpp +++ b/tests/tier1/test_binary_sup_inf.cpp @@ -67,7 +67,7 @@ TEST_P(TestBinarySupInf, supinf_2d) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(14, 14, 1, 2, cle::dType::BINARY, cle::mType::BUFFER, device); @@ -87,7 +87,7 @@ TEST_P(TestBinarySupInf, supinf_3d) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 10, 5, 3, cle::dType::BINARY, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_binary_xor.cpp b/tests/tier1/test_binary_xor.cpp index db4375e3..2a03fdf4 100644 --- a/tests/tier1/test_binary_xor.cpp +++ b/tests/tier1/test_binary_xor.cpp @@ -28,7 +28,7 @@ TEST_P(TestBinaryXOR, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(10, 5, 3, 3, cle::dType::UINT8, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_block_enumerate.cpp b/tests/tier1/test_block_enumerate.cpp index ad5637f6..839ed7a5 100644 --- a/tests/tier1/test_block_enumerate.cpp +++ b/tests/tier1/test_block_enumerate.cpp @@ -34,7 +34,7 @@ TEST_P(TestBlockEnumerate, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); int blocksize = 4; diff --git a/tests/tier1/test_convolve.cpp b/tests/tier1/test_convolve.cpp index 518e37ba..904e3ba4 100644 --- a/tests/tier1/test_convolve.cpp +++ b/tests/tier1/test_convolve.cpp @@ -16,7 +16,7 @@ TEST_P(TestConvolve, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(4, 4, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_copy.cpp b/tests/tier1/test_copy.cpp index 07af276f..cb669cbc 100644 --- a/tests/tier1/test_copy.cpp +++ b/tests/tier1/test_copy.cpp @@ -22,7 +22,7 @@ TEST_P(TestCopy, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_copy_horizontal_slice.cpp b/tests/tier1/test_copy_horizontal_slice.cpp index 8e31ae6d..367bad7c 100644 --- a/tests/tier1/test_copy_horizontal_slice.cpp +++ b/tests/tier1/test_copy_horizontal_slice.cpp @@ -14,7 +14,7 @@ TEST_P(TestCopyHorizontalSlice, executeFrom) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(2, 2, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -38,7 +38,7 @@ TEST_P(TestCopyHorizontalSlice, executeTo) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(2, 2, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -64,7 +64,7 @@ TEST_P(TestCopyHorizontalSlice, executeIMG) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(3, 3, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_copy_slice.cpp b/tests/tier1/test_copy_slice.cpp index 6cc2a2bc..8c0caec8 100644 --- a/tests/tier1/test_copy_slice.cpp +++ b/tests/tier1/test_copy_slice.cpp @@ -14,7 +14,7 @@ TEST_P(TestCopySlice, executeCopySliceFrom) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(2, 2, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -37,7 +37,7 @@ TEST_P(TestCopySlice, executeCopySliceTo) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(2, 2, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -60,7 +60,7 @@ TEST_P(TestCopySlice, executeCopySliceToWithOneSlice) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(3, 2, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -83,7 +83,7 @@ TEST_P(TestCopySlice, executeCopySliceMinX) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(4, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -106,7 +106,7 @@ TEST_P(TestCopySlice, executeCopySliceMinY) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(1, 4, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_copy_vertical_slice.cpp b/tests/tier1/test_copy_vertical_slice.cpp index 067334af..e2ecd8b1 100644 --- a/tests/tier1/test_copy_vertical_slice.cpp +++ b/tests/tier1/test_copy_vertical_slice.cpp @@ -14,7 +14,7 @@ TEST_P(TestCopyVerticalSlice, executeFrom) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(2, 2, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -38,7 +38,7 @@ TEST_P(TestCopyVerticalSlice, executeTo) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(2, 2, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -63,7 +63,7 @@ TEST_P(TestCopyVerticalSlice, executeIMG) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(3, 3, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_crop.cpp b/tests/tier1/test_crop.cpp index 2e40ae03..67ccec24 100644 --- a/tests/tier1/test_crop.cpp +++ b/tests/tier1/test_crop.cpp @@ -22,7 +22,7 @@ TEST_P(testCrop, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_cubic_root.cpp b/tests/tier1/test_cubic_root.cpp index 0940e5f6..a4c2f95f 100644 --- a/tests/tier1/test_cubic_root.cpp +++ b/tests/tier1/test_cubic_root.cpp @@ -23,7 +23,7 @@ TEST_P(TestCubicRoot, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(3, 3, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_detect_label_edge.cpp b/tests/tier1/test_detect_label_edge.cpp index c4d25bd5..aae9291b 100644 --- a/tests/tier1/test_detect_label_edge.cpp +++ b/tests/tier1/test_detect_label_edge.cpp @@ -15,7 +15,7 @@ TEST_P(TestDetectLabelEdge, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::UINT8, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_dilate.cpp b/tests/tier1/test_dilate.cpp index fb7f7bd3..d914ef18 100644 --- a/tests/tier1/test_dilate.cpp +++ b/tests/tier1/test_dilate.cpp @@ -28,7 +28,7 @@ TEST_P(TestDilate, executeDeprecatedBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -47,7 +47,7 @@ TEST_P(TestDilate, executeDeprecatedSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -66,7 +66,7 @@ TEST_P(TestDilate, executeBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -85,7 +85,7 @@ TEST_P(TestDilate, executeSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_dilation.cpp b/tests/tier1/test_dilation.cpp index 7b65adb1..fe5877d3 100644 --- a/tests/tier1/test_dilation.cpp +++ b/tests/tier1/test_dilation.cpp @@ -23,7 +23,7 @@ TEST_P(TestDilate, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_divide_images.cpp b/tests/tier1/test_divide_images.cpp index 4d5bf993..d15a280f 100644 --- a/tests/tier1/test_divide_images.cpp +++ b/tests/tier1/test_divide_images.cpp @@ -26,7 +26,7 @@ TEST_P(TestDivideImages, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_divide_scalar_by_image.cpp b/tests/tier1/test_divide_scalar_by_image.cpp index 0dd14241..0e546a72 100644 --- a/tests/tier1/test_divide_scalar_by_image.cpp +++ b/tests/tier1/test_divide_scalar_by_image.cpp @@ -24,7 +24,7 @@ TEST_P(TestDivideScalarAndImage, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_equal.cpp b/tests/tier1/test_equal.cpp index 108dbd33..af82730c 100644 --- a/tests/tier1/test_equal.cpp +++ b/tests/tier1/test_equal.cpp @@ -29,7 +29,7 @@ TEST_P(TestEqual, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(10, 5, 3, 3, cle::dType::INT8, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_equal_constant.cpp b/tests/tier1/test_equal_constant.cpp index f6fbe75b..ed949ff2 100644 --- a/tests/tier1/test_equal_constant.cpp +++ b/tests/tier1/test_equal_constant.cpp @@ -25,7 +25,7 @@ TEST_P(TestEqualConstant, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::INT8, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_erode.cpp b/tests/tier1/test_erode.cpp index c8987f3a..a59b0902 100644 --- a/tests/tier1/test_erode.cpp +++ b/tests/tier1/test_erode.cpp @@ -35,7 +35,7 @@ TEST_P(TestErode, executeDeprecatedBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -54,7 +54,7 @@ TEST_P(TestErode, executeDeprecatedSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -73,7 +73,7 @@ TEST_P(TestErode, executeBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -92,7 +92,7 @@ TEST_P(TestErode, executeSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_erosion.cpp b/tests/tier1/test_erosion.cpp index 1d109782..27377b07 100644 --- a/tests/tier1/test_erosion.cpp +++ b/tests/tier1/test_erosion.cpp @@ -23,7 +23,7 @@ TEST_P(TestErosion, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_exponential.cpp b/tests/tier1/test_exponential.cpp index a6bb3da0..5b245489 100644 --- a/tests/tier1/test_exponential.cpp +++ b/tests/tier1/test_exponential.cpp @@ -23,7 +23,7 @@ TEST_P(TestExponential, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_flip.cpp b/tests/tier1/test_flip.cpp index 54ceee87..76074a30 100644 --- a/tests/tier1/test_flip.cpp +++ b/tests/tier1/test_flip.cpp @@ -15,7 +15,7 @@ TEST_P(testFlip, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_gaussian_blur.cpp b/tests/tier1/test_gaussian_blur.cpp index e0cb3cc7..1b47d5db 100644 --- a/tests/tier1/test_gaussian_blur.cpp +++ b/tests/tier1/test_gaussian_blur.cpp @@ -28,7 +28,7 @@ TEST_P(TestGaussianBlur, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::INT32, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_generate_distance_matrix.cpp b/tests/tier1/test_generate_distance_matrix.cpp index 0b9e5730..43d2b863 100644 --- a/tests/tier1/test_generate_distance_matrix.cpp +++ b/tests/tier1/test_generate_distance_matrix.cpp @@ -17,7 +17,7 @@ TEST_P(TestGenerateDistanceMatrix, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_gradient_x.cpp b/tests/tier1/test_gradient_x.cpp index 04c3afbe..8e52b6a2 100644 --- a/tests/tier1/test_gradient_x.cpp +++ b/tests/tier1/test_gradient_x.cpp @@ -15,7 +15,7 @@ TEST_P(TestGradientX, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(9, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_gradient_y.cpp b/tests/tier1/test_gradient_y.cpp index 36f55468..9b754507 100644 --- a/tests/tier1/test_gradient_y.cpp +++ b/tests/tier1/test_gradient_y.cpp @@ -15,7 +15,7 @@ TEST_P(TestGradientY, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(3, 3, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_gradient_z.cpp b/tests/tier1/test_gradient_z.cpp index b33b0095..200cff91 100644 --- a/tests/tier1/test_gradient_z.cpp +++ b/tests/tier1/test_gradient_z.cpp @@ -18,7 +18,7 @@ TEST_P(TestGradientZ, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(3, 3, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_greater.cpp b/tests/tier1/test_greater.cpp index 4b2e88ba..c3b451f9 100644 --- a/tests/tier1/test_greater.cpp +++ b/tests/tier1/test_greater.cpp @@ -29,7 +29,7 @@ TEST_P(TestGreater, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(10, 5, 3, 3, cle::dType::INT8, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_greater_constant.cpp b/tests/tier1/test_greater_constant.cpp index 56b776b3..6547d331 100644 --- a/tests/tier1/test_greater_constant.cpp +++ b/tests/tier1/test_greater_constant.cpp @@ -26,7 +26,7 @@ TEST_P(TestGreaterConstant, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::INT8, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_greater_or_equal.cpp b/tests/tier1/test_greater_or_equal.cpp index 5f5ad605..ec41dbad 100644 --- a/tests/tier1/test_greater_or_equal.cpp +++ b/tests/tier1/test_greater_or_equal.cpp @@ -29,7 +29,7 @@ TEST_P(TestGreaterEqual, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(10, 5, 3, 3, cle::dType::INT8, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_greater_or_equal_constant.cpp b/tests/tier1/test_greater_or_equal_constant.cpp index d90997be..833efc45 100644 --- a/tests/tier1/test_greater_or_equal_constant.cpp +++ b/tests/tier1/test_greater_or_equal_constant.cpp @@ -26,7 +26,7 @@ TEST_P(TestGreaterEqualConstant, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::INT8, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_laplace.cpp b/tests/tier1/test_laplace.cpp index 0ab0f490..f355fd14 100644 --- a/tests/tier1/test_laplace.cpp +++ b/tests/tier1/test_laplace.cpp @@ -25,7 +25,7 @@ TEST_P(TestLaplace, executeDeprecatedBox) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(4, 3, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -47,7 +47,7 @@ TEST_P(TestLaplace, executeDeprecatedSphere) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -69,7 +69,7 @@ TEST_P(TestLaplace, executeBox) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(4, 3, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -90,7 +90,7 @@ TEST_P(TestLaplace, executeSphere) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_local_cross_correlation.cpp b/tests/tier1/test_local_cross_correlation.cpp index 7b5ca097..bca19107 100644 --- a/tests/tier1/test_local_cross_correlation.cpp +++ b/tests/tier1/test_local_cross_correlation.cpp @@ -17,7 +17,7 @@ TEST_P(TestLocalCrossCorrelation, execute) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(3, 3, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_logarithm.cpp b/tests/tier1/test_logarithm.cpp index b1f419fb..72f47504 100644 --- a/tests/tier1/test_logarithm.cpp +++ b/tests/tier1/test_logarithm.cpp @@ -23,7 +23,7 @@ TEST_P(TestLogarithm, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_mask.cpp b/tests/tier1/test_mask.cpp index 44f12fd7..8303f082 100644 --- a/tests/tier1/test_mask.cpp +++ b/tests/tier1/test_mask.cpp @@ -30,7 +30,7 @@ TEST_P(TestMask, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_mask_label.cpp b/tests/tier1/test_mask_label.cpp index 954d2c56..d0f84a6c 100644 --- a/tests/tier1/test_mask_label.cpp +++ b/tests/tier1/test_mask_label.cpp @@ -16,7 +16,7 @@ TEST_P(TestMaskLabel, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_maximum.cpp b/tests/tier1/test_maximum.cpp index 8d1b0162..35ab3a15 100644 --- a/tests/tier1/test_maximum.cpp +++ b/tests/tier1/test_maximum.cpp @@ -34,7 +34,7 @@ TEST_P(TestMaximum, executeDeprecatedBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -53,7 +53,7 @@ TEST_P(TestMaximum, executeDeprecatedSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -72,7 +72,7 @@ TEST_P(TestMaximum, executeBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -91,7 +91,7 @@ TEST_P(TestMaximum, executeSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_maximum_image_and_scalar.cpp b/tests/tier1/test_maximum_image_and_scalar.cpp index c1682dde..bfe66553 100644 --- a/tests/tier1/test_maximum_image_and_scalar.cpp +++ b/tests/tier1/test_maximum_image_and_scalar.cpp @@ -32,7 +32,7 @@ TEST_P(TestMaximumImageAndScalar, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_maximum_images.cpp b/tests/tier1/test_maximum_images.cpp index 6a0bddc1..c78bd7a5 100644 --- a/tests/tier1/test_maximum_images.cpp +++ b/tests/tier1/test_maximum_images.cpp @@ -26,7 +26,7 @@ TEST_P(TestMaximumImages, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_maximum_x_projection.cpp b/tests/tier1/test_maximum_x_projection.cpp index 61ecf996..4b4fe39c 100644 --- a/tests/tier1/test_maximum_x_projection.cpp +++ b/tests/tier1/test_maximum_x_projection.cpp @@ -27,7 +27,7 @@ TEST_P(TestMaximumProjectionX, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_maximum_y_projection.cpp b/tests/tier1/test_maximum_y_projection.cpp index 158d78ff..bf297ae3 100644 --- a/tests/tier1/test_maximum_y_projection.cpp +++ b/tests/tier1/test_maximum_y_projection.cpp @@ -32,7 +32,7 @@ TEST_P(TestMaximumProjectionY, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_maximum_z_projection.cpp b/tests/tier1/test_maximum_z_projection.cpp index 60fb57b4..6e7cd675 100644 --- a/tests/tier1/test_maximum_z_projection.cpp +++ b/tests/tier1/test_maximum_z_projection.cpp @@ -29,7 +29,7 @@ TEST_P(TestMaximumProjectionZ, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_mean.cpp b/tests/tier1/test_mean.cpp index b4cac093..3e518ed5 100644 --- a/tests/tier1/test_mean.cpp +++ b/tests/tier1/test_mean.cpp @@ -32,7 +32,7 @@ TEST_P(TestMean, executeDeprecatedBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -51,7 +51,7 @@ TEST_P(TestMean, executeDeprecatedSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -70,7 +70,7 @@ TEST_P(TestMean, executeBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -89,7 +89,7 @@ TEST_P(TestMean, executeSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_mean_x_projection.cpp b/tests/tier1/test_mean_x_projection.cpp index 9ebc1d23..e811073a 100644 --- a/tests/tier1/test_mean_x_projection.cpp +++ b/tests/tier1/test_mean_x_projection.cpp @@ -23,7 +23,7 @@ TEST_P(TestMeanProjectionX, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 10, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_mean_y_projection.cpp b/tests/tier1/test_mean_y_projection.cpp index fe360dd1..aec72df5 100644 --- a/tests/tier1/test_mean_y_projection.cpp +++ b/tests/tier1/test_mean_y_projection.cpp @@ -23,7 +23,7 @@ TEST_P(TestMeanProjectionY, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 10, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_mean_z_projection.cpp b/tests/tier1/test_mean_z_projection.cpp index d4c0f83e..ba1b85cb 100644 --- a/tests/tier1/test_mean_z_projection.cpp +++ b/tests/tier1/test_mean_z_projection.cpp @@ -26,7 +26,7 @@ TEST_P(TestMeanProjectionZ, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 10, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_median.cpp b/tests/tier1/test_median.cpp index 87323489..a1421302 100644 --- a/tests/tier1/test_median.cpp +++ b/tests/tier1/test_median.cpp @@ -22,7 +22,7 @@ TEST_P(TestMedian, executeDeprecatedBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -41,7 +41,7 @@ TEST_P(TestMedian, executeDeprecatedSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -60,7 +60,7 @@ TEST_P(TestMedian, executeBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -79,7 +79,7 @@ TEST_P(TestMedian, executeSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_minimum.cpp b/tests/tier1/test_minimum.cpp index ee988a9a..46e043fe 100644 --- a/tests/tier1/test_minimum.cpp +++ b/tests/tier1/test_minimum.cpp @@ -34,7 +34,7 @@ TEST_P(TestMinimum, executeDeprecatedBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -54,7 +54,7 @@ TEST_P(TestMinimum, executeDeprecatedSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -74,7 +74,7 @@ TEST_P(TestMinimum, executeBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -94,7 +94,7 @@ TEST_P(TestMinimum, executeSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_minimum_image_and_scalar.cpp b/tests/tier1/test_minimum_image_and_scalar.cpp index f019439d..bd4eedfa 100644 --- a/tests/tier1/test_minimum_image_and_scalar.cpp +++ b/tests/tier1/test_minimum_image_and_scalar.cpp @@ -32,7 +32,7 @@ TEST_P(TestMaximumImageAndScalar, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_minimum_images.cpp b/tests/tier1/test_minimum_images.cpp index 452b758a..02d9b329 100644 --- a/tests/tier1/test_minimum_images.cpp +++ b/tests/tier1/test_minimum_images.cpp @@ -26,7 +26,7 @@ TEST_P(TestMinimumImages, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_minimum_x_projection.cpp b/tests/tier1/test_minimum_x_projection.cpp index 930f40d1..f5bdd60d 100644 --- a/tests/tier1/test_minimum_x_projection.cpp +++ b/tests/tier1/test_minimum_x_projection.cpp @@ -27,7 +27,7 @@ TEST_P(TestMinimumProjectionX, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_minimum_y_projection.cpp b/tests/tier1/test_minimum_y_projection.cpp index ac0b576a..e281bd1e 100644 --- a/tests/tier1/test_minimum_y_projection.cpp +++ b/tests/tier1/test_minimum_y_projection.cpp @@ -30,7 +30,7 @@ TEST_P(TestMinimumProjectionY, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_minimum_z_projection.cpp b/tests/tier1/test_minimum_z_projection.cpp index 452c804a..3919658e 100644 --- a/tests/tier1/test_minimum_z_projection.cpp +++ b/tests/tier1/test_minimum_z_projection.cpp @@ -27,7 +27,7 @@ TEST_P(TestMinimumProjectionZ, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_mode.cpp b/tests/tier1/test_mode.cpp index 974f267c..d58c14df 100644 --- a/tests/tier1/test_mode.cpp +++ b/tests/tier1/test_mode.cpp @@ -22,7 +22,7 @@ TEST_P(TestMode, executeDeprecatedBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 6, 1, 3, cle::dType::UINT8, cle::mType::BUFFER, device); @@ -41,7 +41,7 @@ TEST_P(TestMode, executeDeprecatedSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 6, 1, 3, cle::dType::UINT8, cle::mType::BUFFER, device); @@ -61,7 +61,7 @@ TEST_P(TestMode, executeBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 6, 1, 3, cle::dType::UINT8, cle::mType::BUFFER, device); @@ -80,7 +80,7 @@ TEST_P(TestMode, executeSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 6, 1, 3, cle::dType::UINT8, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_modulo_images.cpp b/tests/tier1/test_modulo_images.cpp index 77b73e18..0f6e3ef0 100644 --- a/tests/tier1/test_modulo_images.cpp +++ b/tests/tier1/test_modulo_images.cpp @@ -26,7 +26,7 @@ TEST_P(TestModuloImages, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_multiply_image_and_position.cpp b/tests/tier1/test_multiply_image_and_position.cpp index 7c88b0b5..4ae39aa1 100644 --- a/tests/tier1/test_multiply_image_and_position.cpp +++ b/tests/tier1/test_multiply_image_and_position.cpp @@ -15,7 +15,7 @@ TEST_P(TestMultiplyPixelAndCoord, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 3, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -34,7 +34,7 @@ TEST_P(TestMultiplyPixelAndCoord, returnType) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); for (cle::dType type : { cle::dType::UINT8, diff --git a/tests/tier1/test_multiply_image_and_scalar.cpp b/tests/tier1/test_multiply_image_and_scalar.cpp index ff7bce98..85f63d05 100644 --- a/tests/tier1/test_multiply_image_and_scalar.cpp +++ b/tests/tier1/test_multiply_image_and_scalar.cpp @@ -24,7 +24,7 @@ TEST_P(TestMultiplyImageAndScalar, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_multiply_images.cpp b/tests/tier1/test_multiply_images.cpp index fa366ef6..bee32ba9 100644 --- a/tests/tier1/test_multiply_images.cpp +++ b/tests/tier1/test_multiply_images.cpp @@ -26,7 +26,7 @@ TEST_P(TestMultiplyImages, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_multiply_matrix.cpp b/tests/tier1/test_multiply_matrix.cpp index 1b1036a6..18ac25b9 100644 --- a/tests/tier1/test_multiply_matrix.cpp +++ b/tests/tier1/test_multiply_matrix.cpp @@ -16,7 +16,7 @@ TEST_P(TestMultiplyMatrix, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(3, 4, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_nan_to_num.cpp b/tests/tier1/test_nan_to_num.cpp index 3dea80d0..0f3193aa 100644 --- a/tests/tier1/test_nan_to_num.cpp +++ b/tests/tier1/test_nan_to_num.cpp @@ -19,7 +19,7 @@ TEST_P(TestNanToNum, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_nonzero_maximum.cpp b/tests/tier1/test_nonzero_maximum.cpp index 2e43ad33..83fec8ff 100644 --- a/tests/tier1/test_nonzero_maximum.cpp +++ b/tests/tier1/test_nonzero_maximum.cpp @@ -24,14 +24,17 @@ TEST_P(TestNonzeroMaximum, executeDeprecatedBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); gpu_input->writeFrom(input.data()); auto flag = cle::Array::create(1, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); flag->fill(1); - auto gpu_output = cle::tier1::nonzero_maximum_box_func(device, gpu_input, flag, nullptr); + auto gpu_output = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); + gpu_output->fill(0); + + cle::tier1::nonzero_maximum_box_func(device, gpu_input, flag, gpu_output); gpu_output->readTo(output.data()); for (int i = 0; i < output.size(); i++) @@ -44,15 +47,17 @@ TEST_P(TestNonzeroMaximum, executeDeprecatedSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); gpu_input->writeFrom(input.data()); auto flag = cle::Array::create(1, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); flag->fill(1); + auto gpu_output = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); + gpu_output->fill(0); - auto gpu_output = cle::tier1::nonzero_maximum_diamond_func(device, gpu_input, flag, nullptr); + cle::tier1::nonzero_maximum_diamond_func(device, gpu_input, flag, gpu_output); gpu_output->readTo(output.data()); for (int i = 0; i < output.size(); i++) @@ -66,14 +71,16 @@ TEST_P(TestNonzeroMaximum, executeBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); gpu_input->writeFrom(input.data()); auto flag = cle::Array::create(1, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); flag->fill(1); - auto gpu_output = cle::tier1::nonzero_maximum_func(device, gpu_input, flag, nullptr, "box"); + auto gpu_output = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); + gpu_output->fill(0); + cle::tier1::nonzero_maximum_func(device, gpu_input, flag, gpu_output, "box"); gpu_output->readTo(output.data()); for (int i = 0; i < output.size(); i++) @@ -86,15 +93,17 @@ TEST_P(TestNonzeroMaximum, executeSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); gpu_input->writeFrom(input.data()); auto flag = cle::Array::create(1, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); flag->fill(1); + auto gpu_output = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); + gpu_output->fill(0); - auto gpu_output = cle::tier1::nonzero_maximum_func(device, gpu_input, flag, nullptr, "sphere"); + cle::tier1::nonzero_maximum_func(device, gpu_input, flag, gpu_output, "sphere"); gpu_output->readTo(output.data()); for (int i = 0; i < output.size(); i++) diff --git a/tests/tier1/test_nonzero_minimum.cpp b/tests/tier1/test_nonzero_minimum.cpp index baf7841d..1f10b9f6 100644 --- a/tests/tier1/test_nonzero_minimum.cpp +++ b/tests/tier1/test_nonzero_minimum.cpp @@ -25,15 +25,17 @@ TEST_P(TestNonzeroMinimum, executeDeprecatedBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); gpu_input->writeFrom(input.data()); auto flag = cle::Array::create(1, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); flag->fill(1); + auto gpu_output = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); + gpu_output->fill(0); - auto gpu_output = cle::tier1::nonzero_minimum_box_func(device, gpu_input, flag, nullptr); + cle::tier1::nonzero_minimum_box_func(device, gpu_input, flag, gpu_output); gpu_output->readTo(output.data()); for (int i = 0; i < output.size(); i++) @@ -46,15 +48,17 @@ TEST_P(TestNonzeroMinimum, executeDeprecatedDiamond) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); gpu_input->writeFrom(input.data()); auto flag = cle::Array::create(1, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); flag->fill(1); + auto gpu_output = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); + gpu_output->fill(0); - auto gpu_output = cle::tier1::nonzero_minimum_diamond_func(device, gpu_input, flag, nullptr); + cle::tier1::nonzero_minimum_diamond_func(device, gpu_input, flag, gpu_output); gpu_output->readTo(output.data()); for (int i = 0; i < output.size(); i++) @@ -68,15 +72,17 @@ TEST_P(TestNonzeroMinimum, executeBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); gpu_input->writeFrom(input.data()); auto flag = cle::Array::create(1, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); flag->fill(1); + auto gpu_output = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); + gpu_output->fill(0); - auto gpu_output = cle::tier1::nonzero_minimum_func(device, gpu_input, flag, nullptr, "box"); + cle::tier1::nonzero_minimum_func(device, gpu_input, flag, gpu_output, "box"); gpu_output->readTo(output.data()); for (int i = 0; i < output.size(); i++) @@ -89,15 +95,17 @@ TEST_P(TestNonzeroMinimum, executeSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); gpu_input->writeFrom(input.data()); auto flag = cle::Array::create(1, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); flag->fill(1); + auto gpu_output = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); + gpu_output->fill(0); - auto gpu_output = cle::tier1::nonzero_minimum_func(device, gpu_input, flag, nullptr, "sphere"); + cle::tier1::nonzero_minimum_func(device, gpu_input, flag, gpu_output, "sphere"); gpu_output->readTo(output.data()); for (int i = 0; i < output.size(); i++) diff --git a/tests/tier1/test_not_equal.cpp b/tests/tier1/test_not_equal.cpp index d3d711a7..b7c5821d 100644 --- a/tests/tier1/test_not_equal.cpp +++ b/tests/tier1/test_not_equal.cpp @@ -29,7 +29,7 @@ TEST_P(TestNotEqual, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(10, 5, 3, 3, cle::dType::INT8, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_not_equal_constant.cpp b/tests/tier1/test_not_equal_constant.cpp index 4fa0c419..6493ef26 100644 --- a/tests/tier1/test_not_equal_constant.cpp +++ b/tests/tier1/test_not_equal_constant.cpp @@ -25,7 +25,7 @@ TEST_P(TestNotEqualConstant, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::INT8, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_onlyzero_overwrite_maximum.cpp b/tests/tier1/test_onlyzero_overwrite_maximum.cpp index 8e517d57..e0cbe529 100644 --- a/tests/tier1/test_onlyzero_overwrite_maximum.cpp +++ b/tests/tier1/test_onlyzero_overwrite_maximum.cpp @@ -25,7 +25,7 @@ TEST_P(TestOnlyzeroOverwriteMaximum, executeDeprecatedBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -46,7 +46,7 @@ TEST_P(TestOnlyzeroOverwriteMaximum, executeDeprecatedSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -67,7 +67,7 @@ TEST_P(TestOnlyzeroOverwriteMaximum, executeBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -88,7 +88,7 @@ TEST_P(TestOnlyzeroOverwriteMaximum, executeSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_paste.cpp b/tests/tier1/test_paste.cpp index 96b73788..5c2c6618 100644 --- a/tests/tier1/test_paste.cpp +++ b/tests/tier1/test_paste.cpp @@ -16,7 +16,7 @@ TEST_P(TestPaste, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(4, 4, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_power.cpp b/tests/tier1/test_power.cpp index 49fb9c57..43af628e 100644 --- a/tests/tier1/test_power.cpp +++ b/tests/tier1/test_power.cpp @@ -24,7 +24,7 @@ TEST_P(TestPower, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_power_images.cpp b/tests/tier1/test_power_images.cpp index 55596fdf..70fb7ae2 100644 --- a/tests/tier1/test_power_images.cpp +++ b/tests/tier1/test_power_images.cpp @@ -26,7 +26,7 @@ TEST_P(TestPowerImages, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_range.cpp b/tests/tier1/test_range.cpp index 81943cb9..68e6acf8 100644 --- a/tests/tier1/test_range.cpp +++ b/tests/tier1/test_range.cpp @@ -18,7 +18,7 @@ TEST_P(TestRange, executeVertical) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 6, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -40,7 +40,7 @@ TEST_P(TestRange, executeDiag) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 6, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -62,7 +62,7 @@ TEST_P(TestRange, executeNegative) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 6, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_read_intensities_from_positions.cpp b/tests/tier1/test_read_intensities_from_positions.cpp index ff9a9c99..ce702a02 100644 --- a/tests/tier1/test_read_intensities_from_positions.cpp +++ b/tests/tier1/test_read_intensities_from_positions.cpp @@ -16,7 +16,7 @@ TEST_P(TestReadIntensityFromPositions, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(3, 3, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_read_write_with_positions.cpp b/tests/tier1/test_read_write_with_positions.cpp index 7c982f19..26f6c439 100644 --- a/tests/tier1/test_read_write_with_positions.cpp +++ b/tests/tier1/test_read_write_with_positions.cpp @@ -18,7 +18,7 @@ TEST_P(TestCoordReadWrite, executeReadFromCoord1) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(3, 3, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -44,7 +44,7 @@ TEST_P(TestCoordReadWrite, executeReadFromCoord2) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(3, 3, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_reciprocal.cpp b/tests/tier1/test_reciprocal.cpp index af702085..1d292404 100644 --- a/tests/tier1/test_reciprocal.cpp +++ b/tests/tier1/test_reciprocal.cpp @@ -23,7 +23,7 @@ TEST_P(TestReciprocal, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_replace_intensities.cpp b/tests/tier1/test_replace_intensities.cpp index 2bab7901..cc5ef00b 100644 --- a/tests/tier1/test_replace_intensities.cpp +++ b/tests/tier1/test_replace_intensities.cpp @@ -33,7 +33,7 @@ TEST_P(TestReplaceIntensities, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_replace_intensity.cpp b/tests/tier1/test_replace_intensity.cpp index 2f077a91..1184973e 100644 --- a/tests/tier1/test_replace_intensity.cpp +++ b/tests/tier1/test_replace_intensity.cpp @@ -34,7 +34,7 @@ TEST_P(TestReplaceIntensity, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_set.cpp b/tests/tier1/test_set.cpp index e7a9d933..7b023e29 100644 --- a/tests/tier1/test_set.cpp +++ b/tests/tier1/test_set.cpp @@ -22,7 +22,7 @@ TEST_P(TestSet, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_set_column.cpp b/tests/tier1/test_set_column.cpp index 1a79a68d..a6f883ff 100644 --- a/tests/tier1/test_set_column.cpp +++ b/tests/tier1/test_set_column.cpp @@ -30,7 +30,7 @@ TEST_P(TestSetColumn, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_set_image_border.cpp b/tests/tier1/test_set_image_border.cpp index 7741469d..5b43e00f 100644 --- a/tests/tier1/test_set_image_border.cpp +++ b/tests/tier1/test_set_image_border.cpp @@ -15,7 +15,7 @@ TEST_P(TestPaste, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::INT16, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_set_nonzero_pixels_to_pixelindex.cpp b/tests/tier1/test_set_nonzero_pixels_to_pixelindex.cpp index 940adc38..6befba01 100644 --- a/tests/tier1/test_set_nonzero_pixels_to_pixelindex.cpp +++ b/tests/tier1/test_set_nonzero_pixels_to_pixelindex.cpp @@ -35,7 +35,7 @@ TEST_P(TestNonzeroToPixelIndex, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 3, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_set_plane.cpp b/tests/tier1/test_set_plane.cpp index 862a9d07..3278c408 100644 --- a/tests/tier1/test_set_plane.cpp +++ b/tests/tier1/test_set_plane.cpp @@ -17,7 +17,7 @@ TEST_P(TestSetPlane, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_set_ramp.cpp b/tests/tier1/test_set_ramp.cpp index 223fd101..e80ca39f 100644 --- a/tests/tier1/test_set_ramp.cpp +++ b/tests/tier1/test_set_ramp.cpp @@ -24,7 +24,7 @@ TEST_P(TestRamp, executeRampX) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(3, 3, 2, 3, cle::dType::INT32, cle::mType::BUFFER, device); @@ -43,7 +43,7 @@ TEST_P(TestRamp, executeRampY) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(3, 3, 2, 3, cle::dType::INT32, cle::mType::BUFFER, device); @@ -62,7 +62,7 @@ TEST_P(TestRamp, executeRampZ) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(3, 3, 2, 3, cle::dType::INT32, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_set_row.cpp b/tests/tier1/test_set_row.cpp index 7a5f2921..c56cb355 100644 --- a/tests/tier1/test_set_row.cpp +++ b/tests/tier1/test_set_row.cpp @@ -34,7 +34,7 @@ TEST_P(TestSetRow, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_sign.cpp b/tests/tier1/test_sign.cpp index 6f278ce9..b5a75ee7 100644 --- a/tests/tier1/test_sign.cpp +++ b/tests/tier1/test_sign.cpp @@ -38,7 +38,7 @@ TEST_P(TestSign, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_smaller.cpp b/tests/tier1/test_smaller.cpp index ad750dda..216f1367 100644 --- a/tests/tier1/test_smaller.cpp +++ b/tests/tier1/test_smaller.cpp @@ -29,7 +29,7 @@ TEST_P(TestSmaller, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(10, 5, 3, 3, cle::dType::INT8, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_smaller_constant.cpp b/tests/tier1/test_smaller_constant.cpp index 4583fa29..f0e35f59 100644 --- a/tests/tier1/test_smaller_constant.cpp +++ b/tests/tier1/test_smaller_constant.cpp @@ -26,7 +26,7 @@ TEST_P(TestSmallerConstant, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::INT8, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_smaller_or_equal.cpp b/tests/tier1/test_smaller_or_equal.cpp index 89414964..82384d83 100644 --- a/tests/tier1/test_smaller_or_equal.cpp +++ b/tests/tier1/test_smaller_or_equal.cpp @@ -29,7 +29,7 @@ TEST_P(TestSmallerEqual, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(10, 5, 3, 3, cle::dType::INT8, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_smaller_or_equal_constant.cpp b/tests/tier1/test_smaller_or_equal_constant.cpp index 943aff7d..1320d70b 100644 --- a/tests/tier1/test_smaller_or_equal_constant.cpp +++ b/tests/tier1/test_smaller_or_equal_constant.cpp @@ -26,7 +26,7 @@ TEST_P(TestSmallerEqualConstant, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::INT8, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_sobel.cpp b/tests/tier1/test_sobel.cpp index d0b08ba2..d732dddd 100644 --- a/tests/tier1/test_sobel.cpp +++ b/tests/tier1/test_sobel.cpp @@ -15,7 +15,7 @@ TEST_P(TestSobel, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_square_root.cpp b/tests/tier1/test_square_root.cpp index 0e876c66..36b83705 100644 --- a/tests/tier1/test_square_root.cpp +++ b/tests/tier1/test_square_root.cpp @@ -23,7 +23,7 @@ TEST_P(TestSquareRoot, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_std_z_projection.cpp b/tests/tier1/test_std_z_projection.cpp index d3de0f0e..2d1a17d0 100644 --- a/tests/tier1/test_std_z_projection.cpp +++ b/tests/tier1/test_std_z_projection.cpp @@ -21,7 +21,7 @@ TEST_P(TestStdProjectionZ, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 5, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_subtract_image_and_scalar.cpp b/tests/tier1/test_subtract_image_and_scalar.cpp index d28e30ab..44be1f94 100644 --- a/tests/tier1/test_subtract_image_and_scalar.cpp +++ b/tests/tier1/test_subtract_image_and_scalar.cpp @@ -24,7 +24,7 @@ TEST_P(TestSubtractImageFromScalar, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_sum_reduction_x.cpp b/tests/tier1/test_sum_reduction_x.cpp index c1db6f60..c8a94b15 100644 --- a/tests/tier1/test_sum_reduction_x.cpp +++ b/tests/tier1/test_sum_reduction_x.cpp @@ -15,7 +15,7 @@ TEST_P(TestSumReductionX, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(12, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_sum_x_projection.cpp b/tests/tier1/test_sum_x_projection.cpp index e3a45bef..e12d5170 100644 --- a/tests/tier1/test_sum_x_projection.cpp +++ b/tests/tier1/test_sum_x_projection.cpp @@ -22,7 +22,7 @@ TEST_P(TestSumProjectionX, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_sum_y_projection.cpp b/tests/tier1/test_sum_y_projection.cpp index 80e99271..bf53477b 100644 --- a/tests/tier1/test_sum_y_projection.cpp +++ b/tests/tier1/test_sum_y_projection.cpp @@ -22,7 +22,7 @@ TEST_P(TestSumProjectionY, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_sum_z_projection.cpp b/tests/tier1/test_sum_z_projection.cpp index 3f59412a..e03d8e00 100644 --- a/tests/tier1/test_sum_z_projection.cpp +++ b/tests/tier1/test_sum_z_projection.cpp @@ -22,7 +22,7 @@ TEST_P(TestSumProjectionZ, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_transpose.cpp b/tests/tier1/test_transpose.cpp index a3c9290a..984852b2 100644 --- a/tests/tier1/test_transpose.cpp +++ b/tests/tier1/test_transpose.cpp @@ -22,7 +22,7 @@ TEST_P(TestTranspose, executeXY) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(4, 3, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -44,7 +44,7 @@ TEST_P(TestTranspose, executeXZ) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(4, 3, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -66,7 +66,7 @@ TEST_P(TestTranspose, executeYZ) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(4, 3, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_undefined_to_zero.cpp b/tests/tier1/test_undefined_to_zero.cpp index 42fc8776..23207d5f 100644 --- a/tests/tier1/test_undefined_to_zero.cpp +++ b/tests/tier1/test_undefined_to_zero.cpp @@ -16,7 +16,7 @@ TEST_P(TestUndefinedToZero, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_intput1 = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_variance.cpp b/tests/tier1/test_variance.cpp index 474d4650..18757fbe 100644 --- a/tests/tier1/test_variance.cpp +++ b/tests/tier1/test_variance.cpp @@ -19,7 +19,7 @@ TEST_P(TestVariance, executeDeprecatedBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -38,7 +38,7 @@ TEST_P(TestVariance, executeDeprecatedSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -57,7 +57,7 @@ TEST_P(TestVariance, executeBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -76,7 +76,7 @@ TEST_P(TestVariance, executeSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_where_x.cpp b/tests/tier1/test_where_x.cpp index 1857df54..77918b26 100644 --- a/tests/tier1/test_where_x.cpp +++ b/tests/tier1/test_where_x.cpp @@ -24,7 +24,7 @@ TEST_P(TestWhereX, executeSmallerY) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(4, 4, 1, 3, cle::dType::INT32, cle::mType::BUFFER, device); @@ -43,7 +43,7 @@ TEST_P(TestWhereX, executeEqualY) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(4, 4, 1, 3, cle::dType::INT32, cle::mType::BUFFER, device); @@ -62,7 +62,7 @@ TEST_P(TestWhereX, executeGreaterY) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(4, 4, 1, 3, cle::dType::INT32, cle::mType::BUFFER, device); diff --git a/tests/tier1/test_write_values_to_positions.cpp b/tests/tier1/test_write_values_to_positions.cpp index 980a2a0b..79343f5f 100644 --- a/tests/tier1/test_write_values_to_positions.cpp +++ b/tests/tier1/test_write_values_to_positions.cpp @@ -22,7 +22,7 @@ TEST_P(TestWriteValuesTopositions, execute2D) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_coord = cle::Array::create(5, 3, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -41,7 +41,7 @@ TEST_P(TestWriteValuesTopositions, execute3D) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_coord = cle::Array::create(5, 4, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_absolute_difference.cpp b/tests/tier2/test_absolute_difference.cpp index 0362cd67..51e45a4d 100644 --- a/tests/tier2/test_absolute_difference.cpp +++ b/tests/tier2/test_absolute_difference.cpp @@ -16,7 +16,7 @@ TEST_P(TestAbsoluteDifference, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(3, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_bottom_hat.cpp b/tests/tier2/test_bottom_hat.cpp index 74c724ee..e3450800 100644 --- a/tests/tier2/test_bottom_hat.cpp +++ b/tests/tier2/test_bottom_hat.cpp @@ -16,7 +16,7 @@ TEST_P(TestBottomHat, executeBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -33,7 +33,7 @@ TEST_P(TestBottomHat, executeSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_clip.cpp b/tests/tier2/test_clip.cpp index e18b8224..f44ef613 100644 --- a/tests/tier2/test_clip.cpp +++ b/tests/tier2/test_clip.cpp @@ -16,7 +16,7 @@ TEST_P(TestClip, executeMinMax) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(2, 2, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_closing.cpp b/tests/tier2/test_closing.cpp index 634d2040..380702e5 100644 --- a/tests/tier2/test_closing.cpp +++ b/tests/tier2/test_closing.cpp @@ -26,7 +26,7 @@ TEST_P(TestClosing, executeBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 6, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -45,7 +45,7 @@ TEST_P(TestClosing, executeSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 6, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_concatenate.cpp b/tests/tier2/test_concatenate.cpp index 487174aa..5b1efafb 100644 --- a/tests/tier2/test_concatenate.cpp +++ b/tests/tier2/test_concatenate.cpp @@ -17,7 +17,7 @@ TEST_P(TestConcatenate, alongX) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(2, 2, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -43,7 +43,7 @@ TEST_P(TestConcatenate, alongY) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(2, 2, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -69,7 +69,7 @@ TEST_P(TestConcatenate, alongZ) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(2, 2, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_count_neighbour.cpp b/tests/tier2/test_count_neighbour.cpp index ab2837ab..1b3ce99b 100644 --- a/tests/tier2/test_count_neighbour.cpp +++ b/tests/tier2/test_count_neighbour.cpp @@ -17,7 +17,7 @@ TEST_P(TestCountNeighbor, ignoreBG) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -40,7 +40,7 @@ TEST_P(TestCountNeighbor, includeBG) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_crop_border.cpp b/tests/tier2/test_crop_border.cpp index 48997b03..fd3eec3e 100644 --- a/tests/tier2/test_crop_border.cpp +++ b/tests/tier2/test_crop_border.cpp @@ -24,7 +24,7 @@ TEST_P(TestCropBorder, execute2D) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(4, 4, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -46,7 +46,7 @@ TEST_P(TestCropBorder, execute3D) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(4, 4, 4, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_deg_to_rad.cpp b/tests/tier2/test_deg_to_rad.cpp index 0ff6efba..29edf72c 100644 --- a/tests/tier2/test_deg_to_rad.cpp +++ b/tests/tier2/test_deg_to_rad.cpp @@ -15,7 +15,7 @@ TEST_P(TestDegreeToRadiant, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(3, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_detect_maxima.cpp b/tests/tier2/test_detect_maxima.cpp index ed423b37..ab81d7a9 100644 --- a/tests/tier2/test_detect_maxima.cpp +++ b/tests/tier2/test_detect_maxima.cpp @@ -32,7 +32,7 @@ TEST_P(TestDetectMaxima, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 1, 2, cle::dType::UINT8, cle::mType::BUFFER, device); @@ -52,7 +52,7 @@ TEST_P(TestDetectMaxima, boundaries) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 2, cle::dType::UINT8, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_detect_minima.cpp b/tests/tier2/test_detect_minima.cpp index 8aa63d17..0c926aff 100644 --- a/tests/tier2/test_detect_minima.cpp +++ b/tests/tier2/test_detect_minima.cpp @@ -31,7 +31,7 @@ TEST_P(TestDetectMinima, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 1, 2, cle::dType::UINT8, cle::mType::BUFFER, device); @@ -50,7 +50,7 @@ TEST_P(TestDetectMinima, boundaries) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 2, cle::dType::UINT8, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_difference_of_gaussian.cpp b/tests/tier2/test_difference_of_gaussian.cpp index dbbc8b6b..bb6897e9 100644 --- a/tests/tier2/test_difference_of_gaussian.cpp +++ b/tests/tier2/test_difference_of_gaussian.cpp @@ -33,7 +33,7 @@ TEST_P(TestDifferenceOfGaussian, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(3, 3, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_extend_labeling_via_voronoi.cpp b/tests/tier2/test_extend_labeling_via_voronoi.cpp index 59fb5f75..0093185d 100644 --- a/tests/tier2/test_extend_labeling_via_voronoi.cpp +++ b/tests/tier2/test_extend_labeling_via_voronoi.cpp @@ -19,7 +19,7 @@ TEST_P(TestExtLabelVoronoi, execute) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 3, 2, 3, cle::dType::INT32, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_hessian_eigenvalues.cpp b/tests/tier2/test_hessian_eigenvalues.cpp index 46f55881..fed181a2 100644 --- a/tests/tier2/test_hessian_eigenvalues.cpp +++ b/tests/tier2/test_hessian_eigenvalues.cpp @@ -23,7 +23,7 @@ TEST_P(TestHessianEigenvalues, execute2D) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(2, 2, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -51,7 +51,7 @@ TEST_P(TestHessianEigenvalues, executeLarge2D) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(2, 2, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -73,7 +73,7 @@ TEST_P(TestHessianEigenvalues, executeSmall2D) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(2, 2, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_images_operations.cpp b/tests/tier2/test_images_operations.cpp index 8921ddbf..a6381cde 100644 --- a/tests/tier2/test_images_operations.cpp +++ b/tests/tier2/test_images_operations.cpp @@ -17,7 +17,7 @@ TEST_P(TestImagesOperation, add) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(3, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -40,7 +40,7 @@ TEST_P(TestImagesOperation, subtract) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(3, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -63,7 +63,7 @@ TEST_P(TestImagesOperation, square) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(3, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_invert.cpp b/tests/tier2/test_invert.cpp index a19327ba..01696e76 100644 --- a/tests/tier2/test_invert.cpp +++ b/tests/tier2/test_invert.cpp @@ -15,7 +15,7 @@ TEST_P(TestInvert, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(3, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_label_spots.cpp b/tests/tier2/test_label_spots.cpp index a6713d74..5a07b6f1 100644 --- a/tests/tier2/test_label_spots.cpp +++ b/tests/tier2/test_label_spots.cpp @@ -18,7 +18,7 @@ TEST_P(TestLabelSpots, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 4, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_maximum_all_pixels.cpp b/tests/tier2/test_maximum_all_pixels.cpp index 189f8e94..10be5010 100644 --- a/tests/tier2/test_maximum_all_pixels.cpp +++ b/tests/tier2/test_maximum_all_pixels.cpp @@ -24,7 +24,7 @@ TEST_P(TestMaxAllPixel, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto array = cle::Array::create(10, 20, 30, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_minimum_all_pixels.cpp b/tests/tier2/test_minimum_all_pixels.cpp index 659f4519..1437942a 100644 --- a/tests/tier2/test_minimum_all_pixels.cpp +++ b/tests/tier2/test_minimum_all_pixels.cpp @@ -24,7 +24,7 @@ TEST_P(TestMinAllPixel, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto array = cle::Array::create(10, 20, 30, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_minimum_of_masked_pixels.cpp b/tests/tier2/test_minimum_of_masked_pixels.cpp index 18145d26..ae4a172b 100644 --- a/tests/tier2/test_minimum_of_masked_pixels.cpp +++ b/tests/tier2/test_minimum_of_masked_pixels.cpp @@ -27,7 +27,7 @@ TEST_P(TestMinMaskPixel, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 3, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_opening.cpp b/tests/tier2/test_opening.cpp index 723c022c..c9d0599f 100644 --- a/tests/tier2/test_opening.cpp +++ b/tests/tier2/test_opening.cpp @@ -24,7 +24,7 @@ TEST_P(TestOpening, executeBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 6, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -43,7 +43,7 @@ TEST_P(TestOpening, executeSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 6, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_rad_deg.cpp b/tests/tier2/test_rad_deg.cpp index 3c8a73c6..81837524 100644 --- a/tests/tier2/test_rad_deg.cpp +++ b/tests/tier2/test_rad_deg.cpp @@ -16,7 +16,7 @@ TEST_P(TestRadDeg, radToDeg) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(4, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -35,7 +35,7 @@ TEST_P(TestRadDeg, degToRad) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(4, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_reduce_labels_to_label_edges.cpp b/tests/tier2/test_reduce_labels_to_label_edges.cpp index 24ebebdd..f9fb33e7 100644 --- a/tests/tier2/test_reduce_labels_to_label_edges.cpp +++ b/tests/tier2/test_reduce_labels_to_label_edges.cpp @@ -20,7 +20,7 @@ TEST_P(TestReduceLabelsToLabelEdges, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(8, 8, 1, 2, cle::dType::UINT32, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_standard_deviation.cpp b/tests/tier2/test_standard_deviation.cpp index 60df4cef..fbdf60c3 100644 --- a/tests/tier2/test_standard_deviation.cpp +++ b/tests/tier2/test_standard_deviation.cpp @@ -19,7 +19,7 @@ TEST_P(TestStandardDeviation, executeBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -38,7 +38,7 @@ TEST_P(TestStandardDeviation, executeSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_sum_all_pixels.cpp b/tests/tier2/test_sum_all_pixels.cpp index 4a711cb8..52e2aa17 100644 --- a/tests/tier2/test_sum_all_pixels.cpp +++ b/tests/tier2/test_sum_all_pixels.cpp @@ -22,7 +22,7 @@ TEST_P(TestSumAllPixel, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto array = cle::Array::create(10, 20, 30, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier2/test_top_hat.cpp b/tests/tier2/test_top_hat.cpp index cb57bd05..8c3a7b90 100644 --- a/tests/tier2/test_top_hat.cpp +++ b/tests/tier2/test_top_hat.cpp @@ -16,7 +16,7 @@ TEST_P(TestTopHat, executeBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -33,7 +33,7 @@ TEST_P(TestTopHat, executeSphere) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier3/test_bounding_box.cpp b/tests/tier3/test_bounding_box.cpp index 2aa3f7e4..4991158f 100644 --- a/tests/tier3/test_bounding_box.cpp +++ b/tests/tier3/test_bounding_box.cpp @@ -17,7 +17,7 @@ TEST_P(TestBoundingBox, execute2d) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -37,7 +37,7 @@ TEST_P(TestBoundingBox, execute3d) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 2, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -56,7 +56,7 @@ TEST_P(TestBoundingBox, largePositionInt8) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); std::array input_large = {}; diff --git a/tests/tier3/test_exclude_labels.cpp b/tests/tier3/test_exclude_labels.cpp index c3f3a703..1e0f8f46 100644 --- a/tests/tier3/test_exclude_labels.cpp +++ b/tests/tier3/test_exclude_labels.cpp @@ -28,7 +28,7 @@ TEST_P(TestExcludeLabels, onList) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(7, 6, 3, 3, cle::dType::UINT32, cle::mType::BUFFER, device); @@ -56,7 +56,7 @@ TEST_P(TestExcludeLabels, onEdges) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(7, 6, 3, 3, cle::dType::UINT32, cle::mType::BUFFER, device); diff --git a/tests/tier3/test_flag_existing_labels.cpp b/tests/tier3/test_flag_existing_labels.cpp index e8f5bb06..b52e4fae 100644 --- a/tests/tier3/test_flag_existing_labels.cpp +++ b/tests/tier3/test_flag_existing_labels.cpp @@ -28,7 +28,7 @@ TEST_P(TestExistingLabels, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::INT32, cle::mType::BUFFER, device); diff --git a/tests/tier3/test_gamma_correction.cpp b/tests/tier3/test_gamma_correction.cpp index 4c19ddb2..572de402 100644 --- a/tests/tier3/test_gamma_correction.cpp +++ b/tests/tier3/test_gamma_correction.cpp @@ -19,7 +19,7 @@ TEST_P(TestExistingLabels, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier3/test_generate_binary_overlap_matrix.cpp b/tests/tier3/test_generate_binary_overlap_matrix.cpp index 9dda6165..363ad104 100644 --- a/tests/tier3/test_generate_binary_overlap_matrix.cpp +++ b/tests/tier3/test_generate_binary_overlap_matrix.cpp @@ -16,7 +16,7 @@ TEST_P(TestGenerateTouchMatrix, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(5, 2, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier3/test_generate_touch_mat.cpp b/tests/tier3/test_generate_touch_mat.cpp index 86ef499a..f9b10c19 100644 --- a/tests/tier3/test_generate_touch_mat.cpp +++ b/tests/tier3/test_generate_touch_mat.cpp @@ -15,7 +15,7 @@ TEST_P(TestGenerateTouchMatrix, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier3/test_histogram.cpp b/tests/tier3/test_histogram.cpp index ed204be8..fba9a883 100644 --- a/tests/tier3/test_histogram.cpp +++ b/tests/tier3/test_histogram.cpp @@ -29,7 +29,7 @@ TEST_P(TestHistogram, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(10, 5, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier3/test_jaccard_index.cpp b/tests/tier3/test_jaccard_index.cpp index f20855f3..1454d1c0 100644 --- a/tests/tier3/test_jaccard_index.cpp +++ b/tests/tier3/test_jaccard_index.cpp @@ -13,7 +13,7 @@ TEST_P(TestJaccardIndex, execute2D) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(5, 2, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -33,7 +33,7 @@ TEST_P(TestJaccardIndex, execute3D) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(3, 2, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier3/test_label_spot_to_pointlist.cpp b/tests/tier3/test_label_spot_to_pointlist.cpp index b55ae20e..6b7c9b87 100644 --- a/tests/tier3/test_label_spot_to_pointlist.cpp +++ b/tests/tier3/test_label_spot_to_pointlist.cpp @@ -15,7 +15,7 @@ TEST_P(TestLabelSpotToPointList, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier3/test_label_statistics.cpp b/tests/tier3/test_label_statistics.cpp index 6ea7a945..c12b7040 100644 --- a/tests/tier3/test_label_statistics.cpp +++ b/tests/tier3/test_label_statistics.cpp @@ -75,7 +75,7 @@ TEST_P(TestStatisticsOfLabelledPixels, execute2D) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_intensity = cle::Array::create(3, 3, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -142,7 +142,7 @@ TEST_P(TestStatisticsOfLabelledPixels, execute3D) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_intensity = cle::Array::create(3, 2, 3, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -228,7 +228,7 @@ TEST_P(TestStatisticsOfLabelledPixels, shape) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_labels = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -293,7 +293,7 @@ TEST_P(TestStatisticsOfLabelledPixels, standard_deviation) std::array image = { 1, 2, 3, 4, 5, 6, 7, 8, 9 }; std::array labels = { 1, 1, 1, 1, 1, 1, 1, 1, 1 }; - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_image = cle::Array::create(3, 3, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier3/test_minmax_position.cpp b/tests/tier3/test_minmax_position.cpp index f84eb840..7f48f35a 100644 --- a/tests/tier3/test_minmax_position.cpp +++ b/tests/tier3/test_minmax_position.cpp @@ -17,7 +17,7 @@ TEST_P(TestMinMaxPosition, maxPosition) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(4, 3, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -37,7 +37,7 @@ TEST_P(TestMinMaxPosition, minPosition) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(4, 3, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier3/test_morphological_chan_vese.cpp b/tests/tier3/test_morphological_chan_vese.cpp index 5fcdfb78..e1fd3ff4 100644 --- a/tests/tier3/test_morphological_chan_vese.cpp +++ b/tests/tier3/test_morphological_chan_vese.cpp @@ -42,7 +42,7 @@ TEST_P(TestChanVese, chanvese2d_without_smoothing) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(14, 14, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -63,7 +63,7 @@ TEST_P(TestChanVese, chanvese2d_with_smoothing) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(14, 14, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier4/test_centroids_of_labels.cpp b/tests/tier4/test_centroids_of_labels.cpp index ea189bde..d71d2f07 100644 --- a/tests/tier4/test_centroids_of_labels.cpp +++ b/tests/tier4/test_centroids_of_labels.cpp @@ -18,7 +18,7 @@ TEST_P(TestCentroidsOfLabels, execute2d) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 5, 1, 2, cle::dType::LABEL, cle::mType::BUFFER, device); diff --git a/tests/tier4/test_label_bounding_box.cpp b/tests/tier4/test_label_bounding_box.cpp index 2001914e..d574f6b3 100644 --- a/tests/tier4/test_label_bounding_box.cpp +++ b/tests/tier4/test_label_bounding_box.cpp @@ -15,7 +15,7 @@ TEST_P(TestBoundingBox, execute2d) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(7, 7, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier4/test_label_pixelcount_map.cpp b/tests/tier4/test_label_pixelcount_map.cpp index eac657ef..0ac7fa89 100644 --- a/tests/tier4/test_label_pixelcount_map.cpp +++ b/tests/tier4/test_label_pixelcount_map.cpp @@ -18,7 +18,7 @@ TEST_P(TestLabelPixelCountMap, execute2d) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 5, 1, 2, cle::dType::LABEL, cle::mType::BUFFER, device); diff --git a/tests/tier4/test_mean_intensity_map.cpp b/tests/tier4/test_mean_intensity_map.cpp index 47aa10ff..8093bef0 100644 --- a/tests/tier4/test_mean_intensity_map.cpp +++ b/tests/tier4/test_mean_intensity_map.cpp @@ -18,7 +18,7 @@ TEST_P(TestMeanIntensityMap, execute) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_intensity = cle::Array::create(3, 3, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier4/test_mean_square_error.cpp b/tests/tier4/test_mean_square_error.cpp index 34837b45..3e713cb2 100644 --- a/tests/tier4/test_mean_square_error.cpp +++ b/tests/tier4/test_mean_square_error.cpp @@ -15,7 +15,7 @@ TEST_P(TestMeanSquareError, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(3, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier4/test_spots_to_pointlist.cpp b/tests/tier4/test_spots_to_pointlist.cpp index 02094816..d886f1e4 100644 --- a/tests/tier4/test_spots_to_pointlist.cpp +++ b/tests/tier4/test_spots_to_pointlist.cpp @@ -16,7 +16,7 @@ TEST_P(TestSpotToPointList, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier4/test_threshold_otsu.cpp b/tests/tier4/test_threshold_otsu.cpp index e8db976f..c9251bca 100644 --- a/tests/tier4/test_threshold_otsu.cpp +++ b/tests/tier4/test_threshold_otsu.cpp @@ -32,7 +32,7 @@ TEST_P(TestThresholdOtsu, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(3, 2, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -51,7 +51,7 @@ TEST_P(TestThresholdOtsu, lowIntensity) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(3, 3, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -71,7 +71,7 @@ TEST_P(TestThresholdOtsu, gauss) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 7, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier5/test_array_comparison.cpp b/tests/tier5/test_array_comparison.cpp index 124b203a..87c51108 100644 --- a/tests/tier5/test_array_comparison.cpp +++ b/tests/tier5/test_array_comparison.cpp @@ -16,7 +16,7 @@ TEST_P(TestArrayComparisons, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(3, 1, 1, 3, cle::dType::INT32, cle::mType::BUFFER, device); diff --git a/tests/tier5/test_combide_labels.cpp b/tests/tier5/test_combide_labels.cpp index af4090aa..2620c088 100644 --- a/tests/tier5/test_combide_labels.cpp +++ b/tests/tier5/test_combide_labels.cpp @@ -16,7 +16,7 @@ TEST_P(TestCombineLabels, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(6, 2, 1, 3, cle::dType::UINT32, cle::mType::BUFFER, device); diff --git a/tests/tier5/test_connected_component_labeling.cpp b/tests/tier5/test_connected_component_labeling.cpp index bbe0589f..73afa1d6 100644 --- a/tests/tier5/test_connected_component_labeling.cpp +++ b/tests/tier5/test_connected_component_labeling.cpp @@ -19,7 +19,7 @@ TEST_P(TestLabeling, executeBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 3, 2, 3, cle::dType::UINT32, cle::mType::BUFFER, device); @@ -38,7 +38,7 @@ TEST_P(TestLabeling, executeDiamond) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 3, 2, 3, cle::dType::UINT32, cle::mType::BUFFER, device); diff --git a/tests/tier5/test_filter_labels_by_size.cpp b/tests/tier5/test_filter_labels_by_size.cpp index 843c8859..e3589715 100644 --- a/tests/tier5/test_filter_labels_by_size.cpp +++ b/tests/tier5/test_filter_labels_by_size.cpp @@ -18,7 +18,7 @@ TEST_P(TestFilterLabelsBySize, execute2d) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 5, 1, 2, cle::dType::LABEL, cle::mType::BUFFER, device); diff --git a/tests/tier5/test_reduce_labels_to_centroids.cpp b/tests/tier5/test_reduce_labels_to_centroids.cpp index 3ab68b1a..5c3ef42d 100644 --- a/tests/tier5/test_reduce_labels_to_centroids.cpp +++ b/tests/tier5/test_reduce_labels_to_centroids.cpp @@ -19,7 +19,7 @@ TEST_P(TestReduceLabelToCentroids, executeBox) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 6, 1, 3, cle::dType::LABEL, cle::mType::BUFFER, device); diff --git a/tests/tier6/test_gauss_otsu_labeling.cpp b/tests/tier6/test_gauss_otsu_labeling.cpp index aacaca0a..41d5ecde 100644 --- a/tests/tier6/test_gauss_otsu_labeling.cpp +++ b/tests/tier6/test_gauss_otsu_labeling.cpp @@ -19,7 +19,7 @@ TEST_P(TestGaussOtsuLabeling, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 7, 1, 3, cle::dType::UINT32, cle::mType::BUFFER, device); diff --git a/tests/tier6/test_masked_voronoi_labeling.cpp b/tests/tier6/test_masked_voronoi_labeling.cpp index 00a83a99..2bb61bad 100644 --- a/tests/tier6/test_masked_voronoi_labeling.cpp +++ b/tests/tier6/test_masked_voronoi_labeling.cpp @@ -24,7 +24,7 @@ TEST_P(TestMaskedVoronoiLabeling, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input1 = cle::Array::create(6, 4, 2, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier6/test_voronoi_labeling.cpp b/tests/tier6/test_voronoi_labeling.cpp index cf6ddd29..46cc3e91 100644 --- a/tests/tier6/test_voronoi_labeling.cpp +++ b/tests/tier6/test_voronoi_labeling.cpp @@ -19,7 +19,7 @@ TEST_P(TestVoronoiLabeling, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 6, 1, 3, cle::dType::UINT32, cle::mType::BUFFER, device); diff --git a/tests/tier7/test_affine_transform.cpp b/tests/tier7/test_affine_transform.cpp index dcdd16e3..46aff2dd 100644 --- a/tests/tier7/test_affine_transform.cpp +++ b/tests/tier7/test_affine_transform.cpp @@ -18,7 +18,7 @@ TEST_P(TestAffineTransform, affineTransform) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -53,7 +53,7 @@ TEST_P(TestAffineTransform, affineTransformInterpolate) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier7/test_erode_connected_labels.cpp b/tests/tier7/test_erode_connected_labels.cpp index a60d32c8..b6b0c399 100644 --- a/tests/tier7/test_erode_connected_labels.cpp +++ b/tests/tier7/test_erode_connected_labels.cpp @@ -19,7 +19,7 @@ TEST_P(TestErodeConnectedLabels, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(7, 5, 1, 2, cle::dType::UINT32, cle::mType::BUFFER, device); diff --git a/tests/tier7/test_eroded_otsu_labeling.cpp b/tests/tier7/test_eroded_otsu_labeling.cpp index ff123756..7bf5b144 100644 --- a/tests/tier7/test_eroded_otsu_labeling.cpp +++ b/tests/tier7/test_eroded_otsu_labeling.cpp @@ -19,7 +19,7 @@ TEST_P(TestErodedOtsuLabeling, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 7, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier7/test_label_operations.cpp b/tests/tier7/test_label_operations.cpp index 332da9d2..5898e03c 100644 --- a/tests/tier7/test_label_operations.cpp +++ b/tests/tier7/test_label_operations.cpp @@ -20,7 +20,7 @@ TEST_P(TestLabelOperations, executeDilate) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 6, 2, 3, cle::dType::UINT32, cle::mType::BUFFER, device); @@ -54,7 +54,7 @@ TEST_P(TestLabelOperations, executeErode) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 6, 2, 3, cle::dType::UINT32, cle::mType::BUFFER, device); @@ -88,7 +88,7 @@ TEST_P(TestLabelOperations, executeOpening) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 6, 2, 3, cle::dType::UINT32, cle::mType::BUFFER, device); @@ -122,7 +122,7 @@ TEST_P(TestLabelOperations, executeClosing) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 6, 2, 3, cle::dType::UINT32, cle::mType::BUFFER, device); diff --git a/tests/tier7/test_rigid_transform.cpp b/tests/tier7/test_rigid_transform.cpp index 53651b1b..14a8565f 100644 --- a/tests/tier7/test_rigid_transform.cpp +++ b/tests/tier7/test_rigid_transform.cpp @@ -18,7 +18,7 @@ TEST_P(TestRigidTransform, rigidTransform) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -46,7 +46,7 @@ TEST_P(TestRigidTransform, rigidTransformResized) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier7/test_rotate.cpp b/tests/tier7/test_rotate.cpp index eb23ed40..ef362360 100644 --- a/tests/tier7/test_rotate.cpp +++ b/tests/tier7/test_rotate.cpp @@ -18,7 +18,7 @@ TEST_P(TestRotate, rotate) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -45,7 +45,7 @@ TEST_P(TestRotate, rotateCentered) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -72,7 +72,7 @@ TEST_P(TestRotate, rotateResized) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier7/test_scale.cpp b/tests/tier7/test_scale.cpp index 77a76e9d..28894aff 100644 --- a/tests/tier7/test_scale.cpp +++ b/tests/tier7/test_scale.cpp @@ -18,7 +18,7 @@ TEST_P(TestScale, scaleCentered) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -45,7 +45,7 @@ TEST_P(TestScale, scaleNotCentered) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); @@ -75,7 +75,7 @@ TEST_P(TestScale, scaleResized) std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier7/test_translation.cpp b/tests/tier7/test_translation.cpp index cde26d82..4e8673a2 100644 --- a/tests/tier7/test_translation.cpp +++ b/tests/tier7/test_translation.cpp @@ -19,7 +19,7 @@ TEST_P(TestTranslation, executeInterpolationOff) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(5, 5, 1, 2, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier7/test_voronoi_otsu_labeling.cpp b/tests/tier7/test_voronoi_otsu_labeling.cpp index cee6c59f..fcb21b07 100644 --- a/tests/tier7/test_voronoi_otsu_labeling.cpp +++ b/tests/tier7/test_voronoi_otsu_labeling.cpp @@ -22,7 +22,7 @@ TEST_P(TestVoronoiOtsuLabeling, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(6, 7, 1, 1, cle::dType::FLOAT, cle::mType::BUFFER, device); diff --git a/tests/tier8/test_smooth_connected_labels.cpp b/tests/tier8/test_smooth_connected_labels.cpp index abef802b..c96249c7 100644 --- a/tests/tier8/test_smooth_connected_labels.cpp +++ b/tests/tier8/test_smooth_connected_labels.cpp @@ -21,7 +21,7 @@ TEST_P(TestSmoothConnectedLabels, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(9, 7, 1, 2, cle::dType::UINT32, cle::mType::BUFFER, device); diff --git a/tests/tier8/test_smooth_labels.cpp b/tests/tier8/test_smooth_labels.cpp index 1af7842b..c32439a9 100644 --- a/tests/tier8/test_smooth_labels.cpp +++ b/tests/tier8/test_smooth_labels.cpp @@ -23,7 +23,7 @@ TEST_P(TestSmoothLabels, execute) { std::string param = GetParam(); cle::BackendManager::getInstance().setBackend(param); - auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "all"); + auto device = cle::BackendManager::getInstance().getBackend().getDevice("", "gpu"); device->setWaitToFinish(true); auto gpu_input = cle::Array::create(8, 9, 1, 2, cle::dType::UINT32, cle::mType::BUFFER, device); From dc4326ecfbd5fd264b2a5e5517055958fadd45b0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 17:50:44 +0000 Subject: [PATCH 4/4] style(pre-commit.ci): auto fixes --- clic/src/openclbackend.cpp | 2 +- tests/core/test_device.cpp | 2 +- tests/tier1/test_nonzero_maximum.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/clic/src/openclbackend.cpp b/clic/src/openclbackend.cpp index 23f7d615..1b0496b6 100644 --- a/clic/src/openclbackend.cpp +++ b/clic/src/openclbackend.cpp @@ -92,7 +92,7 @@ OpenCLBackend::initialiseRessources() -> void // explore ressources available std::unordered_map> ressources; - size_t device_counter = 0; + size_t device_counter = 0; cl_uint platformCount = 0; cl_int err = clGetPlatformIDs(0, nullptr, &platformCount); diff --git a/tests/core/test_device.cpp b/tests/core/test_device.cpp index a9b78eea..fdfeab42 100644 --- a/tests/core/test_device.cpp +++ b/tests/core/test_device.cpp @@ -38,7 +38,7 @@ TEST_P(TestDevice, defaultDevice) cle::BackendManager::getInstance().setBackend(param); auto list = cle::BackendManager::getInstance().getBackend().getDevicesList("all"); - for (auto &&i : list) + for (auto && i : list) { std::cout << i << " "; } diff --git a/tests/tier1/test_nonzero_maximum.cpp b/tests/tier1/test_nonzero_maximum.cpp index 83fec8ff..dc033d7e 100644 --- a/tests/tier1/test_nonzero_maximum.cpp +++ b/tests/tier1/test_nonzero_maximum.cpp @@ -31,7 +31,7 @@ TEST_P(TestNonzeroMaximum, executeDeprecatedBox) gpu_input->writeFrom(input.data()); auto flag = cle::Array::create(1, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); flag->fill(1); - auto gpu_output = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); + auto gpu_output = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); gpu_output->fill(0); cle::tier1::nonzero_maximum_box_func(device, gpu_input, flag, gpu_output); @@ -54,7 +54,7 @@ TEST_P(TestNonzeroMaximum, executeDeprecatedSphere) gpu_input->writeFrom(input.data()); auto flag = cle::Array::create(1, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); flag->fill(1); - auto gpu_output = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); + auto gpu_output = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); gpu_output->fill(0); cle::tier1::nonzero_maximum_diamond_func(device, gpu_input, flag, gpu_output); @@ -78,7 +78,7 @@ TEST_P(TestNonzeroMaximum, executeBox) gpu_input->writeFrom(input.data()); auto flag = cle::Array::create(1, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); flag->fill(1); - auto gpu_output = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); + auto gpu_output = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); gpu_output->fill(0); cle::tier1::nonzero_maximum_func(device, gpu_input, flag, gpu_output, "box"); @@ -100,7 +100,7 @@ TEST_P(TestNonzeroMaximum, executeSphere) gpu_input->writeFrom(input.data()); auto flag = cle::Array::create(1, 1, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); flag->fill(1); - auto gpu_output = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); + auto gpu_output = cle::Array::create(5, 5, 1, 3, cle::dType::FLOAT, cle::mType::BUFFER, device); gpu_output->fill(0); cle::tier1::nonzero_maximum_func(device, gpu_input, flag, gpu_output, "sphere");