Merge branch 'master' into abseil

BlueBrain · Oct 11, 2017 · 1eaf9e8 · 1eaf9e8
2 parents c1a7f86 + e413672
commit 1eaf9e8
Show file tree

Hide file tree

Showing 13 changed files with 75 additions and 43 deletions.
diff --git a/bbp/benchmark/stream/default.nix b/bbp/benchmark/stream/default.nix
@@ -47,6 +47,8 @@ stdenv.mkDerivation rec {
     "-shared-intel"
     "-qopenmp"
     "-qopt-streaming-stores always"
+  ] ++ stdenv.lib.optionals (! stdenv ? isICC) [
+    "-fopenmp"
   ] ++ extra_cflags;
 
 

diff --git a/bbp/default.nix b/bbp/default.nix
@@ -250,20 +250,22 @@ let
         };
 
         embree = callPackage ./viz/embree {
-
+            stdenv = stdenvIntelfSupported;
         };
 
         ospray = callPackage ./viz/ospray {
+            stdenv = stdenvIntelfSupported;
             mpi = bbp-mpi-rdma;
         };
 
         ospray-devel = callPackage ./viz/ospray {
+            stdenv = stdenvIntelfSupported;
             mpi = bbp-mpi-rdma;
             devel = true;
         };
 
         ospray-modules = callPackage ./viz/ospray-modules {
-            ospray = ospray-devel;
+            stdenv = stdenvIntelfSupported;
         };
 
         brayns = callPackage ./viz/brayns {

diff --git a/bbp/modules/default.nix b/bbp/modules/default.nix
@@ -882,8 +882,11 @@ let
             description = "ospray module generated by nix";
             packages = [
                             pkgs.ospray
+                            pkgs.ospray-modules
                        ];
             conflicts = conflicts-modules;
+            # for ospray-modules plugins loaded by ospray inside LD_LIBRARY_PATH
+            extraContent = "prepend-path LD_LIBRARY_PATH $targetEnv/lib/";
         };
 
         ospray-devel = pkgs.envModuleGen rec {

diff --git a/bbp/viz/brayns/default.nix b/bbp/viz/brayns/default.nix
@@ -5,7 +5,7 @@
 , boost
 , assimp ? null
 , ospray
-, embree 
+, tbb
 , freeglut
 , libXmu
 , libXi
@@ -28,25 +28,22 @@ assert restInterface -> (zeroeq != null && zerobuf != null && lexis != null );
 
 stdenv.mkDerivation rec {
 	name = "brayns-${version}";
-	version = "0.3.0-201709";
+	version = "0.3.0-201710";
 
-	buildInputs = [ cmake pkgconfig boost assimp ospray freeglut libXmu libXi
+	buildInputs = [ cmake pkgconfig boost assimp ospray freeglut libXmu libXi tbb
 					glew vmmlib lunchbox brion hdf5-cpp imagemagick deflect ]
 				  ++ (stdenv.lib.optional) (restInterface) [ zerobuf zeroeq lexis zerobuf.python ];
 
 	src = fetchgit {
 		url  = "https://github.com/BlueBrain/Brayns.git";
-		rev = "355726ca528ab5d9fa01d7be324b9fc4c55bc260";
-		sha256 = "17p6nha0byfrildy58rvwa26dqx8irgdi3l5h62a29i356nvk248";
+		rev = "e80493686378d825608f35d3ea1db4fd748dfaca";
+		sha256 = "03p5vv8rxbrkgfx92vdfvd81m3lcivwxba9yar6d0mzq0lc5jxlp";
 	};
 
 
 	cmakeFlags = [ 
 			"-DCOMMON_DISABLE_WERROR=TRUE"
 			"-DOSPRAY_ROOT=${ospray}"
-			"-DEMBREE_ROOT=${embree}"
-			"-DBRAYNS_USE_OPTIONAL_DEPENDENCY=ON"
-			"-DBRAYNS_LIVRE_ENABLED=OFF"
 		    ];
 
 

diff --git a/bbp/viz/deflect/default.nix b/bbp/viz/deflect/default.nix
@@ -12,14 +12,14 @@
 
 stdenv.mkDerivation rec {
   name = "deflect-${version}";
-  version = "0.14.0-dev201709";
+  version = "0.14.0-201710";
 
   buildInputs = [ stdenv cmake boost freeglut mesa libjpeg_turbo libXi libXmu qt.base ];
 
   src = fetchgit {
     url = "https://github.com/BlueBrain/Deflect";
-    rev = "ee41aa403bfab6a38108296c03f8e1f8bfd90151";
-    sha256 = "12snvy2ngsi69f26g7bcxpd89ik0wl4d97apik50p4ba19c4kn5c";
+    rev = "de281e990716b1733f3b40a1eacdae81797bcce9";
+    sha256 = "0na4bwp33agxyv73c9vw3ridb78j0mq82znrkah4cpr8h5vbbyx8";
   };
 
   enableParallelBuilding = true;

diff --git a/bbp/viz/embree/default.nix b/bbp/viz/embree/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
     name = "embree-${version}";
-    version = "2.16.5";
+    version = "2.17.0";
 
     src = fetchFromGitHub {
         owner = "embree";
         repo = "embree";
-        rev = "68219475088e35bf5a0f603ae777743b680bc3b2";
-        sha256 = "1h8my7r35q6x203nbwjf0dspj5y3njlgx4nggfiswrgwvx1741sr";
+        rev = "c48d21814cd5c590c7d77e1ac699c586be7ada70";
+        sha256 = "0ri4xndxwc18622kzcz4q0s5ff1dcc6d5vfzimcmxilzm369c2p8";
     };
 
 

diff --git a/bbp/viz/ospray-modules/default.nix b/bbp/viz/ospray-modules/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
 
         src = fetchgitPrivate {
         url = "[email protected]:BlueBrain/ospray-modules.git";
-        rev = "35be398e8e400bf4523d64512daefafb658e8115";
-        sha256 = "0bbqb55vvd5fjbfaqri4jywg6nvpmaybqp33428rc5vns1hrqpva";
+        rev = "558d7f4862b2aef653bdb34c33bb246c84730ce6";
+        sha256 = "1dfjy5385czh34mp6b0jydxgyqwrbb1qzf94q6vbhxkv8aw07xqj";
     };
 
     # right now no top-level CMakeLists.txt, so build the only module we have now

diff --git a/bbp/viz/ospray/default.nix b/bbp/viz/ospray/default.nix
@@ -22,9 +22,9 @@ let
 	};
 
 	release-info = {
-		version = "1.3.1";
-		rev = "4907ab0e25b20cb0a863927c32cea8dfc1a66433";
-		sha256 = "03lv0dl15kvf04xlb8accz66i7cab299fgbd1kv6gkhm47lwr35h";
+		version = "1.4.0";
+		rev = "d433745f558a8a59340fe6d662601e37d46aec07";
+		sha256 = "19hd87iqkc492ariwqwwavja95f1jh20r12ry6mj5p84f4hhwc8x";
 	};
 
 	ospray-info = if (devel) then devel-info else release-info;
@@ -47,8 +47,7 @@ stdenv.mkDerivation rec {
 
 
 
-    cmakeFlags = [ "-DOSPRAY_USE_EXTERNAL_EMBREE=TRUE"      # disable bundle embree
-                   "-DOSPRAY_ZIP_MODE=OFF"                   #disable bundle dependencies
+    cmakeFlags = [ "-DOSPRAY_ZIP_MODE=OFF"                   #disable bundle dependencies
                    "-Dembree_DIR=${embree}" 
                    "-DEMBREE_MAX_ISA=AVX2"
                    "-DTBB_ROOT=${tbb}"

diff --git a/bbp/viz/servus/default.nix b/bbp/viz/servus/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "servus-${version}";
-  version= "1.5.1-dev201708";
+  version= "1.6.0-dev201710";
 
   buildInputs = [ stdenv pkgconfig boost cmake doxygen avahi];
 
   src = fetchgit {
     url = "https://github.com/HBPVIS/Servus.git";  
-    rev = "7a60583ad1bb337b9a8b3a8b006e7a342cd57fa4";
-    sha256 = "1vdlkgv3xmv8jqi13vfq3r34gsxchfmzyrvxc3lyz8i880lcm90x";
+    rev = "8d47578a7b738432f294b12af80aa9c9d9080df0";
+    sha256 = "033f2jjkfzaw66nafhgyf1qry8bjbsk3f4plzkhrdhv7hf6kgb18";
   };
 
 

diff --git a/bbp/viz/zeroeq/default.nix b/bbp/viz/zeroeq/default.nix
@@ -11,16 +11,16 @@
 
 stdenv.mkDerivation rec {
   name = "zeroeq-${version}";
-  version = "0.8.0-dev201708";
+  version = "0.9.0-201710";
 
   buildInputs = [ stdenv pkgconfig servus cmake boost zeromq openssl ];
 
 
 
   src = fetchgit {
     url = "https://github.com/HBPVIS/ZeroEQ.git";
-    rev = "ed5ad57949cba799b21ab5eae039c27f61b935ba";
-    sha256 = "1r2g7sifnv3fcl0n0cxbaypryb4pdj1xrnnpj6v0izgr5n95flr9";
+    rev = "ce76c9ca4f8cd83d470d46023af2c75323c2c7b0";
+    sha256 = "1irq44cab4pihyfxna3ljlr9sdkin7vi6z5c92b34lx4vac0813l";
   };
 
   propagatedBuildInputs = [ servus ];

diff --git a/bin/nixpkgs_path b/bin/nixpkgs_path
@@ -0,0 +1,23 @@
+# This script need to be sourced
+#
+# e.g 
+# source bin/nixpkgs_path
+# nix-shell -p python -p pythonPackages.numpy 
+
+# export user specific TMPDIR
+export TMPDIR="$(mktemp -d)"
+
+# get current path
+NIXPKGS_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd .. && pwd -P)"
+
+
+VAR_ENV="export NIX_PATH=\"nixpkgs=${NIXPKGS_DIR}:\$NIX_PATH\""
+
+# print it
+echo "$VAR_ENV"
+
+# export it
+eval "$VAR_ENV"
+
+
+
diff --git a/ci/jenkins/build-helpers.sh b/ci/jenkins/build-helpers.sh
@@ -8,11 +8,14 @@ export BBP_NETWORK_PROXY="http://bbpproxy.epfl.ch:80/"
 
 ## number of cores for -j
 ## use ncore if present
-## or try to get it from /proc if not 
+## or try to get it from /proc if not
 if [[ "$(which ncore 2> /dev/null)x" != "x" ]]; then
-	NCORES="$(ncore)" 
-else
+	NCORES="$(ncore)"
+elif [ -f /proc/cpuinfo ] ;then
 	NCORES="$(grep -c "processor" /proc/cpuinfo)"
+else
+	# OSX
+	NCORES="$(sysctl -n hw.ncpu)"
 fi
 
 ## add 2 process for configure and fetching
@@ -48,7 +51,7 @@ function collectAllGarbage {
 	if [[ "${NODE_IS_BGQ}x" == "x" ]]; then
 		nix-collect-garbage --delete-older-than 30d || true
 	fi
-} 
+}
 
 
 function setupNixEnvironment {
@@ -63,16 +66,16 @@ function setupNixEnvironment {
 	if [[ "${HOSTNAME_STRING}" == *"bg1"* ]]; then
 		echo "#### BlueGene/Q environment detected"
 		export NODE_IS_BGQ=1
-		module load nix 
+		module load nix
 		return
 	fi
 
-	if [[ "$(which nix)" != "" ]]; then
-		echo "#### nix tool found in path at $(which nix), skip install"
-		return
+	if [[ "$(which nix-build)" != "" ]]; then
+		echo "#### nix tool found in path at $(which nix-build), skip install"
+	else
+		installNixMonoUser
 	fi
 
-	installNixMonoUser
 	if [[ "${NODE_NEED_PROXY}x" != "x" ]] || [[ "${HTTP_PROXY}x" != "x" ]] || [[ "${http_proxy}x" != "x"  ]]; then
 		setupProxyVM
 	fi
@@ -94,15 +97,15 @@ function loadNixpkgsEnv {
 	export NIXPKGS_DIR="$(readlink  -f ${SCRIPT_DIR}/../../sourcethis.sh)"
 
 	echo "### load and use BBPpkgs: ${NIXPKGS_DIR} "
-    source ${NIXPKGS_DIR}	
+    source ${NIXPKGS_DIR}
 
 }
 
 
 function buildDerivationList {
 	echo "### Launch build for $@"
  	NB_PKGS="$#"
-	echo "#### configured for ${NB_PKGS} derivations"	
+	echo "#### configured for ${NB_PKGS} derivations"
 	echo "#### parallel build with -j ${NCORES} "
 
 	export PKG_BUILD_DRV=""
@@ -136,12 +139,12 @@ echo "## Start build for the derivations: $@"
 	export DERIVATION_PATH="./"
 
 	setupNixEnvironment
-	loadNixpkgsEnv 
+	loadNixpkgsEnv
 
 	buildDerivationList $@
 
 	copyClosuresToCache
-	
-	collectAllGarbage	
+
+	collectAllGarbage
 
 }
diff --git a/patches/manylinux1/default.nix b/patches/manylinux1/default.nix
@@ -3,6 +3,7 @@
 , ncurses
 , xorg
 , glib
+, libxml2
 , buildEnv
 }:
 
@@ -35,6 +36,8 @@ let
                     xorg.libXrender
                     xorg.libX11
                     xorg.libXext
+                    # extension
+                    libxml2 
                 ];
     };