From 9453868cd8afb83576358fdf5a8bad2862f0b4a1 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 5 Sep 2021 10:23:42 +0200 Subject: [PATCH] polishing --- .github/workflows/Fortran.yml | 25 +++++++++++++++---------- .github/workflows/Python.yml | 14 +++++++++++++- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/.github/workflows/Fortran.yml b/.github/workflows/Fortran.yml index a190a5671..92de7a7cd 100644 --- a/.github/workflows/Fortran.yml +++ b/.github/workflows/Fortran.yml @@ -1,5 +1,4 @@ -name: Fortran - +name: Grid and Mesh Solver on: [push] env: @@ -10,18 +9,22 @@ env: HOMEBREW_NO_INSTALL_CLEANUP: "ON" jobs: + gcc: + runs-on: ${{ matrix.os }} + strategy: matrix: os: [ubuntu-latest, macos-latest] - gcc_v: [9, 10, 11] # Version of GCC compilers we want to use. + gcc_v: [9, 10, 11] # Version of GCC compilers + env: GCC_V: ${{ matrix.gcc_v }} steps: - - name: Checkout code - uses: actions/checkout@v2 + + - uses: actions/checkout@v2 - name: Set up Python 3.x uses: actions/setup-python@v1 @@ -53,7 +56,7 @@ jobs: export PETSC_ARCH=gcc${GCC_V} printenv >> $GITHUB_ENV - - name: Cache PETSc Installation + - name: Cache PETSc installation uses: actions/cache@v2 with: path: petsc-3.15.4 @@ -90,16 +93,18 @@ jobs: ./bin/DAMASK_grid -l tensionX.yaml -g 20grains16x16x16.vti -w examples/grid intel: + runs-on: [ubuntu-latest] + strategy: matrix: - intel_v: [classic, llvm] # Version of Intel compilers we want to use. + intel_v: [classic, llvm] # Variant of Intel compilers + env: INTEL_V: ${{ matrix.intel_v }} steps: - - name: Checkout code - uses: actions/checkout@v2 + - uses: actions/checkout@v2 - name: Set up Python 3.x uses: actions/setup-python@v1 @@ -125,7 +130,7 @@ jobs: export PETSC_ARCH=intel-${INTEL_V} printenv >> $GITHUB_ENV - - name: Cache PETSc Installation + - name: Cache PETSc installation uses: actions/cache@v2 with: path: petsc-3.15.4 diff --git a/.github/workflows/Python.yml b/.github/workflows/Python.yml index 83b0aeb07..bfeefb134 100644 --- a/.github/workflows/Python.yml +++ b/.github/workflows/Python.yml @@ -1,41 +1,53 @@ -name: Test Python Library +name: Processing Tools on: [push] jobs: + pip: + runs-on: ${{ matrix.os }} + strategy: matrix: python-version: [3.7, 3.8, 3.9] os: [ubuntu-latest, macos-latest] + steps: - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} + - name: Install dependencies run: | python -m pip install --upgrade pip pip install pytest pandas scipy h5py vtk matplotlib pyyaml + - name: Install and run unit tests run: | python -m pip install ./python --no-deps -vv --use-feature=in-tree-build COLUMNS=256 pytest python apt: + runs-on: ubuntu-latest + steps: - uses: actions/checkout@v2 + - name: Install pytest run: | python -m pip install --upgrade pip pip install pytest + - name: Install dependencies run: > sudo apt-get update && sudo apt-get install python3-pip python3-pytest python3-pandas python3-scipy python3-h5py python3-vtk7 python3-matplotlib python3-yaml -y + - name: Run unit tests run: | export PYTHONPATH=${PWD}/python