Merge branch 'master' into abseil

BlueBrain · Oct 11, 2017 · 7c97dfb · 7c97dfb
2 parents 1eaf9e8 + 0d4266b
commit 7c97dfb
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 4 deletions.
diff --git a/bbp/hpc/steps/default.nix b/bbp/hpc/steps/default.nix
@@ -58,16 +58,28 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     # 42 dude !
     export CC=mpicc
-    export CXX=mpicxx
+    export CXX=mpic++
     export CXXFLAGS="-pthread -D__STDC_CONSTANT_MACROS"
+
+  '' + (stdenv.lib.optionalString) (stdenv ? isBlueGene) ''
+    echo "enable BGQ specific tuning "
   '';
 
   cmakeFlags = [
     "-DCMAKE_CXX_COMPILER=mpic++"
     "-DCMAKE_C_COMPILER=mpicc"
     "-DPETSC_EXECUTABLE_RUNS=TRUE"
+  ] ++ (stdenv.lib.optionals) (stdenv ? isBlueGene) [
+    "-DTARGET_NATIVE_ARCH=OFF"
   ];
 
+  makeFlags = [ "VERBOSE=1" ];
+
+  postInstall = ''
+    mkdir -p $out/${python.sitePackages}
+    ln -s $out/steps $out/${python.sitePackages}/steps
+  '';
+
   doCheck = false;
 
   checkPhase = ''export LD_LIBRARY_PATH="$PWD/src:$LD_LIBRARY_PATH" ctest -V'';

diff --git a/bbp/modules/default.nix b/bbp/modules/default.nix
@@ -2337,6 +2337,11 @@ with generic-modules; rec {
                     pkgs.bgq-pythonPackages-gcc47.bg-numpy.crossDrv
                     bgq-pythonPackages-gcc47.bg-mpi4py.crossDrv
                     bgq-pythonPackages-gcc47.bg-h5py.crossDrv
+                    bgq-pythonPackages-gcc47.pyparsing.crossDrv
+                    bgq-pythonPackages-gcc47.bg-matplotlib.crossDrv
+                    bgq-pythonPackages-gcc47.six.crossDrv
+                    bgq-pythonPackages-gcc47.nose.crossDrv
+
                     pkgs.pythonPackages.enum
                     pkgs.pythonPackages.pip
                     pkgs.pythonPackages.virtualenv

diff --git a/bluegene/bg-pythonPackages/default.nix b/bluegene/bg-pythonPackages/default.nix
@@ -56,7 +56,7 @@ let
 
        });
 
-        bg-h5py = pythonPkgs.h5py.override {
+       bg-h5py = pythonPkgs.h5py.override {
     		mpi = mpiRuntime.crossDrv;
     		mpi4py = bg-mpi4py;
     		mpiSupport = false;
@@ -66,6 +66,11 @@ let
 	    };
 
 
+      bg-matplotlib = pythonPkgs.matplotlib.override {
+            numpy = bg-numpy;
+      };
+
+
     };
 
 

diff --git a/bluegene/bg-pythonPackages/matplotlib/default.nix b/bluegene/bg-pythonPackages/matplotlib/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, python, buildPythonPackage, pycairo
+, which, dateutil, nose, numpy, pyparsing, tornado
+, freetype, libpng, pkgconfig, mock, pytz, pygobject3
+, enableGhostscript ? false, ghostscript ? null, gtk3
+, enableGtk2 ? false, pygtk ? null, gobjectIntrospection
+, enableGtk3 ? false, cairo
+}:
+
+assert enableGhostscript -> ghostscript != null;
+assert enableGtk2 -> pygtk != null;
+
+buildPythonPackage rec {
+  name = "matplotlib-1.4.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/matplotlib/${name}.tar.gz";
+    sha256 = "1dn05cvd0g984lzhh72wa0z93psgwshbbg93fkab6slx5m3l95av";
+  };
+
+  XDG_RUNTIME_DIR = "/tmp";
+
+  buildInputs = [ python ]
+    ++ stdenv.lib.optional enableGhostscript ghostscript;
+
+  propagatedBuildInputs =
+    [ dateutil nose numpy pyparsing tornado freetype 
+      libpng mock pytz  
+    ]
+    ++ stdenv.lib.optional enableGtk2 pygtk
+    ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobjectIntrospection pygobject3 ];
+
+  propagatedNativeBuildInputs = [ pkgconfig which ];
+
+  meta = with stdenv.lib; {
+    description = "python plotting library, making publication quality plots";
+    homepage    = "http://matplotlib.sourceforge.net/";
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/bluegene/bg-pythonPackages/python-packages.nix b/bluegene/bg-pythonPackages/python-packages.nix
@@ -7587,9 +7587,9 @@ let
   };
 
 
-  matplotlib = callPackage ../../std-nixpkgs/pkgs/development/python-modules/matplotlib/default.nix {
+  matplotlib = callPackage ./matplotlib/default.nix {
     stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
-    enableGhostscript = true;
+    enableGhostscript = false;
   };