update occigen to intelmpi env

MUMPS/machines/occigen-bdw/Makefile.inc

@@ -47,26 +47,26 @@ LIBEXT  = .a
 OUTC    = -o 
 OUTF    = -o 
 RM = /bin/rm -f
-CC = mpicc -ip
-FC = mpif90 -ip
-FL = mpif90 -ip
+CC = mpiicc -ip
+FC = mpiifort -ip
+FL = mpiifort -ip
 AR = ar vr 
 #RANLIB = ranlib
 RANLIB  = echo
 # Make this variable point to the path where the Intel MKL library is
 # installed. It is set to the default install directory for Intel MKL.
 # MKLROOT=/opt/intel/mkl/lib/intel64
-#LAPACK = -L$(MKLROOT) -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core
 #SCALAP = -L$(MKLROOT) -lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64
 
 MKLDIR = $(MKLROOT)/lib/intel64
 INCPAR =
-LIBPAR = -L$(MKLDIR) -lmkl_scalapack_lp64 -lmkl_blacs_openmpi_lp64 -mkl=parallel -qopenmp -lpthread
+LIBPAR = -L$(MKLDIR) -lmkl_scalapack_lp64 -lmkl_blacs_intelmpi_lp64 -mkl=parallel -qopenmp -lpthread
+LAPACK = -L$(MKLDIR) -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core
+LIBBLAS = -L$(MKLDIR) -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core 
 
 INCSEQ = -I$(topdir)/libseq
 LIBSEQ  = $(LAPACK) -L$(topdir)/libseq -lmpiseq
 
-#LIBBLAS = -L$(MKLROOT) -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core 
 LIBOTHERS = -lpthread
 
 #Preprocessor defs for calling Fortran from C (-DAdd_ or -DAdd__ or -DUPPER)

MUMPS/machines/occigen-bdw/batch_charge.slurm

 #!/bin/bash               
 #SBATCH -J mumpsben
 #SBATCH --nodes=200
+#SBATCH --ntasks=2400
 #SBATCH --tasks-per-node=12
 #SBATCH --cpus-per-task=2
 #SBATCH --exclusive
-#SBATCH --output output_mumpsbench
-#SBATCH --time=03:30:00
-#SBATCH -C BDW28
-#SBATCH --cpu-freq=2600000
+#SBATCH --output log 
+#SBATCH --time=06:00:00
+#SBATCH --mem=100G
+#SBATCH -C HSW24
 
-set -x
 source env_bench
 
-ldir=.
-mumpstest=$EXE
-# set max 2GB stack
-ulimit -s 2000000
+set -x
 
-# Run with K=1 (see documentation in mumps_bench.F)
-K=1
-envtest="in_200Nodes_K=${K}_Test1_32x6.txt"
+ulimit -s unlimited
 
-export KMP_LIBRARY=turnaround
-export KMP_BLOCKTIME=infinite
-export KMP_AFFINITY=granularity=fine,compact,1,0
+ldir=.
+mumpstest=../mumps_bench
 
-echo "RUN $envtest"
 export OMP_NUM_THREADS=2
 export MKL_NUM_THREADS=2
+export KMP_AFFINITY=compact,1,0,granularity=fine
 
-input=./${envtest}
 
-srun --cpu-freq=2600000 -m block:cyclic ${mumpstest} < ${input}   >& $ldir/output_${envtest}.log
+# Run with K=1 (see documentation in mumps_bench.F)
+K=1
+envtest="in_200Nodes_K=${K}_Test1_12.txt"
+input=./${envtest}
+output=./output_${envtest}_${SLURM_JOBID}_hsw24_bigmem.log
+echo "RUN $envtest"
+time srun -m block:cyclic ${mumpstest} < ${input}   >& ${output}

MUMPS/machines/occigen-bdw/env_bench

 module purge
-module load intel/18.1 openmpi/intel/2.0.1 parmetis/4.0.3-real64
+module load intel intelmpi parmetis/4.0.3-real64
 module load git
 
 GIT_ROOT=`git rev-parse --show-toplevel`