Merge branch 'release-1.3.x'

.gitignore

@@ -19,3 +19,4 @@ ospray-doc
 !/modules
 /modules/*
 !/modules/mpi
+!/modules/pluggableGeometryExample

.gitlab-ci.yml

@@ -16,6 +16,7 @@ build-centos6-gcc:
 build-centos6-icc:
   type: build
   script:
+    - module load gcc/4.9.3
     - module load intel
     - export CC=icc
     - export CXX=icpc
@@ -25,6 +26,19 @@ build-centos6-icc:
     - icc
     - build
 
+build-centos6-icc15:
+  type: build
+  script:
+    - module load gcc/4.9.3
+    - module load intel/2015
+    - export CC=icc
+    - export CXX=icpc
+    - scripts/build_gitlab/linux.sh
+  tags:
+    - centos6
+    - icc
+    - build
+
 build-centos7-gcc:
   type: build
   script:
@@ -71,15 +85,6 @@ build-ubuntu1404-gcc:
     - gcc
     - build
 
-build-sles-gcc:
-  type: build
-  script:
-    - scripts/build_gitlab/linux.sh
-  tags:
-    - sles
-    - gcc
-    - build
-
 build-debug:
   type: build
   script:
@@ -96,6 +101,7 @@ build-mpi:
   tags:
     - linux
     - mpi
+    - gcc
     - build
 
 build-osx-clang:
@@ -125,6 +131,15 @@ build-windows-msvc14:
     - build
     - win7
 
+build-windows-msvc15:
+  type: build
+  script:
+    - call scripts\build_gitlab\win.bat "Visual Studio 15 2017 Win64" "v141"
+  tags:
+    - msvc15
+    - build
+    - win7
+
 build-windows-icc:
   type: build
   script:
@@ -136,37 +151,15 @@ build-windows-icc:
 
 ### RELEASE JOBS ###
 
-# NOTE(jda) - Current CentOS 6 release machine needs gcc environment
-#             debugged
-#release-linux-gcc:
-#  type: deploy
-#  script:
-#    - module load gcc
-#    - export CC=gcc
-#    - export CXX=g++
-#    - export OSPRAY_RELEASE_NO_VERIFY=1
-#    - scripts/release/linux.sh
-#  tags:
-#    - gcc
-#    - release
-#    - centos6
-#  only:
-#    - devel
-#    - master
-#    - release-1.0
-#  artifacts:
-#    paths:
-#      - build_release/*.gz
-
 release-linux-icc:
   type: deploy
   script:
     - module load cmake
-    - module load gcc
+    - module load gcc/4.9.3
     - module load intel
-    - module load qt
     - export CC=icc
     - export CXX=icpc
+    - export OSPRAY_RELEASE_NO_VERIFY=1 #NOTE: temporary until lib/apps split in release
     - scripts/release/linux.sh
   tags:
     - icc
@@ -176,7 +169,7 @@ release-linux-icc:
   only:
     - devel
     - master
-    - release-1.2.x
+    - release-1.3.x
   artifacts:
     paths:
       - build_release/*.gz
@@ -195,7 +188,7 @@ release-osx-clang:
   only:
     - devel
     - master
-    - release-1.2.x
+    - release-1.3.x
   artifacts:
     paths:
       - build_release/*.gz
@@ -213,7 +206,7 @@ release-windows:
   only:
     - devel
     - master
-    - release-1.2.x
+    - release-1.3.x
   artifacts:
     paths:
       - build_release\ospray*.zip

CHANGELOG.md

@@ -1,10 +1,52 @@
 Version History
 ---------------
 
+### Changes in v1.3.0:
+
+-   New MPI distributed device to support MPI distributed applications
+    using OSPRay collectively for "in-situ" rendering (currently in "alpha")
+    -   Enabled via new `mpi_distributed` device type
+    -   Currently only supports `raycast` renderer, other renderers will be
+        supported in the future
+    -   All API calls are expected to be exactly replicated (object instances
+        and parameters) except scene data (geometries and volumes)
+    -   The original MPI device is now called the `mpi_offload` device to
+        differentiate between the two implementations
+-   Support of Intel® AVX-512 for next generation Intel® Xeon® processor
+    (codename Skylake), thus new minimum ISPC version is 1.9.1
+-   Thread affinity of OSPRay's tasking system can now be controlled via
+    either device parameter `setAffinity`, or commandline parameter
+    `osp:setaffinity`, or environment variable `OSPRAY_SET_AFFINITY`
+-   Changed behavior of the background color in the SciVis renderer:
+    `bgColor` now includes alpha and is always blended (no
+    `backgroundEnabled` anymore). To disable the background don't set
+    bgColor, or set it to transparent black (0, 0, 0, 0)
+-   Geometries "`spheres`" and "`cylinders`" now support texture
+    coordinates
+-   The GLUT- and Qt-based demo viewer applications have been replaced
+    by an example viewer with minimal dependencies
+    -   Building the sample applications now requires GCC 4.9 (previously
+        4.8) for features used in the C++ standard library; OSPRay
+        itself can still be built with GCC 4.8
+    -   The new example viewer based on `ospray::sg` (called
+        `ospExampleViewerSg`) is the single application we are
+        consolidating to, `ospExampleViewer` will remain only as a
+        deprecated viewer for compatibility with the old `ospGlutViewer`
+        application
+-   Deprecated `ospCreateDevice()`; use `ospNewDevice()` instead
+-   Improved error handling
+    -   Various API functions now return an `OSPError` value
+    -   `ospDeviceSetStatusFunc` replaces the deprecated
+        `ospDeviceSetErrorMsgFunc`
+    -   New API functions to query the last error
+        (`ospDeviceGetLastErrorCode()` and `ospDeviceGetLastErrorMsg()`)
+        or to register an error callback with `ospDeviceSetErrorFunc()`
+    -   Fixed bug where exceptions could leak to C applications
+
 ### Changes in v1.2.1:
 
 -   Various bugfixes related to MPI distributed rendering, ISPC issues
-    on Windows, and other build related issues.
+    on Windows, and other build related issues
 
 ### Changes in v1.2.0:
 
@@ -23,7 +65,7 @@ Version History
     via new material "`Luminous`"
 -   Lights can optionally made invisible by using the new parameter
     `isVisible` (only relevant for path tracer)
--   OSPRay Devices are now extendable through modules and the SDK.
+-   OSPRay Devices are now extendable through modules and the SDK
     -   Devices can be created and set current, creating an alternative
         method for initializing the API
     -   New API functions for committing parameters on Devices
@@ -130,7 +172,7 @@ Version History
         -   GLUT viewer now supports volume rendering
         -   Command mode with preliminary scripting capabilities,
             enabled by pressing '`:`' key (not available when using
-            Intel C++ compiler (icc))
+            Intel C++ Compiler (icc))
     -   Enhanced support of sample applications on Windows
 -   New minimum ISPC version is 1.9.0
 -   Support of Intel® AVX-512 for second generation Intel Xeon Phi

CMakeLists.txt

@@ -95,7 +95,6 @@ ENDIF()
 ADD_SUBDIRECTORY(modules)
 
 
-
 # create a configure file that both ospray and ispc can read the cmake config
 # from needs to be at the end, after all cache variables have been set
 CONFIGURE_FILE(ospray/common/OSPConfig.h.in OSPConfig.h)