diff options
author | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-11-27 00:41:11 -0500 |
---|---|---|
committer | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-11-30 21:30:52 -0500 |
commit | e097c22f8246bb44e356d83cd9e04d768df86030 (patch) | |
tree | 2e2d539657d79c89c0add785f2a7be8e86ff2cb2 | |
parent | 92b77cb3210280315c47d18f3c87cdd2c59021bc (diff) | |
download | meson-e097c22f8246bb44e356d83cd9e04d768df86030.zip meson-e097c22f8246bb44e356d83cd9e04d768df86030.tar.gz meson-e097c22f8246bb44e356d83cd9e04d768df86030.tar.bz2 |
scalapack: add to Dockerfile
scalapack: actions Macos
-rw-r--r-- | .github/workflows/ci_frameworks.yml | 31 | ||||
-rw-r--r-- | ciimage/Dockerfile | 1 |
2 files changed, 2 insertions, 30 deletions
diff --git a/.github/workflows/ci_frameworks.yml b/.github/workflows/ci_frameworks.yml index 0a0ce8b..44cb843 100644 --- a/.github/workflows/ci_frameworks.yml +++ b/.github/workflows/ci_frameworks.yml @@ -14,36 +14,7 @@ on: jobs: - scalapack_linux: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - uses: actions/setup-python@v1 - with: - python-version: '3.x' - - run: python -m pip install . - - name: install prereq - run: | - sudo apt update -yq - sudo apt install -yq --no-install-recommends pkg-config ninja-build gfortran liblapack-dev libscalapack-mpi-dev libopenmpi-dev openmpi-bin - - run: meson setup "test cases/frameworks/30 scalapack" build - env: - FC: gfortran - CC: gcc - - run: ninja -C build - - uses: actions/upload-artifact@v1 - if: failure() - with: - name: Scalpack_Linux_Build - path: build/meson-logs/meson-log.txt - - run: meson test -C build -v - - uses: actions/upload-artifact@v1 - if: failure() - with: - name: Scalapack_Linux_Test - path: build/meson-logs/testlog.txt - - scalapack_mac: + scalapackMacOS: runs-on: macos-latest steps: - uses: actions/checkout@v1 diff --git a/ciimage/Dockerfile b/ciimage/Dockerfile index 6d95500..a98662c 100644 --- a/ciimage/Dockerfile +++ b/ciimage/Dockerfile @@ -27,6 +27,7 @@ RUN sed -i '/^#\sdeb-src /s/^#//' "/etc/apt/sources.list" \ && eatmydata apt-get -y install libboost-python-dev \ && eatmydata apt-get -y install libblocksruntime-dev \ && eatmydata apt-get -y install libperl-dev \ +&& eatmydata apt-get -y install liblapack-dev libscalapack-mpi-dev \ && eatmydata dub fetch urld && dub build urld --compiler=gdc \ && eatmydata dub fetch dubtestproject \ && eatmydata dub build dubtestproject:test1 --compiler=ldc2 \ |