diff --git a/NOISE b/NOISE
index 2f4ded6..cab9f35 100644
--- a/NOISE
+++ b/NOISE
@@ -99,5 +99,12 @@ ABSTRACT
In bscpkgs the symbolic links have been removed for the clangOmpss2
compiler.
+1.7 Nix-shell does not allow isolation
+
+ Nix-shell is not isolated, the compilation process tries then to
+ use headers and libs from /usr.
+
+ This can induce compilation errors not happening inside nix-build.
+ Do not use to ensure reproducibility.
/* vim: set ts=2 sw=2 tw=72 fo=watqc expandtab spell autoindent: */
diff --git a/garlic/exp/saiph/extraeOPENMPI_OMP.xml b/garlic/exp/saiph/extraeOPENMPI_OMP.xml
new file mode 100644
index 0000000..a8e46e3
--- /dev/null
+++ b/garlic/exp/saiph/extraeOPENMPI_OMP.xml
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PAPI_TOT_INS,PAPI_TOT_CYC,PAPI_L1_DCM,PAPI_L2_DCM,PAPI_L3_TCM,PAPI_BR_INS,PAPI_BR_MSP,RESOURCE_STALLS
+
+
+ PAPI_TOT_INS,PAPI_TOT_CYC,PAPI_VEC_SP,PAPI_SR_INS,PAPI_LD_INS,PAPI_FP_INS
+ PAPI_TOT_CYC
+
+
+
+
+
+
+
+
+
+
+
+ TRACE
+ 5
+ /scratch
+ /gpfs/scratch/bsc41/bsc41273
+
+
+
+ 5000000
+
+
+
+
+ /gpfs/scratch/bsc41/bsc41273/control
+
+
+
+
+ 10M
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/garlic/exp/saiph/extraeOPENMPI_OMPSS.xml b/garlic/exp/saiph/extraeOPENMPI_OMPSS.xml
new file mode 100644
index 0000000..7cd2fdc
--- /dev/null
+++ b/garlic/exp/saiph/extraeOPENMPI_OMPSS.xml
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1-3
+ 1-5
+ 1-3
+ 1-3
+ 1-3
+
+
+
+
+
+
+
+
+
+ PAPI_TOT_INS,PAPI_TOT_CYC,PAPI_L1_DCM,PAPI_L2_DCM,PAPI_L3_TCM,PAPI_BR_INS,PAPI_BR_MSP,RESOURCE_STALLS
+
+
+ PAPI_TOT_INS,PAPI_TOT_CYC,PAPI_VEC_SP,PAPI_SR_INS,PAPI_LD_INS,PAPI_FP_INS
+ PAPI_TOT_CYC
+
+
+
+
+
+
+
+
+
+
+
+ TRACE
+ 5
+ /scratch
+ /gpfs/scratch/bsc41/bsc41273
+
+
+
+ 5000000
+
+
+
+
+ /gpfs/scratch/bsc41/bsc41273/control
+
+
+
+
+ 10M
+
+
+
+
+
+ 500u
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/garlic/exp/saiph/myextrae.xml b/garlic/exp/saiph/myextrae.xml
new file mode 100644
index 0000000..e69de29
diff --git a/garlic/exp/saiph/numcomm.nix b/garlic/exp/saiph/numcomm.nix
index 0755147..07e108c 100644
--- a/garlic/exp/saiph/numcomm.nix
+++ b/garlic/exp/saiph/numcomm.nix
@@ -18,7 +18,7 @@ let
# Common configuration
common = {
# Compile time nbody config
- gitBranch = "Saiph_TAMPI_OMPSS";
+ gitBranch = "garlic/tampi+isend+oss+task+simd";
mpi = pkgs.bsc.impi;
# Resources
@@ -44,14 +44,23 @@ let
w = runWrappers;
- sbatch = {stage, conf, ...}: with conf; w.sbatch {
- program = stageProgram stage;
- exclusive = true;
- time = "02:00:00";
- qos = "debug";
- jobName = "saiph";
- inherit nixPrefix nodes ntasksPerNode;
- };
+ sbatch = {stage, conf, ...}: with conf; w.sbatch (
+ # Allow a user to define a custom reservation for the job in MareNostrum4,
+ # by setting the garlic.sbatch.reservation attribute in the
+ # ~/.config/nixpkgs/config.nix file. If the attribute is not set, no
+ # reservation is used. The user reservation may be overwritten by the
+ # experiment, if the reservation is set like with nodes or ntasksPerNode.
+ optionalAttrs (pkgs.config ? garlic.sbatch.reservation) {
+ inherit (pkgs.config.garlic.sbatch) reservation;
+ } // {
+ program = stageProgram stage;
+ exclusive = true;
+ time = "02:00:00";
+ qos = "debug";
+ jobName = "saiph";
+ inherit nixPrefix nodes ntasksPerNode;
+ }
+ );
control = {stage, conf, ...}: with conf; w.control {
program = stageProgram stage;
diff --git a/garlic/saiph/default.nix b/garlic/saiph/default.nix
index 91a1c36..3028042 100644
--- a/garlic/saiph/default.nix
+++ b/garlic/saiph/default.nix
@@ -38,19 +38,11 @@ stdenv.mkDerivation rec {
# Required for nanos6
hardeningDisable = [ "bindnow" ];
-# Enable debug
-# postPatch = ''
-# sed -i 's/^SANITIZE_FLAGS=/SANITIZE_FLAGS=$(DEBUG_FLAGS)/g' \
-# saiphv2/cpp/src/Makefile.clang
-# '';
-
preBuild = ''
cd saiphv2/cpp/src
export VTK_VERSION=8.2
export VTK_HOME=${vtk}
- export BOOST_HOME=${boost}
- export SAIPH_HOME=.
'';
makeFlags = [