Merge pull request #215 from hpcgarage/jyoung3131-wf-fixes

Update build-serial-omp.yml
hpcgarage · Sep 23, 2024 · ee14c26 · ee14c26
2 parents d005803 + 0624c52
commit ee14c26
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 16 deletions.
diff --git a/.github/workflows/build-cuda.yml b/.github/workflows/build-cuda.yml
@@ -1,10 +1,8 @@
 name: Build and Test CUDA Backend
 
 on:
-  push:
-    branches: [ main spatter-devel ]
   pull_request:
-    branches: [ main spatter-devel ]
+    branches: [main, spatter-devel]
   schedule:
     - cron: '30 8 * * *'
 

diff --git a/.github/workflows/build-mpi.yml b/.github/workflows/build-mpi.yml
@@ -1,11 +1,9 @@
 name: Build and Test MPI Backend
 
 on:
-  push:
-    branches: [ main spatter-devel ]
   pull_request:
-    branches: [ main spatter-devel ]
-
+    branches: [main, spatter-devel]
+  
 jobs:  
   build-and-run-mpi:
     runs-on: ubuntu-latest
@@ -19,5 +17,4 @@ jobs:
         run: 
           cmake -DUSE_MPI=1 -B build_mpi -S . && make -C build_mpi
       - name: Test-MPI
-        run: make test -C build_mpi
-
+        run: make test -C build_mpi
diff --git a/.github/workflows/build-serial-omp.yml b/.github/workflows/build-serial-omp.yml
@@ -1,9 +1,8 @@
 name: Build and Test Serial and OpenMP backends
 
-on: [push, pull_request]
-    branches: 
-      - main 
-      - spatter-devel
+on: 
+  pull_request:
+    branches: [main, spatter-devel]
 
 jobs:
   build-and-run-serial:

diff --git a/.github/workflows/notebooks.yml b/.github/workflows/notebooks.yml
@@ -1,10 +1,8 @@
 name: Notebook Build
 
 on:
-  push:
-    branches: [ main spatter-devel ]
   pull_request:
-    branches: [ main spatter-devel ]
+    branches: [main, spatter-devel]
 
 jobs:
   notebook-tests:

diff --git a/cmake/pkgs/MPISupport.cmake b/cmake/pkgs/MPISupport.cmake
@@ -3,6 +3,8 @@ option(USE_MPI "Enable support for MPI")
 if (USE_MPI)
     find_package(MPI)
     include_directories(${MPI_INCLUDE_PATH})
+    #Explicitly add directory for Ubuntu 22 to search
+    include_directories(/usr/lib/x86_64-linux-gnu/openmpi/include)
     set(COMMON_LINK_LIBRARIES ${COMMON_LINK_LIBRARIES} MPI::MPI_CXX)
     add_definitions(-DUSE_MPI)
 endif()