From 2351f81b77cf2168120c20ca02cccce181eb55f0 Mon Sep 17 00:00:00 2001 From: Lehman Garrison Date: Tue, 28 Sep 2021 11:05:04 -0400 Subject: [PATCH 1/4] Add lscpu and preprocessor defs to CI output --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f2fc3233..d38c4a84 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -109,6 +109,10 @@ jobs: echo "COMPILER VERSION = " `${{ matrix.compiler }} --version` echo "PYTHON = " `which python` echo "(PYTHON, NUMPY) version = " `python -c "import sys; import numpy as np; print(sys.version); print(np.__version__);"` + echo "lscpu output:" + lscpu + echo "${{ matrix.compiler }} -march=native preprocessor defs:" + echo | ${{ matrix.compiler }} -dM -E - -march=native # - name: Add linker flag to OSX + gcc # shell: bash -l {0} From 793a389942e75f712aa12a5f83610f9c844055e4 Mon Sep 17 00:00:00 2001 From: Lehman Garrison Date: Tue, 28 Sep 2021 11:20:34 -0400 Subject: [PATCH 2/4] Try sysctl instead of lscpu on OSX --- .github/workflows/ci.yml | 14 +++++++++++--- CHANGES.rst | 1 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d38c4a84..b37bef3a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -109,10 +109,18 @@ jobs: echo "COMPILER VERSION = " `${{ matrix.compiler }} --version` echo "PYTHON = " `which python` echo "(PYTHON, NUMPY) version = " `python -c "import sys; import numpy as np; print(sys.version); print(np.__version__);"` - echo "lscpu output:" + echo "Preprocessor defs:" + echo ${{ matrix.compiler }} -dM -E - -march=native + + - name: lscpu on Linux + if: matrix.os != 'macos-latest' + run: | lscpu - echo "${{ matrix.compiler }} -march=native preprocessor defs:" - echo | ${{ matrix.compiler }} -dM -E - -march=native + + - name: sysctl machdep.cpu on OSX + if: matrix.os == 'macos-latest' + run: | + sysctl machdep.cpu # - name: Add linker flag to OSX + gcc # shell: bash -l {0} diff --git a/CHANGES.rst b/CHANGES.rst index cbc065a3..d79b6730 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -31,6 +31,7 @@ Enhancements - Add detection of known-bad Cray hugepages library at NERSC [#246] - Replace ``np.float`` with ``np.float64`` to fix numpy 1.20 deprecation [#250] - Test Numpy versions as old as 1.14 and recent as 1.20 [#251] +- Add lscpu and preprocessor defs to CI output [#259] Bug fixes --------- From 31eb09716c6f132ff31f1424f13c613c4d0ba418 Mon Sep 17 00:00:00 2001 From: Lehman Garrison Date: Tue, 28 Sep 2021 11:37:12 -0400 Subject: [PATCH 3/4] Fix syntax --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b37bef3a..1e84d57d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,7 +110,7 @@ jobs: echo "PYTHON = " `which python` echo "(PYTHON, NUMPY) version = " `python -c "import sys; import numpy as np; print(sys.version); print(np.__version__);"` echo "Preprocessor defs:" - echo ${{ matrix.compiler }} -dM -E - -march=native + echo `${{ matrix.compiler }} -dM -E - -march=native` - name: lscpu on Linux if: matrix.os != 'macos-latest' From 4a7538c336036fd2cc6ab9b10c891acf12086fad Mon Sep 17 00:00:00 2001 From: Lehman Garrison Date: Tue, 28 Sep 2021 11:58:51 -0400 Subject: [PATCH 4/4] Remove EOL Ubuntu 16.04 --- .github/workflows/ci.yml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1e84d57d..a8c8e764 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["ubuntu-16.04", "ubuntu-18.04", "ubuntu-20.04", "macos-latest"] + os: ["ubuntu-18.04", "ubuntu-20.04", "macos-latest"] compiler: [gcc-7, gcc-9, gcc-10, clang] python-version: ["2.7", "3.5", "3.6", "3.7", "3.8"] numpy-version: ["1.14", "1.18", "1.20"] @@ -24,8 +24,6 @@ jobs: compiler: gcc-10 # Don't use 'clang' on linux - - os: "ubuntu-16.04" - compiler: clang - os: "ubuntu-18.04" compiler: clang - os: "ubuntu-20.04" @@ -37,15 +35,7 @@ jobs: - os: "ubuntu-20.04" compiler: gcc-7 - # only gcc-9 on 16.04 - - os: "ubuntu-16.04" - compiler: gcc-7 - - os: "ubuntu-16.04" - compiler: gcc-10 - # python3.8 only on 20.04 - - os: "ubuntu-16.04" - python-version: "3.8" - os: "ubuntu-18.04" python-version: "3.8" - os: "macos-latest" @@ -88,7 +78,7 @@ jobs: - name: Install binutils on linux shell: bash -l {0} - if: matrix.os == 'ubuntu-16.04' || matrix.os == 'ubuntu-18.04' + if: matrix.os == 'ubuntu-18.04' run: | sudo apt-get update sudo apt-get install binutils