Gitlab CI: reactivate some tests

faf3aacc · Andreas Marek · c33df0c7 · faf3aacc
Commit faf3aacc authored Aug 24, 2017 by Andreas Marek
Hide whitespace changes
Inline Side-by-side

Showing with 69 additions and 69 deletions

.gitlab-ci.yml .gitlab-ci.yml +69 -69

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2717,21 +2717,21 @@ gfortran-double-precision-mpi-omp-skylake-coverage-jobs:
    paths:
      - coverage_data

-        ## gfortran single precision mpi omp SKYLAKE
-        #gfortran-single-precision-mpi-omp-skylake-jobs:
-        #  tags:
-        #    - skylake
-        #  script:
-        #    - ./autogen.sh
-        #    - ./configure  FC=mpif90 CC=mpicc --enable-option-checking=fatal CFLAGS="-O3 -march=skylake-avx512" FCFLAGS="-O3 -march=skylake-avx512" SCALAPACK_LDFLAGS="$MKL_GFORTRAN_SCALAPACK_LDFLAGS_MPI_OMP" SCALAPACK_FCFLAGS="$MKL_GFORTRAN_SCALAPACK_FCFLAGS_MPI_OMP" --enable-avx512 --enable-single-precision --enable-openmp || { cat config.log; exit 1; }
-        #      #- /home/elpa/wait_until_midnight.sh
-        #    - GPJOBID=$(/home/elpa/bin/reserve_timeslot/reserve_timeslot 600)
-        #    - make -j 8
-        #    - export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
-        #    - export OMP_NUM_THREADS=2
-        #    - make check TASKS=2 TEST_FLAGS='150 50 16' || { cat test-suite.log; exit 1; }
-        #    - grep -i "Expected %stop" test-suite.log && exit 1 || true ;
-        #    - gpschedule -d $GPJOBID
+# gfortran single precision mpi omp SKYLAKE
+gfortran-single-precision-mpi-omp-skylake-jobs:
+  tags:
+    - skylake
+  script:
+    - ./autogen.sh
+    - ./configure  FC=mpif90 CC=mpicc --enable-option-checking=fatal CFLAGS="-O3 -march=skylake-avx512" FCFLAGS="-O3 -march=skylake-avx512" SCALAPACK_LDFLAGS="$MKL_GFORTRAN_SCALAPACK_LDFLAGS_MPI_OMP" SCALAPACK_FCFLAGS="$MKL_GFORTRAN_SCALAPACK_FCFLAGS_MPI_OMP" --enable-avx512 --enable-single-precision --enable-openmp || { cat config.log; exit 1; }
+      #- /home/elpa/wait_until_midnight.sh
+    - GPJOBID=$(/home/elpa/bin/reserve_timeslot/reserve_timeslot 600)
+    - make -j 8
+    - export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
+    - export OMP_NUM_THREADS=2
+    - make check TASKS=2 TEST_FLAGS='150 50 16' || { cat test-suite.log; exit 1; }
+    - grep -i "Expected %stop" test-suite.log && exit 1 || true ;
+    - gpschedule -d $GPJOBID

      #### gfortran single precision mpi omp skylake
      ###gfortran-single-precision-mpi-omp-skylake-coverage-jobs:
@@ -2769,21 +2769,21 @@ gfortran-double-precision-mpi-omp-no-assumed-size-skylake-jobs:
    - grep -i "Expected %stop" test-suite.log && exit 1 || true ;
    - gpschedule -d $GPJOBID

