Remove catch2 dependency and add clang format (#367)

* Remove catch2 dependency

* Add clang format file

* Use SYCLACADEMY_ASSERT macro defined in header

Match the assert() impl without NDEBUG.

Author: hdelan

.clang-format

@@ -0,0 +1,8 @@
+Language: Cpp
+BasedOnStyle: LLVM
+AccessModifierOffset: -1
+BreakInheritanceList: BeforeComma
+BreakConstructorInitializers: BeforeComma
+Cpp11BracedListStyle: false
+PointerAlignment: Left
+SpaceBeforeCpp11BracedList: true

CMakeLists.txt

@@ -110,7 +110,6 @@ endif()
 # Exercises
 
 enable_testing()
-add_subdirectory(External/Catch2)
 add_subdirectory(Code_Exercises)
 
 # Create the Image directory

Code_Exercises/Advanced_Data_Flow/solution.cpp

@@ -8,11 +8,7 @@
  work.  If not, see <http://creativecommons.org/licenses/by-sa/4.0/>.
 */
 
-//#define SYCL_ACADEMY_USING_COMPUTECPP
-
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
-
+#include "../helpers.hpp"
 #include <sycl/sycl.hpp>
 
 class kernel_a_1;
@@ -22,13 +18,14 @@ class kernel_b_2;
 
 int usm_selector(const sycl::device& dev) {
   if (dev.has(sycl::aspect::usm_device_allocations)) {
-    if (dev.has(sycl::aspect::gpu)) return 2;
+    if (dev.has(sycl::aspect::gpu))
+      return 2;
     return 1;
   }
   return -1;
 }
 
-TEST_CASE("buffer_accessor_temporary_data", "temporary_data_solution") {
+void test_buffer() {
   constexpr size_t dataSize = 1024;
 
   float in[dataSize], out[dataSize];
@@ -38,31 +35,31 @@ TEST_CASE("buffer_accessor_temporary_data", "temporary_data_solution") {
   }
 
   try {
-    auto gpuQueue = sycl::queue{sycl::gpu_selector_v};
+    auto gpuQueue = sycl::queue { sycl::gpu_selector_v };
 
-    auto bufIn = sycl::buffer{in, sycl::range{dataSize}};
-    auto bufInt = sycl::buffer<float>{sycl::range{dataSize}};
-    auto bufOut = sycl::buffer<float>{sycl::range{dataSize}};
+    auto bufIn = sycl::buffer { in, sycl::range { dataSize } };
+    auto bufInt = sycl::buffer<float> { sycl::range { dataSize } };
+    auto bufOut = sycl::buffer<float> { sycl::range { dataSize } };
 
     bufIn.set_final_data(nullptr);
     bufOut.set_final_data(out);
 
     gpuQueue.submit([&](sycl::handler& cgh) {
-      sycl::accessor accIn{bufIn, cgh, sycl::read_only};
-      sycl::accessor accOut{bufInt, cgh, sycl::write_only};
+      sycl::accessor accIn { bufIn, cgh, sycl::read_only };
+      sycl::accessor accOut { bufInt, cgh, sycl::write_only };
 
-      cgh.parallel_for<kernel_a_1>(sycl::range{dataSize}, [=](sycl::id<1> idx) {
-        accOut[idx] = accIn[idx] * 8.0f;
-      });
+      cgh.parallel_for<kernel_a_1>(
+          sycl::range { dataSize },
+          [=](sycl::id<1> idx) { accOut[idx] = accIn[idx] * 8.0f; });
     });
 
     gpuQueue.submit([&](sycl::handler& cgh) {
-      sycl::accessor accIn{bufInt, cgh, sycl::read_only};
-      sycl::accessor accOut{bufOut, cgh, sycl::write_only};
+      sycl::accessor accIn { bufInt, cgh, sycl::read_only };
+      sycl::accessor accOut { bufOut, cgh, sycl::write_only };
 
-      cgh.parallel_for<kernel_b_1>(sycl::range{dataSize}, [=](sycl::id<1> idx) {
-        accOut[idx] = accIn[idx] / 2.0f;
-      });
+      cgh.parallel_for<kernel_b_1>(
+          sycl::range { dataSize },
+          [=](sycl::id<1> idx) { accOut[idx] = accIn[idx] / 2.0f; });
     });
 
     gpuQueue.wait_and_throw();
@@ -71,11 +68,11 @@ TEST_CASE("buffer_accessor_temporary_data", "temporary_data_solution") {
   }
 
   for (int i = 0; i < dataSize; ++i) {
-    REQUIRE(out[i] == i * 4.0f);
+    SYCLACADEMY_ASSERT(out[i] == i * 4.0f);
   }
 }
 
-TEST_CASE("usm_temporary_data", "temporary_data_solution") {
+void test_usm() {
   constexpr size_t dataSize = 1024;
 
   float in[dataSize], out[dataSize];
@@ -85,7 +82,7 @@ TEST_CASE("usm_temporary_data", "temporary_data_solution") {
   }
 
   try {
-    auto usmQueue = sycl::queue{usm_selector};
+    auto usmQueue = sycl::queue { usm_selector };
 
     auto devicePtrIn = sycl::malloc_device<float>(dataSize, usmQueue);
     auto devicePtrInt = sycl::malloc_device<float>(dataSize, usmQueue);
@@ -94,13 +91,13 @@ TEST_CASE("usm_temporary_data", "temporary_data_solution") {
     auto e1 = usmQueue.memcpy(devicePtrIn, in, sizeof(float) * dataSize);
 
     auto e2 = usmQueue.parallel_for<kernel_a_2>(
-        sycl::range{dataSize}, e1, [=](sycl::id<1> idx) {
+        sycl::range { dataSize }, e1, [=](sycl::id<1> idx) {
           auto globalId = idx[0];
           devicePtrInt[globalId] = devicePtrIn[globalId] * 8.0f;
         });
 
     auto e3 = usmQueue.parallel_for<kernel_b_2>(
-        sycl::range{dataSize}, e2, [=](sycl::id<1> idx) {
+        sycl::range { dataSize }, e2, [=](sycl::id<1> idx) {
           auto globalId = idx[0];
           devicePtrOut[globalId] = devicePtrInt[globalId] / 2.0f;
         });
@@ -122,6 +119,11 @@ TEST_CASE("usm_temporary_data", "temporary_data_solution") {
   }
 
   for (int i = 0; i < dataSize; ++i) {
-    REQUIRE(out[i] == i * 4.0f);
+    SYCLACADEMY_ASSERT(out[i] == i * 4.0f);
   }
 }
+
+int main() {
+  test_usm();
+  test_buffer();
+}

Code_Exercises/Advanced_Data_Flow/source.cpp

@@ -41,16 +41,16 @@
  *          auto write_acc = sycl::accessor{buf, cgh, sycl::write_only};
  *          auto no_init_acc = sycl::accessor{buf, cgh, sycl::no_init};
  * //    2. Enqueue a parallel for:
- *          cgh.parallel_for<class mykernel>(sycl::range{n}, [=](sycl::id<1> i) {
+ *          cgh.parallel_for<class mykernel>(sycl::range{n}, [=](sycl::id<1> i)
+ {
  *              // Do something
  *          });
  *
 */
 
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include "../helpers.hpp"
 
-TEST_CASE("temporary_data", "temporary_data_source") {
+int main() {
   constexpr size_t dataSize = 1024;
 
   float in[dataSize], out[dataSize], tmp[dataSize];
@@ -60,20 +60,20 @@ TEST_CASE("temporary_data", "temporary_data_source") {
     out[i] = 0.0f;
   }
 
-  // Task: run these kernels on a SYCL device, minimising the memory transfers between the host and device
+  // Task: run these kernels on a SYCL device, minimising the memory transfers
+  // between the host and device
 
   // Kernel A
   for (int i = 0; i < dataSize; ++i) {
     tmp[i] = in[i] * 8.0f;
   }
 
-
   // Kernel B
   for (int i = 0; i < dataSize; ++i) {
     out[i] = tmp[i] / 2.0f;
   }
 
   for (int i = 0; i < dataSize; ++i) {
-    REQUIRE(out[i] == i * 4.0f);
+    SYCLACADEMY_ASSERT(out[i] == i * 4.0f);
   }
 }