Kernel of Laplace Box

clic/include/core/clesperanto.hpp

@@ -177,6 +177,9 @@ class Clesperanto
             const float & min_intensity = FloatLimits::infinity(),
             const float & max_intensity = FloatLimits::infinity()) -> void;
 
+  auto
+  LaplaceBox(const Image & source, const Image & destination) -> void;
+
   auto
   Mask(const Image & source, const Image & t_mask, const Image & destination) -> void;
 

clic/include/tier1/cleLaplaceBoxKernel.hpp

@@ -0,0 +1,32 @@
+
+
+#ifndef __TIER1_CLELAPLACEBOXKERNEL_HPP
+#define __TIER1_CLELAPLACEBOXKERNEL_HPP
+
+#include "cleOperation.hpp"
+
+namespace cle
+{
+
+class LaplaceBoxKernel : public Operation
+{
+public:
+  explicit LaplaceBoxKernel(const ProcessorPointer & device);
+  auto
+  SetInput(const Image & object) -> void;
+  auto
+  SetOutput(const Image & object) -> void;
+};
+
+inline auto
+LaplaceBoxKernel_Call(const std::shared_ptr<cle::Processor> & device, const Image & src, const Image & dst) -> void
+{
+  LaplaceBoxKernel kernel(device);
+  kernel.SetInput(src);
+  kernel.SetOutput(dst);
+  kernel.Execute();
+}
+
+} // namespace cle
+
+#endif // __TIER1_CLELAPLACEBOXKERNEL_HPP

clic/src/core/clesperanto.cpp

@@ -289,6 +289,12 @@ Clesperanto::GreaterOrEqualConstant(const Image & source, const Image & destinat
   kernel.Execute();
 }
 
