Release preparations

.gitignore

@@ -1,5 +1,4 @@
 ./
-CMake/common/
 Deflect/
 FlatBuffers/
 RESTBridge/
@@ -24,4 +23,3 @@ CMakeFiles
 *.includes
 *.creator*
 *.user
-

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "CMake/common"]
+	path = CMake/common
+	url = https://github.com/Eyescale/CMake

.gitsubprojects

@@ -1,28 +1,28 @@
 # -*- mode: cmake -*-
-git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git cfa6243)
+git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git 2635f7f)
 
 if(BRAYNS_NETWORKING_ENABLED OR BRAYNS_DEFLECT_ENABLED)
-  git_subproject(Lexis https://github.com/HBPVis/Lexis.git 2f50220)
+  git_subproject(Lexis https://github.com/HBPVis/Lexis.git 92b8ff0)
 endif()
 
 if(BRAYNS_NETWORKING_ENABLED)
-  git_subproject(ZeroBuf https://github.com/HBPVIS/ZeroBuf.git cea0338)
-  git_subproject(ZeroEQ https://github.com/HBPVis/ZeroEQ.git 9ecd76b)
+  git_subproject(ZeroBuf https://github.com/HBPVIS/ZeroBuf.git 748d6aa)
+  git_subproject(ZeroEQ https://github.com/HBPVis/ZeroEQ.git 1949f24)
 endif()
 
 # Streaming to display walls
 if(BRAYNS_DEFLECT_ENABLED)
-  git_subproject(Deflect https://github.com/BlueBrain/Deflect.git f7b9019)
+  git_subproject(Deflect https://github.com/BlueBrain/Deflect.git 0d10736)
 endif()
 
 # Data access
 if(BRAYNS_BRION_ENABLED)
-  git_subproject(Servus https://github.com/HBPVIS/Servus.git 36180b5)
-  git_subproject(Brion https://github.com/BlueBrain/Brion.git 15b6434)
-  git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git f05b9c6)
+  git_subproject(Servus https://github.com/HBPVIS/Servus.git eee5765)
+  git_subproject(Brion https://github.com/BlueBrain/Brion.git 98db6dc)
+  git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git 867f8d9)
 endif()
 
 # Livre rendering engine
 if(BRAYNS_LIVRE_ENABLED)
-  git_subproject(Livre https://github.com/BlueBrain/Livre.git 66362a3)
+  git_subproject(Livre https://github.com/BlueBrain/Livre.git 33f3e8b)
 endif()

CMakeLists.txt

@@ -10,19 +10,21 @@ project(Brayns VERSION 0.3.0)
 
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake
                               ${CMAKE_SOURCE_DIR}/CMake/common)
-include(GitExternal)
+if(NOT EXISTS ${CMAKE_SOURCE_DIR}/CMake/common/Common.cmake)
+  message(FATAL_ERROR "CMake/common missing, run: git submodule update --init")
+endif()
 
 set(COMMON_PROJECT_DOMAIN ch.epfl.bluebrain)
 set(BRAYNS_DESCRIPTION "Hardware Agnostic Ray-Tracer")
 
-option(BRAYNS_BRION_ENABLED "Activate Brion" ON)
-option(BRAYNS_DEFLECT_ENABLED "Activate streaming to display wall" ON)
-option(BRAYNS_NETWORKING_ENABLED "Activate networking interfaces" ON)
-option(BRAYNS_ASSIMP_ENABLED "Activate assimp library for standard 3D file format management" ON)
-option(BRAYNS_IMAGEMAGICK_ENABLED "Activate IMAGEMAGICK library for standard image file format management" ON)
+option(BRAYNS_BRION_ENABLED "Activate Brion" OFF)
+option(BRAYNS_DEFLECT_ENABLED "Activate streaming to display wall" OFF)
+option(BRAYNS_NETWORKING_ENABLED "Activate networking interfaces" OFF)
+option(BRAYNS_ASSIMP_ENABLED "Activate assimp library for standard 3D file format management" OFF)
+option(BRAYNS_IMAGEMAGICK_ENABLED "Activate IMAGEMAGICK library for standard image file format management" OFF)
 option(BRAYNS_OSPRAY_ENABLED "Activate OSPRay rendering engine" ON)
-option(BRAYNS_OPTIX_ENABLED "Activate OptiX rendering engine" ON)
-option(BRAYNS_LIVRE_ENABLED "Activate Livre rendering engine" ON)
+option(BRAYNS_OPTIX_ENABLED "Activate OptiX rendering engine" OFF)
+option(BRAYNS_LIVRE_ENABLED "Activate Livre rendering engine" OFF)
 
 set(EMBREE_MAX_ISA "AVX512KNL" CACHE STRING "MAX ISA SSE,AVX,AVX2,AVX512KNL")
 
@@ -31,21 +33,21 @@ include(Common)
 include(BraynsDepResolver)
 
 if(BRAYNS_OSPRAY_ENABLED)
-    # ------------------------------------------------------------------------------
-    # OSPRAY specific settings
-    # ------------------------------------------------------------------------------
-    # compiler selection for the non-MIC part
-    if(APPLE)
-      set(OSPRAY_COMPILER "CLANG" CACHE STRING "compiler to use (ICC,GCC, or CLANG)")
-      set_property(CACHE OSPRAY_COMPILER PROPERTY STRINGS ICC GCC CLANG)
-    else(APPLE)
-      set(OSPRAY_COMPILER "GCC" CACHE STRING "compiler to use (ICC or GCC)")
-      set_property(CACHE OSPRAY_COMPILER PROPERTY STRINGS ICC GCC)
-    endif()
-
-    # the arch we're targeting for the non-MIC/non-xeon phi part of ospray
-    set(BRAYNS_BUILD_ISA "ALL" CACHE STRING "Target ISA (SSE,AVX,AVX2,or ALL)")
-    set_property(CACHE BRAYNS_BUILD_ISA PROPERTY STRINGS ALL SSE AVX AVX2)
+  # ------------------------------------------------------------------------------
+  # OSPRAY specific settings
+  # ------------------------------------------------------------------------------
+  # compiler selection for the non-MIC part
+  if(APPLE)
+    set(OSPRAY_COMPILER "CLANG" CACHE STRING "compiler to use (ICC,GCC, or CLANG)")
+    set_property(CACHE OSPRAY_COMPILER PROPERTY STRINGS ICC GCC CLANG)
+  else(APPLE)
+    set(OSPRAY_COMPILER "GCC" CACHE STRING "compiler to use (ICC or GCC)")
+    set_property(CACHE OSPRAY_COMPILER PROPERTY STRINGS ICC GCC)
+  endif()
+
+  # the arch we're targeting for the non-MIC/non-xeon phi part of ospray
+  set(BRAYNS_BUILD_ISA "ALL" CACHE STRING "Target ISA (SSE,AVX,AVX2,or ALL)")
+  set_property(CACHE BRAYNS_BUILD_ISA PROPERTY STRINGS ALL SSE AVX AVX2)
 endif()
 
 common_find_package(Boost REQUIRED COMPONENTS
@@ -54,12 +56,12 @@ common_find_package(vmmlib REQUIRED)
 common_find_package(OpenMP)
 
 if(BRAYNS_IMAGEMAGICK_ENABLED==ON)
-common_find_package(Magick++ SYSTEM)
+  common_find_package(Magick++ SYSTEM)
 endif()
 
 if( NOT( OPTIX_FOUND AND CUDA_FOUND ) AND NOT OSPRAY_FOUND AND NOT TARGET LivreLib )
-    message( FATAL_ERROR
-        "Neither OptiX+CUDA, OSPRay nor Livre were found. Brayns cannot work without an engine" )
+  message( WARNING
+      "Neither OptiX+CUDA, OSPRay nor Livre were found. Brayns cannot work without an engine" )
 endif()
 
 common_find_package_post()

README.md

@@ -64,26 +64,26 @@ Download and extract [ISPC compiler 1.9.1 archive](https://ispc.github.io/downlo
 
 #### Embree
 
-Clone embree 2.14.0 in the same folder level as ISPC compiler
+Clone embree 2.16.1 in the same folder level as ISPC compiler
 
 ```
   git clone https://github.com/embree/embree.git
   mkdir embree/Build
   cd embree/Build
-  git checkout c24bc55
+  git checkout 788d912
   cmake .. -DCMAKE_INSTALL_PREFIX=<Brayns_installation_folder>
   make install
 ```
 
 #### OSPRay
 
-Clone OSPRay 1.2.0 in the same folder level as ISPC compiler
+Clone OSPRay 1.2.1 in the same folder level as ISPC compiler
 
 ```
   git clone https://github.com/ospray/OSPRay.git
   mkdir OSPRay/Build
   cd OSPRay/Build
-  git checkout a6798ef
+  git checkout be966e3
   export embree_DIR=<Brayns_installation_folder>
   cmake .. -DOSPRAY_USE_EXTERNAL_EMBREE=ON -DCMAKE_INSTALL_PREFIX=<Brayns_installation_folder>
   make install
@@ -92,10 +92,10 @@ Clone OSPRay 1.2.0 in the same folder level as ISPC compiler
 ### Brayns
 
 ```
-  git clone https://github.com/BlueBrain/Brayns.git
+  git clone --recursive https://github.com/BlueBrain/Brayns.git
   mkdir Brayns/Build
   cd Brayns/Build
-  CMAKE_PREFIX_PATH=<Brayns_installation_folder>/lib/cmake/embree-2.14.0:<Brayns_installation_folder>/lib/cmake/ospray-1.2.0 cmake .. -DCMAKE_INSTALL_PREFIX=<Brayns_installation_folder>
+  CMAKE_PREFIX_PATH=<Brayns_installation_folder>/lib/cmake/embree-2.14.0:<Brayns_installation_folder>/lib/cmake/ospray-1.2.0 cmake .. -DCLONE_SUBPROJECTS=ON -DCMAKE_INSTALL_PREFIX=<Brayns_installation_folder>
   make install
 ```
 

brayns/io/MorphologyLoader.cpp

@@ -840,7 +840,7 @@ bool MorphologyLoader::importSimulationData(const servus::URI& circuitConfig,
         ++progress;
         const float frameTime = firstFrame + step * frame;
         const brion::floatsPtr& valuesPtr =
-            compartmentReport.loadFrame(frameTime);
+            compartmentReport.loadFrame(frameTime).get();
         const floats& values = *valuesPtr;
         simulationHandler->writeFrame(file, values);
     }

doc/ChangeLog.md

@@ -1,7 +1,7 @@
 Changelog {#Changelog}
 =========
 
-# master
+# Release 0.3 (01-06-2017)
 
 * [#158](https://github.com/BlueBrain/Brayns/pull/158):
   Added memory-mode command line argument to define how memory is shared between Brayns and underlying engine