Merge pull request wannier-developers#220 from sponce24/develop

Various changes to the Buildbot test-farm
manxkim · Dec 11, 2018 · cffc0ea · cffc0ea
2 parents aa3d0c1 + 6301e0e
commit cffc0ea
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 7 deletions.
diff --git a/test-suite/config/TestFarm/farmer_gcc730_openmpi1107.inc b/test-suite/config/TestFarm/farmer_gcc730_openmpi1107.inc
@@ -4,8 +4,8 @@
 F90 = gfortran
 
 #Add next two lines for parallel postw90. Choose the correct name of the mpi f90 wrapper
-#COMMS  = mpi 
-#MPIF90 = mpgfortran #mpif90
+COMMS  = mpi 
+MPIF90 = mpif90
 
 FCOPTS = -O3 -g -x f95-cpp-input -I/mnt/buildbot/binary/openmpi1107_gcc730/include/
 LDOPTS = -g -pthread

diff --git a/test-suite/config/TestFarm/farmer_intel17_impi.inc b/test-suite/config/TestFarm/farmer_intel17_impi.inc
@@ -0,0 +1,17 @@
+
+#=====================================================
+# For Linux with intel version 11/12 on 64bit machines
+#=====================================================
+F90 = ifort
+COMMS=mpi
+MPIF90=mpif90
+FCOPTS=-O3 -assume byterecl -g -traceback -I/mnt/buildbot/binary/intel17/include/
+LDOPTS=-O3
+
+#========================================================
+# Intel mkl libraries. Set LIBPATH if not in default path
+#========================================================
+
+LIBDIR =  /mnt/buildbot/binary/intel17/compilers_and_libraries/linux/mkl/lib/intel64
+LIBS   = -L/mnt/buildbot/binary/intel17/lib/ -lmpi_mpifh -lmpi  -L$(LIBDIR) -lmkl_core -lmkl_intel_lp64 -lmkl_sequential -lpthread
+
diff --git a/test-suite/config/TestFarm/farmer_intel18_openmpi313.inc b/test-suite/config/TestFarm/farmer_intel18_openmpi313.inc
@@ -0,0 +1,17 @@
+
+#=====================================================
+# For Linux with intel version 11/12 on 64bit machines
+#=====================================================
+F90 = ifort
+COMMS=mpi
+MPIF90=mpif90
+FCOPTS=-O3 -assume byterecl -g -traceback -I/mnt/buildbot/binary/openmpi313_intel18/include/
+LDOPTS=-O3
+
+#========================================================
+# Intel mkl libraries. Set LIBPATH if not in default path
+#========================================================
+
+LIBDIR =  /mnt/buildbot/binary/intel18/compilers_and_libraries/linux/mkl/lib/intel64
+LIBS   = -L/mnt/buildbot/binary/openmpi313_intel18/lib/ -lmpi_mpifh -lmpi  -L$(LIBDIR) -lmkl_core -lmkl_intel_lp64 -lmkl_sequential -lpthread
+
diff --git a/test-suite/config/TestFarm/farmer_pgi18_mvapich23b.inc b/test-suite/config/TestFarm/farmer_pgi18_mvapich23b.inc
@@ -0,0 +1,19 @@
+#=====
+#pgf90 
+#=====
+
+F90 = pgf90
+
+#Add next two lines for parallel postw90. Choose the correct name of the mpi f90 wrapper
+COMMS = mpi
+MPIF90 =  mpif90
+
+FCOPTS = -O2 -g f95-cpp-input -I/mnt/buildbot/binary/mvapich23_pgi185/include
+LDOPTS = -O2
+
+# Debug options
+#FCOPTS  = -g -Mbounds -Mchkptr -Minform=warn -Mstandard 
+#LDOPTS = -g -Mbounds -Mchkptr -Minform=warn -Mstandard
+LIBDIR =  /mnt/buildbot/binary/mvapich23_pgi185/lib
+LIBS   = -llapack -lblas  -L$(LIBDIR) -lmpi
+
diff --git a/test-suite/tests/userconfig b/test-suite/tests/userconfig
@@ -9,7 +9,7 @@ extract_fn = tools parsers.parse_wout.parse
 tolerance = ( (1.0e-5, 1.0e-5, 'final_centres_x'),
               (1.0e-5, 1.0e-5, 'final_centres_y'),
               (1.0e-5, 1.0e-5, 'final_centres_z'),
-              (2.0e-6, 2.0e-6, 'final_spreads'), 
+              (3.0e-6, 3.0e-6, 'final_spreads'), 
               (1.0e-6, 1.0e-6, 'omegaI'), 
               (1.0e-6, 5.0e-6, 'omegaD'), 
               (1.0e-6, 1.0e-6, 'omegaOD'), 
@@ -27,7 +27,7 @@ extract_fn = tools parsers.parse_wout.parse
 tolerance = ( (1.0e-5, 1.0e-5, 'final_centres_x'),
               (1.0e-5, 1.0e-5, 'final_centres_y'),
               (1.0e-5, 1.0e-5, 'final_centres_z'),
-              (2.0e-6, 2.0e-6, 'final_spreads'), 
+              (3.0e-6, 3.0e-6, 'final_spreads'), 
               (1.0e-6, 1.0e-6, 'omegaIOD_C'), 
               (1.0e-6, 5.0e-6, 'omegaD'), 
               (1.0e-5, 1.0e-5, 'omegaRest'), 
@@ -135,9 +135,9 @@ tolerance = (  (1.0e-6, 5.0e-6, 'energy'),
               (1.0e-4, 1.0e-2, 'gyro_xy'),
               (1.0e-4, 1.0e-2, 'gyro_xz'),
               (1.0e-4, 1.0e-2, 'gyro_yz'),
-              (1.0e-4, 1.0e-2, 'gyro_x'),
-              (1.0e-4, 1.0e-2, 'gyro_y'),
-              (1.0e-4, 1.0e-2, 'gyro_z'),
+              (1.0e-4, None, 'gyro_x'),
+              (1.0e-4, None, 'gyro_y'),
+              (1.0e-4, None, 'gyro_z'),
                (1.0e-4, 1.0e+2, 'imcond'))
 
 [POSTW90_SC_OK]