From b3d9c3543dcbebde30185c163208b8a00793ae45 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Tue, 21 Dec 2021 11:23:49 -0800 Subject: [PATCH] vi: replacing currently broken ICC Latest C++17 with C++14. (#3551) * Trivial change. * Trying ICC Latest C++14 instead of C++17. * Trying ICC Latest C++20 instead of C++17. * Settling on ICC Latest C++14 for now. * Undoing trivial change. * ci: try using SETUPTOOLS_USE_DISTUTILS=stdlib Co-authored-by: Henry Schreiner --- .github/workflows/ci.yml | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e67baf1..f256f050 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -247,6 +247,8 @@ jobs: python -m pip install -r tests/requirements.txt - name: Configure + env: + SETUPTOOLS_USE_DISTUTILS: stdlib run: > cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug @@ -555,37 +557,37 @@ jobs: set +e; source /opt/intel/oneapi/setvars.sh; set -e cmake --build build-11 --target test_cmake_build - - name: Configure C++17 + - name: Configure C++14 run: | set +e; source /opt/intel/oneapi/setvars.sh; set -e - cmake -S . -B build-17 \ + cmake -S . -B build-14 \ -DPYBIND11_WERROR=ON \ -DDOWNLOAD_CATCH=ON \ -DDOWNLOAD_EIGEN=OFF \ - -DCMAKE_CXX_STANDARD=17 \ + -DCMAKE_CXX_STANDARD=14 \ -DCMAKE_CXX_COMPILER=$(which icpc) \ -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") - - name: Build C++17 + - name: Build C++14 run: | set +e; source /opt/intel/oneapi/setvars.sh; set -e - cmake --build build-17 -j 2 -v + cmake --build build-14 -j 2 -v - - name: Python tests C++17 + - name: Python tests C++14 run: | set +e; source /opt/intel/oneapi/setvars.sh; set -e sudo service apport stop - cmake --build build-17 --target check + cmake --build build-14 --target check - - name: C++ tests C++17 + - name: C++ tests C++14 run: | set +e; source /opt/intel/oneapi/setvars.sh; set -e - cmake --build build-17 --target cpptest + cmake --build build-14 --target cpptest - - name: Interface test C++17 + - name: Interface test C++14 run: | set +e; source /opt/intel/oneapi/setvars.sh; set -e - cmake --build build-17 --target test_cmake_build + cmake --build build-14 --target test_cmake_build # Testing on CentOS (manylinux uses a centos base, and this is an easy way