From f431b457da9d74bc7ef4cfdee5d8515838fc639e Mon Sep 17 00:00:00 2001 From: David Sagan Date: Tue, 24 Oct 2023 11:01:50 -0400 Subject: [PATCH 1/6] Minor change. --- .github/workflows/ci.yml | 1 + .gitignore | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a432e3d03..af8c8f8844 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,6 +47,7 @@ jobs: steps: # Check out the code from GitHub - uses: actions/checkout@v4 + # - uses: mpi4py/setup-mpi@v1 # Install system dependencies - name: Install System Dependencies diff --git a/.gitignore b/.gitignore index 019e3dc856..8244e2b790 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ plplot xraylib gnu_utilities_src packages +.directoryhash # Jupyter notebooks .ipynb_checkpoints From 5a0c163796024be487d2eb4b1e2bfd1e1b3d2cb7 Mon Sep 17 00:00:00 2001 From: David Sagan Date: Tue, 24 Oct 2023 11:08:26 -0400 Subject: [PATCH 2/6] MPI install for PR check. --- .github/workflows/ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index af8c8f8844..246e1782a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,12 @@ jobs: steps: # Check out the code from GitHub - uses: actions/checkout@v4 - # - uses: mpi4py/setup-mpi@v1 + + # MPI setup + - name: Setup MPI + - uses: mpi4py/setup-mpi@v1 + with: + mpi: 'openmpi' # Install system dependencies - name: Install System Dependencies From 987c216919bd2526798b6dd85e3fa73d6cad2dc6 Mon Sep 17 00:00:00 2001 From: David Sagan Date: Tue, 24 Oct 2023 11:10:45 -0400 Subject: [PATCH 3/6] MPI install for PR check. --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 246e1782a5..ae2dbf3231 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,8 +48,8 @@ jobs: # Check out the code from GitHub - uses: actions/checkout@v4 - # MPI setup - - name: Setup MPI + # MPI setup + - name: Setup MPI - uses: mpi4py/setup-mpi@v1 with: mpi: 'openmpi' From 5fa3e74fc0c35e48956bea88590225355b49a60b Mon Sep 17 00:00:00 2001 From: David Sagan Date: Tue, 24 Oct 2023 11:14:21 -0400 Subject: [PATCH 4/6] MPI install for PR check. --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ae2dbf3231..155bde9dc4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,9 +50,7 @@ jobs: # MPI setup - name: Setup MPI - - uses: mpi4py/setup-mpi@v1 - with: - mpi: 'openmpi' + - uses: mpi4py/setup-mpi@v1 "openmpi" # Install system dependencies - name: Install System Dependencies From 93f762cf47906cb4916aa1c3c61ecdda2f8ff3d2 Mon Sep 17 00:00:00 2001 From: David Sagan Date: Tue, 24 Oct 2023 11:16:03 -0400 Subject: [PATCH 5/6] MPI install for PR check. --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 155bde9dc4..67dd98fb5d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,9 +47,6 @@ jobs: steps: # Check out the code from GitHub - uses: actions/checkout@v4 - - # MPI setup - - name: Setup MPI - uses: mpi4py/setup-mpi@v1 "openmpi" # Install system dependencies From 72446cc8b9a32337c66f9e49982f5eec98ce1ca5 Mon Sep 17 00:00:00 2001 From: David Sagan Date: Tue, 24 Oct 2023 11:25:06 -0400 Subject: [PATCH 6/6] MPI install for PR check. --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 67dd98fb5d..b9fc8ba18e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,18 +42,18 @@ jobs: # add macOS - check if GH Actions can make intel and arm os: [ubuntu-latest] shared: ["Y"] - ## openmp_mpi: ["N", "Y"] + openmp_mpi: ["N", "Y"] steps: # Check out the code from GitHub - uses: actions/checkout@v4 - - uses: mpi4py/setup-mpi@v1 "openmpi" + ### - uses: mpi4py/setup-mpi@v1 "openmpi" # Install system dependencies - name: Install System Dependencies run: | sudo apt update - sudo apt-get install gfortran g++ cmake libtool-bin libreadline-dev libpango1.0-dev libssl-dev bc + sudo apt-get install gfortran g++ cmake libtool-bin libreadline-dev libpango1.0-dev libssl-dev bc libopenmpi-dev openmpi-bin openmpi-common # sudo apt install build-essential curl wget cmake gfortran automake \ # autoconf libtool m4 libgomp1 libreadline-dev libncurses-dev pkg-config \