-      ## gfortran single precision mpi omp skylake, no assumed size
-      #gfortran-single-precision-mpi-omp-no-assumed-size-skylake-jobs:
-      #  tags:
-      #    - skylake
-      #  script:
-      #    - ./autogen.sh
-      #    - ./configure  FC=mpif90 CC=mpicc --enable-option-checking=fatal CFLAGS="-O3 -march=skylake-avx512" FCFLAGS="-O3 -march=skylake-avx512" SCALAPACK_LDFLAGS="$MKL_GFORTRAN_SCALAPACK_LDFLAGS_MPI_OMP" SCALAPACK_FCFLAGS="$MKL_GFORTRAN_SCALAPACK_FCFLAGS_MPI_OMP" --enable-avx512 --disable-assumed-size --enable-single-precision --enable-openmp || { cat config.log; exit 1; }
-      #      #- /home/elpa/wait_until_midnight.sh
-      #    - GPJOBID=$(/home/elpa/bin/reserve_timeslot/reserve_timeslot 600)
-      #    - make -j 8
-      #    - export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
-      #    - export OMP_NUM_THREADS=2
-      #    - make check TASKS=2 TEST_FLAGS='150 50 16' || { cat test-suite.log; exit 1; }
-      #    - grep -i "Expected %stop" test-suite.log && exit 1 || true ;
-      #    - gpschedule -d $GPJOBID
+# gfortran single precision mpi omp skylake, no assumed size
+gfortran-single-precision-mpi-omp-no-assumed-size-skylake-jobs:
+  tags:
+    - skylake
+  script:
+    - ./autogen.sh
+    - ./configure  FC=mpif90 CC=mpicc --enable-option-checking=fatal CFLAGS="-O3 -march=skylake-avx512" FCFLAGS="-O3 -march=skylake-avx512" SCALAPACK_LDFLAGS="$MKL_GFORTRAN_SCALAPACK_LDFLAGS_MPI_OMP" SCALAPACK_FCFLAGS="$MKL_GFORTRAN_SCALAPACK_FCFLAGS_MPI_OMP" --enable-avx512 --disable-assumed-size --enable-single-precision --enable-openmp || { cat config.log; exit 1; }
+      #- /home/elpa/wait_until_midnight.sh
+    - GPJOBID=$(/home/elpa/bin/reserve_timeslot/reserve_timeslot 600)
+    - make -j 8
+    - export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
+    - export OMP_NUM_THREADS=2
+    - make check TASKS=2 TEST_FLAGS='150 50 16' || { cat test-suite.log; exit 1; }
+    - grep -i "Expected %stop" test-suite.log && exit 1 || true ;
+    - gpschedule -d $GPJOBID

      # no coverage on system with tag AVX2
      #
@@ -3341,45 +3341,45 @@ test_project_2stage_intel_legacy_api:
   - make distclean
   - rm -rf installdest

