Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fortran: Fix module install rules for Cray Fortran #2503

Merged
merged 2 commits into from
Nov 5, 2020
Merged

Fortran: Fix module install rules for Cray Fortran #2503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1380b62
Fortran: Fix module install rules for Cray Fortran
Nov 2, 2020
f3f9caa
ci: Use 1g for /dev/shm in containers
Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ on:
jobs:
linux:
runs-on: ubuntu-latest
container: ${{ matrix.container }}
env:
GH_YML_JOBNAME: ${{ matrix.jobname }}
GH_YML_OS: Linux
container:
image: ${{ matrix.container }}
options: --shm-size=1g
env:
GH_YML_JOBNAME: ${{ matrix.jobname }}
GH_YML_OS: Linux

strategy:
fail-fast: false
Expand Down Expand Up @@ -61,10 +63,10 @@ jobs:
runs-on: ubuntu-latest
container:
image: ${{ matrix.container }}
options: --privileged
env:
GH_YML_JOBNAME: ${{ matrix.jobname }}
GH_YML_OS: Linux
options: --privileged --shm-size=1g
env:
GH_YML_JOBNAME: ${{ matrix.jobname }}
GH_YML_OS: Linux

strategy:
fail-fast: false
Expand Down Expand Up @@ -103,10 +105,12 @@ jobs:

linux_spack:
runs-on: ubuntu-latest
container: ${{ matrix.container }}
env:
GH_YML_JOBNAME: ${{ matrix.jobname }}
GH_YML_OS: Linux
container:
image: ${{ matrix.container }}
options: --shm-size=1g
env:
GH_YML_JOBNAME: ${{ matrix.jobname }}
GH_YML_OS: Linux

strategy:
fail-fast: false
Expand Down
2 changes: 2 additions & 0 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ resources:
containers:
- container: el7-intel-ohpc
image: ornladios/adios2:ci-el7-intel-ohpc
options: --shm-size=1g
- container: el7-intel-openmpi-ohpc
image: ornladios/adios2:ci-el7-intel-openmpi-ohpc
options: --shm-size=1g

jobs:
- job: windows
Expand Down
3 changes: 3 additions & 0 deletions bindings/Fortran/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ install(
COMPONENT adios2_fortran-development
FILES_MATCHING
PATTERN "adios2*.mod"
PATTERN "adios2*.smod"
PATTERN "ADIOS2*.mod"
PATTERN "ADIOS2*.smod"
PATTERN "CMakeFiles" EXCLUDE
)

Expand Down