Merge branch 'release-0.10'

.gitlab-ci.yml

@@ -79,6 +79,8 @@ build-windows-msvc:
 
 ### RELEASE JOBS ###
 
+# NOTE(jda) - Current CentOS 6 release machine needs gcc environment
+#             debugged
 #release-linux-gcc:
 #  type: deploy
 #  script:
@@ -112,6 +114,7 @@ release-linux-icc:
   only:
     - devel
     - master
+    - release-0.10
   artifacts:
     paths:
       - build_release/*.gz
@@ -129,6 +132,7 @@ release-osx-clang:
   only:
     - devel
     - master
+    - release-0.10
   artifacts:
     paths:
       - build_release/*.gz
@@ -145,6 +149,7 @@ release-windows:
   only:
     - devel
     - master
+    - release-0.10
   artifacts:
     paths:
       - build_release\ospray*.zip

CHANGELOG.md

@@ -1,6 +1,11 @@
 Version History
 ---------------
 
+### Changes in v0.10.1:
+-   Fixed support of first generation Intel® Xeon Phi™ coprocessor
+    (codename Knights Corner)
+-   Restored missing implementation of `ospRemoveVolume()`
+
 ### Changes in v0.10.0:
 
 -   Added new tasking options: `Cilk`, `Internal`, and `Debug`
@@ -9,7 +14,8 @@ Version History
         - `Cilk`: Use Intel® Cilk™ Plus language extensions (ICC only)
         - `Internal`: Use hand written OSPRay tasking system
         - `Debug`: All tasks are run in serial (useful for debugging)
-    -   In most cases, `TBB` remains the fastest option
+    -   In most cases, Intel Threading Building Blocks (Intel `TBB`)
+        remains the fastest option
 -   Added support for adaptive accumulation and stopping
     -   `ospRenderFrame` now returns an estimation of the variance in
         the rendered image if the framebuffer was created with the
@@ -51,8 +57,8 @@ Version History
         renders them
     -   Ambient occlusion works with implicit isosurfaces, with a known
         visual quality/performance trade-off
--   Intel® Xeon Phi™ (codename Knights Corner) COI device and build
-    infrastructure restored (volume rendering is known to still be
+-   Intel Xeon Phi coprocessor (codename Knights Corner) COI device and
+    build infrastructure restored (volume rendering is known to still be
     broken)
 -   New support for CPack built OSPRay binary redistributable packages
 -   Added support for HDRI lighting in path tracer
@@ -66,8 +72,9 @@ Version History
     -   Trianglemesh postIntersect shading is now 64-bit safe
     -   Texture2D has been reworked, with many improvements and bug fixes
     -   Fixed bug where MPI device would freeze while rendering frames
-        with TBB
-    -   Updates to CMake with better error messages when TBB is missing
+        with Intel TBB
+    -   Updates to CMake with better error messages when Intel TBB is
+        missing
 
 ### Changes in v0.9.0:
 
@@ -80,9 +87,9 @@ changes.
     functionality of "obj" and "ao" renderers
     -   Ambient occlusion is quite flexible: dynamic number of samples,
         maximum ray distance, and weight
--   Updated Embree version to v2.7.1 with native support for AVX512 for
-    triangle mesh surface rendering on the Intel Xeon Phi processor
-    (codename Knights Landing)
+-   Updated Embree version to v2.7.1 with native support for Intel
+    AVX-512 for triangle mesh surface rendering on the Intel Xeon Phi
+    processor (codename Knights Landing)
 -   OSPRay now uses C++11 features, requiring up to date compiler and
     standard library versions (GCC v4.8.0)
 -   Optimization of volume sampling resulting in volume rendering
@@ -93,8 +100,8 @@ changes.
         material
     -   Support for alpha and depth components of framebuffer 
 -   Added thinlens camera, i.e. support for depth of field
--   Tasking system has been updated to use Intel® Threading Building
-    Blocks (TBB)
+-   Tasking system has been updated to use Intel Threading Building
+    Blocks (Intel TBB)
 -   The `ospGet*()` API calls have been deprecated and will be removed
     in a subsequent release
 
@@ -126,7 +133,7 @@ changes.
 
 ### Changes in v0.8.2:
 
--   Initial support for AVX512 and the Intel® Xeon Phi™ processor
+-   Initial support for Intel AVX-512 and the Intel Xeon Phi processor
     (codename Knights Landing)
 -   Performance improvements to the volume renderer
 -   Incorporated implicit slices and isosurfaces of volumes as core

CMakeLists.txt

@@ -31,7 +31,7 @@ ENDIF()
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake)
 SET(OSPRAY_VERSION_MAJOR 0)
 SET(OSPRAY_VERSION_MINOR 10)
-SET(OSPRAY_VERSION_PATCH 0)
+SET(OSPRAY_VERSION_PATCH 1)
 SET(OSPRAY_VERSION
   ${OSPRAY_VERSION_MAJOR}.${OSPRAY_VERSION_MINOR}.${OSPRAY_VERSION_PATCH}
 )
@@ -40,8 +40,10 @@ SET(OSPRAY_SOVERSION 0)
 SET(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo")
 IF (WIN32)
   IF (NOT OSPRAY_DEFAULT_CMAKE_CONFIGURATION_TYPES_SET)
-    SET(CMAKE_CONFIGURATION_TYPES "${CONFIGURATION_TYPES}" CACHE STRING "List of generated configurations." FORCE)
-    SET(OSPRAY_DEFAULT_CMAKE_CONFIGURATION_TYPES_SET ON CACHE INTERNAL "Default CMake configuration types set.")
+    SET(CMAKE_CONFIGURATION_TYPES "${CONFIGURATION_TYPES}"
+        CACHE STRING "List of generated configurations." FORCE)
+    SET(OSPRAY_DEFAULT_CMAKE_CONFIGURATION_TYPES_SET ON
+        CACHE INTERNAL "Default CMake configuration types set.")
   ENDIF()
 ELSE()
   IF(NOT CMAKE_BUILD_TYPE)

README.md

@@ -1,7 +1,7 @@
 OSPRay
 ======
 
-This is release v0.10.0 of OSPRay. For changes and new features see the
+This is release v0.10.1 of OSPRay. For changes and new features see the
 [changelog](CHANGELOG.md). Also visit http://www.ospray.org for more
 information.
 
@@ -23,7 +23,7 @@ compute nodes in HPC systems.
 OSPRay internally builds on top of [Embree](https://embree.github.io/)
 and [ISPC (Intel® SPMD Program Compiler)](https://ispc.github.io/),
 and fully utilizes modern instruction sets like Intel® SSE, AVX, AVX2,
-or Intel® Xeon Phi™ to achieve high rendering performance.
+and AVX-512 to achieve high rendering performance.
 
 
 OSPRay Support and Contact

apps/qtViewer/sg/geometry/TriangleMesh.cpp

@@ -116,16 +116,17 @@ namespace ospray {
     /*! 'render' the nodes */
     void PTMTriangleMesh::render(RenderContext &ctx)
     {
-      PRINT(this);
       if (ospGeometry) return;
 
       assert(ctx.world);
       assert(ctx.world->ospModel);
 
       ospGeometry = ospNewGeometry("trianglemesh");
       // set vertex arrays
-      if (vertex && vertex->notEmpty())
-        ospSetData(ospGeometry,"vertex",vertex->getOSP());
+      if (vertex && vertex->notEmpty()) {
+        OSPData data = vertex->getOSP();
+        ospSetData(ospGeometry,"vertex",data);
+      }
       if (normal && normal->notEmpty())
         ospSetData(ospGeometry,"vertex.normal",normal->getOSP());
       if (texcoord && texcoord->notEmpty())

apps/volumeViewer/QOSPRayWindow.cpp

@@ -25,9 +25,9 @@
 
 std::ostream &operator<<(std::ostream &o, const Viewport &viewport)
 {
-  o <<  "-vp " << viewport.from.x << " " << viewport.from.y << " " << viewport.from.z
-    << " -vi " << viewport.at.x   << " " << viewport.at.y   << " " << viewport.at.z
-    << " -vu " << viewport.up.x   << " " << viewport.up.y   << " " << viewport.up.z
+  o <<  "--vp " << viewport.from.x << " " << viewport.from.y << " " << viewport.from.z
+    << " --vi " << viewport.at.x   << " " << viewport.at.y   << " " << viewport.at.z
+    << " --vu " << viewport.up.x   << " " << viewport.up.y   << " " << viewport.up.z
     << std::endl;
 
   return o;

apps/volumeViewer/VolumeViewer.cpp

@@ -250,6 +250,13 @@ void VolumeViewer::screenshot(std::string filename)
   std::cout << (success ? "saved screenshot to " : "failed saving screenshot ") << filename << std::endl;
 }
 
+void VolumeViewer::keyPressEvent(QKeyEvent * event)
+{
+  if (event->key() == Qt::Key_Escape){
+    close();
+  }
+}
+
 void VolumeViewer::commitVolumes()
 {
   for(size_t i=0; i<modelStates.size(); i++)

apps/volumeViewer/VolumeViewer.h

@@ -92,6 +92,9 @@ public slots:
   //! Save screenshot.
   void screenshot(std::string filename = std::string());
 
+  //! Quit the volume viewer when pressing escape
+  virtual void keyPressEvent(QKeyEvent * event);
+
   //! Re-commit all OSPRay volumes.
   void commitVolumes();