update catch2 and rkcommon

CHANGELOG.md

@@ -9,7 +9,8 @@ Version History
 -   Ship all release packages with OpenVDB
 -   Set DEPENDENTLOADFLAG also on the Windows binaries built with Clang/SYCL
 -   Fix linking applications against the GPU device module on Windows
--   Update to latest versions of dependencies
+-   Update to latest versions of dependencies (compiling the tests now
+    needs CMake v3.16 and C++14)
 
 ### Open VKL 2.0.2
 

CMakeLists.txt

@@ -82,6 +82,7 @@ openvkl_configure_ispc_isa()
 
 set(RKCOMMON_VERSION_REQUIRED 1.15.2)
 set(OPENVKL_IMGUI_GIT_TAG b48d1afbe8ee8b238e2961dc363a949dd7304e23) # v1.92.9b-docking
+set(OPENVKL_CATCH2_GIT_TAG v3.16.0)
 
 find_package(rkcommon ${RKCOMMON_VERSION_REQUIRED} REQUIRED)
 get_target_property(RKCOMMON_INCLUDE_DIRS rkcommon::rkcommon

doc/compilation.md

@@ -45,10 +45,10 @@ prerequisites:
         git clone https://github.com/openvkl/openvkl.git
 
 -   To build Open VKL you need [CMake](http://www.cmake.org) version 3.10 or
-    higher, any form of C++11
-    compiler (we recommend using GCC, but also support Clang and MSVC), and
-    standard Linux development tools. To build the examples, you should also
-    have some version of OpenGL.
+    higher (3.16 when compiling the tests), any form of C++11 compiler
+    (C++14 when compiling the tests; we recommend using GCC, but also
+    support Clang and MSVC), and standard Linux development tools. To
+    build the examples, you should also have some version of OpenGL.
 
 -   Additionally you require a copy of the [Intel® Implicit SPMD Program
     Compiler (Intel® ISPC)](http://ispc.github.io), version 1.18.0 or later.

superbuild/CMakeLists.txt

@@ -162,10 +162,10 @@ endif()
 
 option(BUILD_RKCOMMON "Build rkcommon or search in environment?" ON)
 if (BUILD_RKCOMMON)
-  set(RKCOMMON_VERSION "v1.15.3" CACHE STRING "rkcommon version to download")
+  set(RKCOMMON_VERSION "v1.15.4" CACHE STRING "rkcommon version to download")
   set(RKCOMMON_URL "https://github.com/ospray/rkcommon/archive/${RKCOMMON_VERSION}.tar.gz"
     CACHE STRING "URL of the rkcommon archive.")
-  set(RKCOMMON_HASH "31925481d189dcdddadf651dd37021108e5acaa8d39bd639de8c098157ad07b7" CACHE STRING "SHA256 hash of the rkcommon archive.")
+  set(RKCOMMON_HASH "d584cc3620e56f12f07b84358b33a14de8aed29149693a1fe6eeed64ef74ae9b" CACHE STRING "SHA256 hash of the rkcommon archive.")
   include(dep_rkcommon)
 endif()
 

testing/CMakeLists.txt

@@ -44,4 +44,8 @@ if (${OPENVKL_ENABLE_DEVICE_GPU})
   )
 endif()
 
+if (BUILD_TESTING)
+  add_subdirectory(external/catch2)
+endif()
+
 add_subdirectory(apps)

testing/apps/CMakeLists.txt

@@ -109,7 +109,6 @@ if (BUILD_TESTING)
   )
 
   openvkl_add_executable_ispc(vklTestsCPU
-    vklTests.cpp
     tests/alignment.cpp
     tests/enum.cpp
     tests/background_undefined.cpp
@@ -156,7 +155,7 @@ if (BUILD_TESTING)
 
   target_include_directories(vklTestsCPU PRIVATE ${ISPC_TARGET_DIR})
 
-  target_link_libraries(vklTestsCPU PRIVATE openvkl_testing_cpu)
+  target_link_libraries(vklTestsCPU PRIVATE openvkl_testing_cpu Catch2::Catch2WithMain)
 
   # Needed for SIMD conformance tests
   foreach(TARGET_NAME "openvkl_module_cpu_device_4"
@@ -183,7 +182,6 @@ if (BUILD_TESTING)
     )
 
     openvkl_add_executable_ispc(vklTestsGPU
-      vklTests.cpp
       tests/structured_regular_volume_sampling.cpp
       tests/structured_regular_volume_strides.cpp
       tests/structured_regular_volume_multi.cpp
@@ -210,11 +208,9 @@ if (BUILD_TESTING)
     )
     target_include_directories(vklTestsGPU PRIVATE ${ISPC_TARGET_DIR})
 
-    target_link_libraries(vklTestsGPU PRIVATE openvkl_testing_gpu)
-
-    # We need to disable catching signals to make USM Shared buffers on GPU work properly
-    target_compile_definitions(vklTestsGPU PRIVATE CATCH_CONFIG_NO_POSIX_SIGNALS=1)
-    target_compile_definitions(vklTestsGPU PRIVATE CATCH_CONFIG_NO_WINDOWS_SEH=1)
+    # signal / SEH handlers, needed off for USM Shared buffers, are configured
+    # in ../external/catch2
+    target_link_libraries(vklTestsGPU PRIVATE openvkl_testing_gpu Catch2::Catch2WithMain)
 
     install(TARGETS vklTestsGPU
       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

testing/apps/tests/hit_iterator_epsilon.cpp

@@ -233,7 +233,7 @@ TEST_CASE("Hit iterator epsilon", "[hit_iterators]")
       std::stringstream ss;
       ss << "vector (" << nativeWidth << "-wide";
 
-      SECTION(ss.str())
+      DYNAMIC_SECTION(ss.str())
       {
         if (nativeWidth == 4) {
           vector_hit_epsilons<4>(testingVolumes[i], isovalues);

testing/apps/tests/interval_iterator.cpp

@@ -222,7 +222,7 @@ void scalar_interval_value_ranges_with_value_ranges(
     const unsigned int attributeIndex,
     const vkl_vec3f &origin,
     const vkl_vec3f &direction,
-    const std::vector<vkl_range1f> valueRanges)
+    const std::vector<vkl_range1f> &valueRanges)
 {
   vkl_range1f tRange{0.f, inf};
 

testing/apps/tests/particle_volume_gradients.cpp

@@ -30,7 +30,7 @@ void gradients_at_particle_centers(size_t numParticles,
     const vec3f p3(p.x, p.y, p.z);
 
     INFO("particle i = " << i << ", p = " << p.x << " " << p.y << " " << p.z
-                         << ", radius = " << p.w)
+                         << ", radius = " << p.w);
 
     const vkl_vec3f vklGradient =
         vklComputeGradientWrapper(&vklSampler, (const vkl_vec3f *)&p3, 0, 0);

testing/apps/tests/particle_volume_radius.cpp

@@ -14,7 +14,7 @@ static float originParticleRadius = 1e-3f;
 
 // verifies sampling at particle center yields the particle weight
 static void sampling_at_particle_centers(VKLVolume vklVolume,
-                                         const std::vector<vec4f> particles)
+                                         const std::vector<vec4f> &particles)
 {
   VKLSampler vklSampler = vklNewSampler(vklVolume);
   vklCommit(vklSampler);
@@ -25,7 +25,7 @@ static void sampling_at_particle_centers(VKLVolume vklVolume,
     const vkl_vec3f p3{p.x, p.y, p.z};
 
     INFO("particle i = " << i << ", p = " << p.x << " " << p.y << " " << p.z
-                         << ", radius = " << p.w)
+                         << ", radius = " << p.w);
 
     const bool zeroRadiusParticle = p.w <= 0.f;
 
@@ -39,7 +39,7 @@ static void sampling_at_particle_centers(VKLVolume vklVolume,
     // if the particle radius is zero, then the sampled results should be zero
     const float referenceValue = zeroRadiusParticle ? 0.f : 1.f;
     const float sampledValue = vklComputeSampleWrapper(&vklSampler, &p3, 0, 0);
-    INFO("sampled = " << sampledValue)
+    INFO("sampled = " << sampledValue);
 
     REQUIRE(referenceValue == sampledValue);
   }

testing/apps/tests/particle_volume_sampling.cpp

@@ -31,11 +31,11 @@ void sampling_at_particle_centers(size_t numParticles,
     const vec3f p3(p.x, p.y, p.z);
 
     INFO("particle i = " << i << ", p = " << p.x << " " << p.y << " " << p.z
-                         << ", radius = " << p.w)
+                         << ", radius = " << p.w);
 
     float referenceValue = v->computeProceduralValue(p3);
 
-    INFO("reference = " << referenceValue)
+    INFO("reference = " << referenceValue);
 
     test_scalar_and_vector_sampling(
         vklSampler, vec3f(p.x, p.y, p.z), referenceValue, 1e-6f);

testing/apps/tests/sampling_utility.h

@@ -288,7 +288,7 @@ inline void test_stream_sampling(std::shared_ptr<TestingVolume> v,
   std::stringstream sectionName;
   sectionName << "randomized stream sampling, attribute " << attributeIndex;
 
-  SECTION(sectionName.str())
+  DYNAMIC_SECTION(sectionName.str())
   {
     vkl_box3f bbox = vklGetBoundingBox(vklVolume);
 
@@ -357,7 +357,7 @@ inline void test_stream_sampling_multi(
   std::stringstream sectionName;
   sectionName << "randomized stream sampling, multi-attribute";
 
-  SECTION(sectionName.str())
+  DYNAMIC_SECTION(sectionName.str())
   {
     vkl_box3f bbox = vklGetBoundingBox(vklVolume);
 

testing/apps/tests/vectorized_interval_iterator.cpp

@@ -98,7 +98,7 @@ TEST_CASE("Vectorized interval iterator", "[interval_iterators]")
               nullptr,
               buffer.data());
 
-          VKLInterval4 intervalPrevious, intervalCurrent;
+          VKLInterval4 intervalPrevious{}, intervalCurrent;
           int result[4];
 
           int counter = 0;
@@ -164,7 +164,7 @@ TEST_CASE("Vectorized interval iterator", "[interval_iterators]")
               nullptr,
               buffer.data());
 
-          VKLInterval8 intervalPrevious, intervalCurrent;
+          VKLInterval8 intervalPrevious{}, intervalCurrent;
           int result[8];
 
           int counter = 0;
@@ -230,7 +230,7 @@ TEST_CASE("Vectorized interval iterator", "[interval_iterators]")
               nullptr,
               buffer.data());
 
-          VKLInterval16 intervalPrevious, intervalCurrent;
+          VKLInterval16 intervalPrevious{}, intervalCurrent;
           int result[16];
 
           int counter = 0;