update intel paths and move env to prebuild

.gitlab-ci.yml

@@ -43,20 +43,28 @@ west_build_intel:
    - export TZ="US/Central"
    - rm -f /etc/localtime
    - cp  /usr/share/zoneinfo/$TZ  /etc/localtime
+   - export PATH=/software/intel/impi/5.1.3.210/intel64/bin:/software/intel/parallel_studio_xe_2016_update3/bin:$PATH
+   - export LD_LIBRARY_PATH=/software/intel/parallel_studio_xe_2017/mkl/lib/intel64:/software/intel/impi/5.1.3.210/intel64/lib:$LD_LIBRARY_PATH
+   - export LD_LIBRARY_PATH=/software/intel/parallel_studio_xe_2016_update3/ipp/lib/intel64:/software/intel/parallel_studio_xe_2016_update3/lib/intel64:$LD_LIBRARY_PATH
+   - export CPATH=/software/intel/parallel_studio_xe_2016_update3/ipp/include:$CPATH
+   - export I_MPI_CC=icc
+   - export I_MPI_CXX=icpc
+   - export I_MPI_FC=ifort
+   - export I_MPI_F77=ifort
+   - export I_MPI_F90=ifort
+   - export I_MPI_F95=ifort
+   - export I_MPI_PROCESS_MANAGER=hydra
  script:
-   - echo "JHSKONE"
    - echo "$PATH"
    - echo "$LD_LIBRARY_PATH"
+   - echo "$I_MPI_F90"
    - git clone -b 'qe-6.1.0' --single-branch --depth 1 https://gitlab.com/QEF/q-e.git QEDIR
    - cd QEDIR
    - git describe
-   - export PATH=/software/intel/impi/5.1.3.210/intel64/bin:/software/intel/parallel_studio_xe_2016_update3/bin:$PATH
-   - export LD_LIBRARY_PATH=/opt/intel/impi/5.1.3.210/lib:/opt/intel/mkl/lib/intel64:/opt/intel/2016up3/lib/intel64:/opt/intel/2016up3/ipp/lib/intel64:$LD_LIBRARY_PATH
    - export F77=mpiifort
-   - export CC=icc
-   - export LD=mpiifort
+   - export CC=mpiicc
    - export MPIF90=mpiifort
-   - export FC=ifort
+   - export FC=mpiifort
    - export I_MPI_F90=ifort 
    - export I_MPI_ROOT=/software/intel/impi/5.1.3.210
    - which ifort