Work in progress on the 'simple' benchmark.

deployments/ci.nix

@@ -141,6 +141,7 @@ in
                  "yggdrasil-c": { "url" : "https://xgitlab.cels.anl.gov/argo/yggdrasil-c.git" },
                  "kernel": { "url" : "https://xgitlab.cels.anl.gov/argo/kernel.git" },
                  "util-linux": { "url" : "https://xgitlab.cels.anl.gov/argo/util-linux.git" }
+                 "libmsr": { "url" : "https://github.com/LLNL/libmsr.git" }
              }
           }
         '';

pkgs/applications/simple/default.nix

-{ stdenv, fetchgit, zeromq }:
+{ stdenv, fetchgit, zeromq, intel, gsl }:
 stdenv.mkDerivation {
   name = "simple";
   src = fetchgit {
@@ -6,31 +6,15 @@ stdenv.mkDerivation {
     sha256="0wpxb25bfry116rzjb8c66fpxqibrn1dby4xpfsbrnvbhhirck9z";
   };
 
-  buildInputs = [ zeromq];
-
-  requiredSystemFeatures = [ "icc+mkl" ];
+  buildInputs = [ zeromq intel.mkl intel.icc gsl ];
 
   buildPhase = ''
     cd simple
-
-    export MKLROOT=/opt/intel/compilers_and_libraries_2018.3.222/linux/mkl
-    export IPPROOT=/opt/intel/compilers_and_libraries_2017.1.132/linux/ipp
-    export INTEL_LICENSE_FILE=/opt/intel/compilers_and_libraries_2017.1.132/linux/licenses
-    export LIBRARY_PATH=/opt/intel/compilers_and_libraries_2018.3.222/linux/mkl/lib/intel64_lin:/opt/intel/compilers_and_libraries_2018.3.222/linux/compiler/lib/intel64_lin:/opt/intel/compilers_and_libraries_2018.3.222/linux/tbb/lib/intel64_lin/gcc4.7:/opt/intel/compilers_and_libraries_2017.1.132/linux/ipp/lib/intel64:/opt/intel/compilers_and_libraries_2017.1.132/linux/compiler/lib/intel64_lin:/opt/intel/compilers_and_libraries_2017.1.132/linux/daal/lib/intel64_lin:$LIBRARY_PATH
-    export LD_LIBRARY_PATH=/opt/intel/compilers_and_libraries_2018.3.222/linux/mkl/lib/intel64_lin:/opt/intel/compilers_and_libraries_2018.3.222/linux/compiler/lib/intel64_lin:/opt/intel/compilers_and_libraries_2018.3.222/linux/tbb/lib/intel64_lin/gcc4.7:/opt/intel/compilers_and_libraries_2017.1.132/linux/compiler/lib/intel64:/opt/intel/compilers_and_libraries_2017.1.132/linux/compiler/lib/intel64_lin:/opt/intel/compilers_and_libraries_2017.1.132/linux/mpi/intel64/lib:/opt/intel/compilers_and_libraries_2017.1.132/linux/ipp/lib/intel64:/opt/intel/debugger_2017/iga/lib:/opt/intel/debugger_2017/libipt/intel64/lib:/opt/intel/compilers_and_libraries_2017.1.132/linux/daal/lib/intel64_lin:$LD_LIBRARY_PATH
-    export CPATH=/opt/intel/compilers_and_libraries_2018.3.222/linux/mkl/include:/opt/intel/compilers_and_libraries_2017.1.132/linux/ipp/include:/opt/intel/compilers_and_libraries_2017.1.132/linux/daal/include
-    export NLSPATH=/opt/intel/compilers_and_libraries_2018.3.222/linux/mkl/lib/intel64_lin/locale/%l_%t/%N:/opt/intel/compilers_and_libraries_2017.1.132/linux/compiler/lib/intel64/locale/%l_%t/%N:/opt/intel/debugger_2017/gdb/intel64/share/locale/%l_%t/%N
-    export PATH=/opt/intel/compilers_and_libraries_2017.1.132/linux/bin/intel64:/opt/intel/compilers_and_libraries_2017.1.132/linux/mpi/intel64/bin:/opt/intel/debugger_2017/gdb/intel64_mic/bin:$PATH
-    export DAALROOT=/opt/intel/compilers_and_libraries_2017.1.132/linux/daal
-    export MPM_LAUNCHER=/opt/intel/debugger_2017/mpm/mic/bin/start_mpm.sh
-    export I_MPI_ROOT=/opt/intel/compilers_and_libraries_2017.1.132/linux/mpi
-    export CC=icc
-    make randomwalk
+    make CC=icc
   '';
 
   installPhase = ''
     mkdir -p $out/bin
-    cp graph500_reference_bfs $out/bin/graph500_reference_bfs
-    cp graph500_reference_bfs_sssp $out/bin/graph500_reference_bfs_sssp
+    cp randomwalk dgemme $out/bin/graph500_reference_bfs
   '';
 }

pkgs/applications/simple/diffout

-MKLROOT=/opt/intel/compilers_and_libraries_2018.3.222/linux/mkl
-IPPROOT=/opt/intel/compilers_and_libraries_2017.1.132/linux/ipp
-INTEL_LICENSE_FILE=/opt/intel/compilers_and_libraries_2017.1.132/linux/licenses
-LIBRARY_PATH=/opt/intel/compilers_and_libraries_2018.3.222/linux/mkl/lib/intel64_lin:/opt/intel/compilers_and_libraries_2018.3.222/linux/compiler/lib/intel64_lin:/opt/intel/compilers_and_libraries_2018.3.222/linux/tbb/lib/intel64_lin/gcc4.7:/opt/intel/compilers_and_libraries_2017.1.132/linux/ipp/lib/intel64:/opt/intel/compilers_and_libraries_2017.1.132/linux/compiler/lib/intel64_lin:/opt/intel/compilers_and_libraries_2017.1.132/linux/daal/lib/intel64_lin
-LD_LIBRARY_PATH=/opt/intel/compilers_and_libraries_2018.3.222/linux/mkl/lib/intel64_lin:/opt/intel/compilers_and_libraries_2018.3.222/linux/compiler/lib/intel64_lin:/opt/intel/compilers_and_libraries_2018.3.222/linux/tbb/lib/intel64_lin/gcc4.7:/opt/intel/compilers_and_libraries_2017.1.132/linux/compiler/lib/intel64:/opt/intel/compilers_and_libraries_2017.1.132/linux/compiler/lib/intel64_lin:/opt/intel/compilers_and_libraries_2017.1.132/linux/mpi/intel64/lib:/opt/intel/compilers_and_libraries_2017.1.132/linux/ipp/lib/intel64:/opt/intel/debugger_2017/iga/lib:/opt/intel/debugger_2017/libipt/intel64/lib:/opt/intel/compilers_and_libraries_2017.1.132/linux/daal/lib/intel64_lin
-CPATH=/opt/intel/compilers_and_libraries_2018.3.222/linux/mkl/include:/opt/intel/compilers_and_libraries_2017.1.132/linux/ipp/include:/opt/intel/compilers_and_libraries_2017.1.132/linux/daal/include
-NLSPATH=/opt/intel/compilers_and_libraries_2018.3.222/linux/mkl/lib/intel64_lin/locale/%l_%t/%N:/opt/intel/compilers_and_libraries_2017.1.132/linux/compiler/lib/intel64/locale/%l_%t/%N:/opt/intel/debugger_2017/gdb/intel64/share/locale/%l_%t/%N
-PATH=/opt/intel/compilers_and_libraries_2017.1.132/linux/bin/intel64:/opt/intel/compilers_and_libraries_2017.1.132/linux/mpi/intel64/bin:/opt/intel/debugger_2017/gdb/intel64_mic/bin
-DAALROOT=/opt/intel/compilers_and_libraries_2017.1.132/linux/daal
-MPM_LAUNCHER=/opt/intel/debugger_2017/mpm/mic/bin/start_mpm.sh
-I_MPI_ROOT=/opt/intel/compilers_and_libraries_2017.1.132/linux/mpi

pkgs/default.nix

@@ -37,12 +37,12 @@ in rec {
       openmc = callPackage applications/openmc {};
       stream = callPackage applications/stream {};
       graph500 = callPackage applications/graph500 {};
-      simple = callPackage applications/simple {};
+      simple = callPackage applications/simple {inherit intel;};
     };
 
 	intel = with pkgs; rec {
     inherit utils;
-    compiler_path = "/opt/intel/compilers_and_libraries_2017.1.132/linux/bin/intel64/icc";
+    compiler_path = "/opt/intel/compilers_and_libraries_2017.1.132/linux/";
     icc = callPackage intel/icc { inherit compiler_path; };
     mkl = callPackage intel/mkl { inherit compiler_path; };
     #WrappedICC = if (icc-native != null) then (import ../patches/cc-wrapper  {

pkgs/intel/icc/default.nix

@@ -50,7 +50,7 @@ let
     passthru = {
       isIcc = true;
       gcc  = stdenv.cc;
-      langFortran = true; 
+      langFortran = true;
     };
   };