-     #minsky:
-     #  tags:
-     #    - miy
-     #  script:
-     #    - module purge
-     #    - module load gcc/5.4 pgi/17.5 ompi/pgi/17.5/1.10.2 essl/5.5 cuda/8.0
-     #    - module list
-     #    - export OMPI_CC=gcc
-     #    - export OMPI_FC=pgfortran
-     #    - export LD_LIBRARY_PATH=/opt/ibm/spectrum_mpi/lib:/opt/ibm/spectrum_mpi/profilesupport/lib:$LD_LIBRARY_PATH
-     #    - export PATH=/opt/ibm/spectrum_mpi/bin:$PATH
-     #    - ./autogen.sh
-     #    - ./configure CC=mpicc FC=mpifort LIBS="-lessl -lreflapack -lessl -lcublas -lgfortran" LDFLAGS="-g -L/home/elpa/libs/scalapack/lib -L/usr/local/cuda-8.0/lib64 " FCFLAGS="-g -O2 " CFLAGS="-g -O2 -I/usr/local/cuda-8.0/include" --enable-single-precision --disable-mpi-module --enable-gpu --with-GPU-compute-capability=sm_60 --disable-sse --disable-sse-assembly --disable-avx --disable-avx2 --with-cuda-path=/usr/local/cuda-8.0/ || { cat config.log; exit 1; }
-     #    - GPJOBID=$(/home/elpa/bin/reserve_timeslot/reserve_timeslot)
-     #    - make -j 8
-     #    - make check TASKS=2 TEST_FLAGS='150 50 32'  || { cat test-suite.log; exit 1; }
-     #    - cat test-suite.log
-     #    - grep -i "Expected %stop" test-suite.log && exit 1 || true ;
-     #    - gpschedule -d $GPJOBID
-
-      #minsky-pure-gnu:
-      #  tags:
-      #    - miy
-      #  script:
-      #    - module purge
-      #    - module load gcc/5.4 ompi/pgi/17.5/1.10.2 essl/5.5 cuda/8.0
-      #    - module list
-      #    - export OMPI_CC=gcc
-      #    - export OMPI_FC=gfortran
-      #    - ./autogen.sh
-      #    - export LD_LIBRARY_PATH=/opt/ibm/spectrum_mpi/lib:/opt/ibm/spectrum_mpi/profilesupport/lib:$LD_LIBRARY_PATH
-      #    - export PATH=/opt/ibm/spectrum_mpi/bin:$PATH
-      #    - ./configure CC=mpicc FC=mpifort LIBS="-lessl -lreflapack -lessl -lcublas -lgfortran" LDFLAGS="-g -L/home/elpa/libs/scalapack/lib -L/usr/local/cuda-8.0/lib64 " FCFLAGS="-g -O2 " CFLAGS="-g -O2 -I/usr/local/cuda-8.0/include" --enable-single-precision --disable-mpi-module --enable-gpu --with-GPU-compute-capability=sm_60 --disable-sse --disable-sse-assembly --disable-avx --disable-avx2 --with-cuda-path=/usr/local/cuda-8.0/ || { cat config.log; exit 1; }
-      #    - GPJOBID=$(/home/elpa/bin/reserve_timeslot/reserve_timeslot)
-      #    - make -j 8
-      #    - make check TASKS=2 TEST_FLAGS='150 50 32'  || { cat test-suite.log; exit 1; }
-      #    - cat test-suite.log
-      #    - grep -i "Expected %stop" test-suite.log && exit 1 || true ;
-      #    - gpschedule -d $GPJOBID
+minsky:
+  tags:
+    - miy
+  script:
+    - module purge
+    - module load gcc/5.4 pgi/17.5 ompi/pgi/17.5/1.10.2 essl/5.5 cuda/8.0
+    - module list
+    - export OMPI_CC=gcc
+    - export OMPI_FC=pgfortran
+    - export LD_LIBRARY_PATH=/opt/ibm/spectrum_mpi/lib:/opt/ibm/spectrum_mpi/profilesupport/lib:$LD_LIBRARY_PATH
+    - export PATH=/opt/ibm/spectrum_mpi/bin:$PATH
+    - ./autogen.sh
+    - ./configure CC=mpicc FC=mpifort LIBS="-lessl -lreflapack -lessl -lcublas -lgfortran" LDFLAGS="-g -L/home/elpa/libs/scalapack/lib -L/usr/local/cuda-8.0/lib64 " FCFLAGS="-g -O2 " CFLAGS="-g -O2 -I/usr/local/cuda-8.0/include" --enable-single-precision --disable-mpi-module --enable-gpu --with-GPU-compute-capability=sm_60 --disable-sse --disable-sse-assembly --disable-avx --disable-avx2 --with-cuda-path=/usr/local/cuda-8.0/ || { cat config.log; exit 1; }
+    - GPJOBID=$(/home/elpa/bin/reserve_timeslot/reserve_timeslot)
+    - make -j 8
+    - make check TASKS=2 TEST_FLAGS='150 50 32'  || { cat test-suite.log; exit 1; }
+    - cat test-suite.log
+    - grep -i "Expected %stop" test-suite.log && exit 1 || true ;
+    - gpschedule -d $GPJOBID
+
+minsky-pure-gnu:
+  tags:
+    - miy
+  script:
+    - module purge
+    - module load gcc/5.4 ompi/pgi/17.5/1.10.2 essl/5.5 cuda/8.0
+    - module list
+    - export OMPI_CC=gcc
+    - export OMPI_FC=gfortran
+    - ./autogen.sh
+    - export LD_LIBRARY_PATH=/opt/ibm/spectrum_mpi/lib:/opt/ibm/spectrum_mpi/profilesupport/lib:$LD_LIBRARY_PATH
+    - export PATH=/opt/ibm/spectrum_mpi/bin:$PATH
+    - ./configure CC=mpicc FC=mpifort LIBS="-lessl -lreflapack -lessl -lcublas -lgfortran" LDFLAGS="-g -L/home/elpa/libs/scalapack/lib -L/usr/local/cuda-8.0/lib64 " FCFLAGS="-g -O2 " CFLAGS="-g -O2 -I/usr/local/cuda-8.0/include" --enable-single-precision --disable-mpi-module --enable-gpu --with-GPU-compute-capability=sm_60 --disable-sse --disable-sse-assembly --disable-avx --disable-avx2 --with-cuda-path=/usr/local/cuda-8.0/ || { cat config.log; exit 1; }
+    - GPJOBID=$(/home/elpa/bin/reserve_timeslot/reserve_timeslot)
+    - make -j 8
+    - make check TASKS=2 TEST_FLAGS='150 50 32'  || { cat test-suite.log; exit 1; }
+    - cat test-suite.log
+    - grep -i "Expected %stop" test-suite.log && exit 1 || true ;
+    - gpschedule -d $GPJOBID


 # print coverage results