From 09aa05d89c9e78b1c3618e77b780acd4b75d8d42 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Thu, 13 Sep 2018 22:01:42 +0200 Subject: [PATCH] CI: also check with ICC * build-aux/install-icc.sh: New. * .travis.yml (icc): New. Use -k to get as many errors as possible from the start. * src/complain.c (warnings_types): Use a more precise type. --- .travis.yml | 28 ++++- build-aux/install-icc.sh | 234 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 258 insertions(+), 4 deletions(-) create mode 100755 build-aux/install-icc.sh diff --git a/.travis.yml b/.travis.yml index c6ef82af..d256680c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,10 @@ language: cpp +env: + global: + # ICC serial number. + secure: ED3w6rzxuE6tVu3oyxha2MoGMRzRQCtinvr9uor1gw9TGKB80esTLx4KyX0xHemUdyQVarFDDQfVS5rf7jSDY8XiWIR6O+2Af9/30gb+8eyngyvACu7E28n+1XHmYWIEHsbvB9mic6C60FBj5sPcDnFWZeyttGL0WooSjYHiw1Egafwqbeu1mD3Aet9OI9VaLQvy0KcWAdVrYWSI9UWLvLM+xPVUjPFko4oS+dTlETzVnmn6JFbZX1OKONtfcvdoDRFBzs3iHm5dQUt/Fz+y/DtKSuvF3zvePHSgF6c8URbEPPjBdh87gkovSLyy+83fVeh4WMkF8b+dGZmikQv6kRsjKJdbQrS8tiMhZlORC5Gfmn4HXNgmapL+paUweakH7UZQHm6d5SZoBgCHNazfqMrywbZsZkGvZTDQIVG1Be7Lhh2BDFbPhPZNDvI9XYiqZP0QSb0BVfeO+AUSRcUPM7TvarxB74jYdfpTBu7sqJP6dSwhcDTEUhHmuLGjzsNm3uTZe8SUw/TGGx5uPTXNsCjJq6ClIOAIYXZTXLbBmIL/NBWCy0MUpD+9zsiknU7vzzq1RfgCCExhvYgosTjBLcX1kKI+eRSU5M44e+xCg4xx0m9WfafbKbhA20FfnWxCFIkZeVpkOOsexJ9zfe0SflVLxkd7vmci5SCBixLVbN0= + matrix: include: ## ----- ## @@ -170,6 +175,16 @@ matrix: # No versioned name installed. - MATRIX_EVAL="CC=clang && CXX=clang++ && CXXFLAGS=-stdlib=libc++" + ## ----- ## + ## ICC. ## + ## ----- ## + - os: linux + env: + # ICC's warnings are often very wrong (e.g., it thinks foo ? + # "bar" : "baz" is char* instead of const char*), so don't try + # to work around the, and obviously, don't die on them. + - MATRIX_EVAL="CC=icc && CXX=icpc && MAKE_ARGS='WERROR_CFLAGS= WERROR_CXXFLAGS='" + before_install: - sudo apt-get update -qq - sudo apt-get install -qq autoconf automake autopoint doxygen flex gettext graphviz help2man m4 texinfo @@ -184,6 +199,7 @@ before_install: - m4 --version - makeinfo --version - eval "${MATRIX_EVAL}" + - if [ x"$CC" == xicc ]; then build-aux/install-icc.sh; fi script: - git show @@ -193,8 +209,12 @@ script: - git describe || git tag v3.0 -m "Fake version 3.0." - git describe - ./bootstrap + - if [[ -f ~/.bashrc ]]; then source ~/.bashrc; fi - ./configure --enable-gcc-warnings CC="$CC" CXX="$CXX" || { cat config.log && exit 1; } - - make -j2 - - make check VERBOSE=1 TESTSUITEFLAGS=-j2 || { cat tests/testsuite.log && exit 1; } - - make maintainer-check-posix VERBOSE=1 TESTSUITEFLAGS=-j2 || { cat tests/testsuite.log && exit 1; } - - make maintainer-check-g++ VERBOSE=1 TESTSUITEFLAGS=-j2 || { cat tests/testsuite.log && exit 1; } + - make -j2 $MAKE_ARGS + - make check VERBOSE=1 TESTSUITEFLAGS=-j2 || { cat tests/testsuite.log && exit 1; } + - make maintainer-check-posix VERBOSE=1 TESTSUITEFLAGS=-j2 || { cat tests/testsuite.log && exit 1; } + - make maintainer-check-g++ VERBOSE=1 TESTSUITEFLAGS=-j2 || { cat tests/testsuite.log && exit 1; } + +after_script: + - '[[ ! -z "${INTEL_INSTALL_PATH}" ]] && uninstall_intel_software' diff --git a/build-aux/install-icc.sh b/build-aux/install-icc.sh new file mode 100755 index 00000000..75d4e283 --- /dev/null +++ b/build-aux/install-icc.sh @@ -0,0 +1,234 @@ +#!/bin/sh + +# Install Intel Parallel Studio on Travis CI +# https://github.com/nemequ/icc-travis +# +# Originally written for Squash by +# Evan Nemerson. For documentation, bug reports, support requests, +# etc. please use . +# +# To the extent possible under law, the author(s) of this script have +# waived all copyright and related or neighboring rights to this work. +# See for +# details. + +# Tools - Not very useful in non-interactive mode. +COMPONENTS_VTUNE="intel-vtune-amplifier-xe-2016-cli__x86_64;intel-vtune-amplifier-xe-2016-common__noarch;intel-vtune-amplifier-xe-2016-cli-common__noarch;intel-vtune-amplifier-xe-2016-collector-64linux__x86_64;intel-vtune-amplifier-xe-2016-sep__noarch;intel-vtune-amplifier-xe-2016-gui-common__noarch;intel-vtune-amplifier-xe-2016-gui__x86_64;intel-vtune-amplifier-xe-2016-common-pset__noarch" +COMPONENTS_INSPECTOR="intel-inspector-xe-2016-cli__x86_64;intel-inspector-xe-2016-cli-common__noarch;intel-inspector-xe-2016-gui-common__noarch;intel-inspector-xe-2016-gui__x86_64;intel-inspector-xe-2016-cli-pset__noarch" +COMPONENTS_ADVISOR="intel-advisor-xe-2016-cli__x86_64;intel-advisor-xe-2016-cli-common__noarch;intel-advisor-xe-2016-gui-common__noarch;intel-advisor-xe-2016-gui__x86_64;intel-advisor-xe-2016-cli-pset__noarch" +COMPONENTS_GDB="intel-gdb-gt__x86_64;intel-gdb-gt-src__noarch;intel-gdb-gt-libelfdwarf__x86_64;intel-gdb-gt-devel__x86_64;intel-gdb-gt-common__noarch;intel-gdb-ps-cdt__x86_64;intel-gdb-ps-cdt-source__x86_64;intel-gdb-ps-mic__x86_64;intel-gdb-ps-mpm__x86_64;intel-gdb__x86_64;intel-gdb-source__noarch;intel-gdb-python-source__noarch;intel-gdb-common__noarch;intel-gdb-ps-common__noarch" + +# Parallel libraries +COMPONENTS_MPI="intel-mpi-rt-core__x86_64;intel-mpi-rt-mic__x86_64;intel-mpi-sdk-core__x86_64;intel-mpi-sdk-mic__x86_64;intel-mpi-psxe__x86_64;intel-mpi-rt-psxe__x86_64" +COMPONENTS_TBB="intel-tbb-libs__noarch;intel-mkl-ps-tbb__x86_64;intel-mkl-ps-tbb-devel__x86_64;intel-mkl-ps-tbb-mic__x86_64;intel-mkl-ps-tbb-mic-devel__x86_64;intel-tbb-source__noarch;intel-tbb-devel__noarch;intel-tbb-common__noarch;intel-tbb-ps-common__noarch;intel-tbb-psxe__noarch" +COMPONENTS_MKL="intel-mkl__x86_64;intel-mkl-ps__x86_64;intel-mkl-common__noarch;intel-mkl-ps-common__noarch;intel-mkl-devel__x86_64;intel-mkl-ps-mic-devel__x86_64;intel-mkl-ps-f95-devel__x86_64;intel-mkl-gnu-devel__x86_64;intel-mkl-ps-gnu-devel__x86_64;intel-mkl-ps-pgi-devel__x86_64;intel-mkl-sp2dp-devel__x86_64;intel-mkl-ps-cluster-devel__x86_64;intel-mkl-ps-cluster-common__noarch;intel-mkl-ps-f95-common__noarch;intel-mkl-ps-cluster__x86_64;intel-mkl-gnu__x86_64;intel-mkl-ps-gnu__x86_64;intel-mkl-ps-pgi__x86_64;intel-mkl-sp2dp__x86_64;intel-mkl-ps-mic__x86_64;intel-mkl-ps-tbb__x86_64;intel-mkl-ps-tbb-devel__x86_64;intel-mkl-ps-tbb-mic__x86_64;intel-mkl-ps-tbb-mic-devel__x86_64;intel-mkl-psxe__noarch" +COMPONENTS_IPP="intel-ipp-l-common__noarch;intel-ipp-l-ps-common__noarch;intel-ipp-l-st__x86_64;intel-ipp-l-mt__x86_64;intel-ipp-l-st-devel__x86_64;intel-ipp-l-ps-st-devel__x86_64;intel-ipp-l-mt-devel__x86_64;intel-ipp-psxe__noarch" +COMPONENTS_IPP_CRYPTO="intel-crypto-ipp-st-devel__x86_64;intel-crypto-ipp-ps-st-devel__x86_64;intel-crypto-ipp-st__x86_64;intel-crypto-ipp-mt-devel__x86_64;intel-crypto-ipp-mt__x86_64;intel-crypto-ipp-ss-st-devel__x86_64;intel-crypto-ipp-common__noarch" +COMPONENTS_DAAL="intel-daal__x86_64;intel-daal-common__noarch" + +# Compilers +COMPONENTS_OPENMP="intel-openmp-l-all__x86_64;intel-openmp-l-ps-mic__x86_64;intel-openmp-l-ps__x86_64;intel-openmp-l-ps-ss__x86_64;intel-openmp-l-all-devel__x86_64;intel-openmp-l-ps-mic-devel__x86_64;intel-openmp-l-ps-devel__x86_64;intel-openmp-l-ps-ss-devel__x86_64" +COMPONENTS_COMPILER_COMMON="intel-comp-l-all-vars__noarch;intel-comp-l-all-common;intel-comp-l-ps-common;intel-comp-l-all-devel;intel-comp-l-ps-ss-devel;intel-comp-l-ps-ss-wrapper;intel-comp-l-all-devel;intel-comp-l-ps-devel__x86_64;intel-comp-l-ps-ss-devel__x86_64;intel-psf-intel__x86_64;intel-icsxe-pset;intel-ipsf__noarch;intel-ccompxe__noarch;${COMPONENTS_OPENMP}" +COMPONENTS_IFORT="intel-ifort-l-ps__x86_64;intel-ifort-l-ps-vars__noarch;intel-ifort-l-ps-common__noarch;intel-ifort-l-ps-devel__x86_64;${COMPONENTS_COMPILER_COMMON}" +COMPONENTS_ICC="intel-icc-l-all__x86_64;intel-icc-l-ps-ss__x86_64;intel-icc-l-all-vars__noarch;intel-icc-l-all-common__noarch;intel-icc-l-ps-common__noarch;intel-icc-l-all-devel__x86_64;intel-icc-l-ps-devel__x86_64;intel-icc-l-ps-ss-devel__x86_64;${COMPONENTS_COMPILER_COMMON}" + +DESTINATION="${HOME}/intel" +TEMPORARY_FILES="/tmp" +PHONE_INTEL="no" +COMPONENTS="" + +add_components() { + if [ ! -z "${COMPONENTS}" ]; then + COMPONENTS="${COMPONENTS};$1" + else + COMPONENTS="$1" + fi +} + +while [ $# != 0 ]; do + case "$1" in + "--dest") + DESTINATION="$(realpath "$2")"; shift + ;; + "--tmpdir") + TEMPORARY_FILES="$2"; shift + ;; + "--components") + shift + OLD_IFS="${IFS}" + IFS="," + for component in $1; do + case "$component" in + "icc") + add_components "${COMPONENTS_ICC}" + ;; + "mpi") + add_components "${COMPONENTS_MPI}" + ;; + "vtune") + add_components "${COMPONENTS_VTUNE}" + ;; + "inspector") + add_components "${COMPONENTS_INSPECTOR}" + ;; + "advisor") + add_components "${COMPONENTS_ADVISOR}" + ;; + "tbb") + add_components "${COMPONENTS_TBB}" + ;; + "ifort") + add_components "${COMPONENTS_IFORT}" + ;; + "mkl") + add_components "${COMPONENTS_MKL}" + ;; + "openmp") + # Noop, here for compatability. OpenMP is installed with icc and ifort now. + ;; + "ipp") + add_components "${COMPONENTS_IPP}" + ;; + "ipp-crypto") + add_components "${COMPONENTS_IPP_CRYPTO}" + ;; + "gdb") + add_components "${COMPONENTS_GDB}" + ;; + "daal") + add_components "${COMPONENTS_DAAL}" + ;; + *) + echo "Unknown component '$component'" + exit 1 + ;; + esac + done + IFS="${OLD_IFS}" + ;; + *) + echo "Unrecognized argument '$1'" + exit 1 + ;; + esac + shift +done + +if [ -z "${COMPONENTS}" ]; then + COMPONENTS="${COMPONENTS_ICC}" +fi + +INSTALLER_SCRIPT="parallel_studio_xe_2016_update3_online.sh" +INSTALLER="${TEMPORARY_FILES}/${INSTALLER_SCRIPT}" +INSTALLER_URL="http://registrationcenter-download.intel.com/akdlm/irc_nas/9061/${INSTALLER_SCRIPT}" +SILENT_CFG="${TEMPORARY_FILES}/silent.cfg" +SUCCESS_INDICATOR="${TEMPORARY_FILES}/icc-travis-success" + +if [ ! -e "${TEMPORARY_FILES}" ]; then + echo "${TEMPORARY_FILES} does not exist, creating..." + mkdir -p "${TEMPORARY_FILES}" || (sudo mkdir -p "${TEMPORARY_FILES}" && sudo chown -R "${USER}:${USER}" "${TEMPORARY_FILES}") +fi + +if [ ! -e "${DESTINATION}" ]; then + echo "${DESTINATION} does not exist, creating..." + mkdir -p "${DESTINATION}" || (sudo mkdir -p "${DESTINATION}" && sudo chown -R "${USER}:${USER}" "${DESTINATION}") +fi + +if [ ! -e "${INSTALLER}" ]; then + wget -O "${INSTALLER}" "${INSTALLER_URL}" || exit 1 +fi +chmod u+x "${INSTALLER}" + +# See https://software.intel.com/en-us/articles/intel-composer-xe-2015-silent-installation-guide +echo "# Generated silent configuration file" > "${SILENT_CFG}" +echo "ACCEPT_EULA=accept" >> "${SILENT_CFG}" +echo "INSTALL_MODE=NONRPM" >> "${SILENT_CFG}" +echo "CONTINUE_WITH_OPTIONAL_ERROR=yes" >> "${SILENT_CFG}" +echo "PSET_INSTALL_DIR=${DESTINATION}" >> "${SILENT_CFG}" +echo "CONTINUE_WITH_INSTALLDIR_OVERWRITE=yes" >> "${SILENT_CFG}" +echo "COMPONENTS=${COMPONENTS}" >> "${SILENT_CFG}" +echo "PSET_MODE=install" >> "${SILENT_CFG}" +echo "PHONEHOME_SEND_USAGE_DATA=${PHONE_INTEL}" >> "${SILENT_CFG}" +if [ "x" != "x${INTEL_SERIAL_NUMBER}" ]; then + echo "ACTIVATION_SERIAL_NUMBER=${INTEL_SERIAL_NUMBER}" >> "${SILENT_CFG}" + echo "ACTIVATION_TYPE=serial_number" >> "${SILENT_CFG}" +else + echo "ACTIVATION_TYPE=trial_lic" >> "${SILENT_CFG}" +fi + +attempt=1; +while [ $attempt -le 3 ]; do + if [ ! -e "${TEMPORARY_FILES}/parallel-studio-install-data" ]; then + mkdir -p "${TEMPORARY_FILES}/parallel-studio-install-data" || (sudo mkdir -p "${TEMPORARY_FILES}/parallel-studio-install-data" && sudo chown -R "${USER}:${USER}" "${TEMPORARY_FILES}") + fi + + ("${INSTALLER}" \ + -t "${TEMPORARY_FILES}/parallel-studio-install-data" \ + -s "${SILENT_CFG}" \ + --cli-mode \ + --user-mode && \ + touch "${SUCCESS_INDICATOR}") & + + # So Travis doesn't die in case of a long download/installation. + # + # NOTE: a watched script never terminates. + elapsed=0; + while kill -0 $! 2>/dev/null; do + sleep 1 + elapsed=$(expr $elapsed + 1) + if [ $(expr $elapsed % 60) -eq 0 ]; then + mins_elapsed=$(expr $elapsed / 60) + if [ $mins_elapsed = 1 ]; then + minute_string="minute" + else + minute_string="minutes" + fi + echo "Still running... (about $(expr $elapsed / 60) ${minute_string} so far)." + fi + done + + if [ ! -e "${SUCCESS_INDICATOR}" ]; then + echo "Installation failed." + exit 1 + fi + + if [ ! -e "${DESTINATION}/bin/compilervars.sh" ]; then + # Sometimes the installer returns successfully without actually + # installing anything. Let's try again… + echo "Installation attempt #${attempt} completed, but unable to find compilervars.sh." + find "${DESTINATION}" + else + break + fi + + rm -vrf "${TEMPORARY_FILES}/parallel-studio-install-data" + echo "Trying again..." + + attempt=$(expr $attempt + 1) +done + +if [ ! -e "${DESTINATION}/bin/compilervars.sh" ]; then + echo "Installation failed." + exit 1 +fi + +# Apparently the installer drops the license file in a location it +# doesn't know to check. +ln -s "${DESTINATION}"/licenses ~/Licenses + +# Add configuration information to ~/.bashrc. Unfortunately this will +# not be picked up automatically by Travis, so you'll still need to +# source ~/.bashrc in your .travis.yml +# +# Container-based builds include a `[ -z "$PS1" ] && return` near the +# beginning of the file, so appending won't work, we'll need to +# prepend. +echo "export INTEL_INSTALL_PATH=\"${DESTINATION}\"" >> ~/.bashrc-intel +echo ". \"\${INTEL_INSTALL_PATH}/bin/compilervars.sh\" intel64" >> ~/.bashrc-intel +echo "export LD_LIBRARY_PATH=\"\${INTEL_INSTALL_PATH}/ism/bin/intel64:\${INTEL_INSTALL_PATH}/lib/intel64_lin:\$LD_LIBRARY_PATH\"" >> ~/.bashrc-intel +echo "export PATH=\"\${INTEL_INSTALL_PATH}/bin:\$PATH\"" >> ~/.bashrc-intel +echo "function uninstall_intel_software {" >> ~/.bashrc-intel +echo " find \"\${INTEL_INSTALL_PATH}\" -name 'uninstall.sh' -not -path '*/ism/uninstall.sh' -exec {} -s \;" >> ~/.bashrc-intel +echo "}" >> ~/.bashrc-intel +cat ~/.bashrc >> ~/.bashrc-intel +mv ~/.bashrc-intel ~/.bashrc