+auto
+Clesperanto::LaplaceBox(const Image & source, const Image & destination) -> void
+{
+  LaplaceBoxKernel_Call(this->GetDevice(), source, destination);
+}
+
 auto
 Clesperanto::Mask(const Image & source, const Image & t_mask, const Image & destination) -> void
 {

clic/src/tier1/cleLaplaceBoxKernel.cpp

@@ -0,0 +1,27 @@
+
+
+#include "cleLaplaceBoxKernel.hpp"
+#include "cle_laplace_box.h"
+
+namespace cle
+{
+
+LaplaceBoxKernel::LaplaceBoxKernel(const ProcessorPointer & device)
+  : Operation(device, 2)
+{
+  this->SetSource("laplace_box", oclKernel::laplace_box);
+}
+
+auto
+LaplaceBoxKernel::SetInput(const Image & object) -> void
+{
+  this->AddParameter("src", object);
+}
+
+auto
+LaplaceBoxKernel::SetOutput(const Image & object) -> void
+{
+  this->AddParameter("dst", object);
+}
+
+} // namespace cle

tests/CMakeLists.txt

@@ -208,6 +208,12 @@ target_link_libraries(histogram_test PRIVATE CLIc::CLIc)
 set_target_properties(histogram_test PROPERTIES FOLDER "Tests")
 # target_compile_features(histogram_test PRIVATE cxx_std_17)
 
+add_executable(laplace_box_test laplace_box_test.cpp)
+add_dependencies(laplace_box_test CLIc)
+target_link_libraries(laplace_box_test PRIVATE CLIc::CLIc)
+set_target_properties(laplace_box_test PROPERTIES FOLDER "Tests")
+# target_compile_features(laplace_box_test PRIVATE cxx_std_17)
+
 add_executable(mask_test mask_test.cpp)
 add_dependencies(mask_test CLIc)
 target_link_libraries(mask_test PRIVATE CLIc::CLIc)
@@ -492,6 +498,7 @@ add_test(NAME greater_or_equal_constant_test WORKING_DIRECTORY ${CMAKE_CURRENT_B
 add_test(NAME greater_or_equal_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND greater_or_equal_test)
 add_test(NAME greater_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND greater_test)
 add_test(NAME histogram_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND histogram_test)
+add_test(NAME laplace_box_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND laplace_box_test)
 add_test(NAME mask_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND mask_test)
 add_test(NAME masked_voronoi_labeling_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND masked_voronoi_labeling_test)
 add_test(NAME maximum_all_pixels_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND maximum_all_pixels_test)
@@ -571,6 +578,7 @@ set_tests_properties(absolute_test
     greater_or_equal_test
     greater_test
     histogram_test
+    laplace_box_test
     mask_test
     masked_voronoi_labeling_test
     maximum_all_pixels_test

tests/laplace_box_test.cpp

@@ -0,0 +1,102 @@
+
+
+#include "clesperanto.hpp"
+
+template <class type>
+auto
+run_test(const std::array<size_t, 3> & shape, const cle::MemoryType & mem_type) -> bool
+{
+  std::vector<type> input(shape[0] * shape[1] * shape[2]);
+  std::vector<type> valid(shape[0] * shape[1] * shape[2]);
+
+  if (shape[2] > 1)
+  {
+    input = { 1, 0, 2, 1, 0, 1, 0, 3, 0, 2, 0, 1, 3, 0, 0, 1, 0, 1, 1, 0, 2, 0, 2, 1 };
+    valid = { 4, -22, 30, -6, -21, 6, -26, 50, -19, 34, -28, -2, 50, -23, -18, 3, -27, 3, 5, -26, 31, -25, 28, -1 };
+  }
+  else if (shape[1] > 1)
+  {
+    input = { 1, 0, 2, 1, 0, 1, 3, 1, 0, 2, 1, 1 };
+    valid = { 3, -8, 8, -2, -9, 2, 13, -1, -6, 1, -3, 2 };
+  }
+  else
+  {
+    input = { 1, 0, 0, 1, 1 };
+    valid = { 1, -1, -1, 1, 0 };
+  }
+
+  cle::Clesperanto cle;
+  cle.GetDevice()->WaitForKernelToFinish();
+  auto gpu_input = cle.Push<type>(input, shape, mem_type);
+  auto gpu_output = cle.Create<type>(shape, mem_type);
+  cle.LaplaceBox(gpu_input, gpu_output);
+  auto output = cle.Pull<type>(gpu_output);
+
+  return std::equal(output.begin(), output.end(), valid.begin());
+}
+
+auto
+main(int argc, char ** argv) -> int
+{
+  if (!run_test<float>({ 5, 1, 1 }, cle::BUFFER))
+  {
+    return EXIT_FAILURE;
+  }
+
+  if (!run_test<int32_t>({ 5, 1, 1 }, cle::BUFFER))
+  {
+    return EXIT_FAILURE;
+  }
+
+  if (!run_test<int16_t>({ 5, 1, 1 }, cle::BUFFER))
+  {
+    return EXIT_FAILURE;
+  }
+
+  if (!run_test<int8_t>({ 5, 1, 1 }, cle::BUFFER))
+  {
+    return EXIT_FAILURE;
+  }
+
+  if (!run_test<float>({ 3, 4, 1 }, cle::BUFFER))
+  {
+    return EXIT_FAILURE;
+  }
+
+  if (!run_test<int32_t>({ 3, 4, 1 }, cle::BUFFER))
+  {
+    return EXIT_FAILURE;
+  }
+
+  if (!run_test<int16_t>({ 3, 4, 1 }, cle::BUFFER))
+  {
+    return EXIT_FAILURE;
+  }
+
+  if (!run_test<int8_t>({ 3, 4, 1 }, cle::BUFFER))
+  {
+    return EXIT_FAILURE;
+  }
+
+  if (!run_test<float>({ 4, 3, 2 }, cle::BUFFER))
+  {
+    return EXIT_FAILURE;
+  }
+
+  if (!run_test<int32_t>({ 4, 3, 2 }, cle::BUFFER))
+  {
+    return EXIT_FAILURE;
+  }
+
+  if (!run_test<int16_t>({ 4, 3, 2 }, cle::BUFFER))
+  {
+    return EXIT_FAILURE;
+  }
+
+  if (!run_test<int8_t>({ 4, 3, 2 }, cle::BUFFER))
+  {
+    return EXIT_FAILURE;
+  }
+
+  return EXIT_SUCCESS;
+}

thirdparty/CMakeLists.txt

@@ -4,8 +4,8 @@ set(FETCHCONTENT_BASE_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
 ## Manage OpenCL Kernel Sources
 FetchContent_Declare(OpenCL_Kernels
-    GIT_REPOSITORY https://github.com/clEsperanto/clij-opencl-kernels.git
-    GIT_TAG        clesperanto_kernels
+    GIT_REPOSITORY https://github.com/CherifMZ/clij-opencl-kernels.git
+    GIT_TAG        fix_laplace_box
     BUILD_ALWAYS OFF
     CONFIGURE_COMMAND ""
 )