Fully integrate oomph_third_party_libraries repo code into main project.

puneetmatharu · Nov 23, 2023 · 275eb00 · 275eb00
1 parent 9402fc3
commit 275eb00
Show file tree

Hide file tree

Showing 13 changed files with 81 additions and 501 deletions.
diff --git a/.github/workflows/self-tests-macos.yaml b/.github/workflows/self-tests-macos.yaml
@@ -1,9 +1,22 @@
 --- # ------------------------------------------------------------------------------
 name: macOS
 
-# TODO: Possibly add on-push-paths triggers below to only trigger self-tests when .c, .h, .cc,
-# .cmake, .py, .sh, CMakeLists.txt and workflow files are pushed
-on: push
+on:
+  push:
+    paths:
+      # Run self-tests if we edited the demo drivers, sources, third-party
+      # library code or self-tests
+      - "demo_drivers/**"
+      - "external_distributions/CMakeLists.txt"
+      - "external_distributions/cmake/**"
+      - "external_src/**"
+      - "scripts/**"
+      - "self_test/**"
+      - "src/**"
+      # Don't run self-tests if we've just edited a Makefile.am
+      - "!**/.gitignore"
+      - "!**/README.md"
+      - "!**/Makefile.am"
 
 # Environment variables that can be read during jobs
 env:

diff --git a/.github/workflows/self-tests-ubuntu.yaml b/.github/workflows/self-tests-ubuntu.yaml
@@ -1,9 +1,20 @@
 --- # ------------------------------------------------------------------------------
 name: Ubuntu
 
-# TODO: Possibly add on-push-paths triggers below to only trigger self-tests when .c, .h, .cc,
-# .cmake, .py, .sh, CMakeLists.txt and workflow files are pushed
-on: push
+on:
+  push:
+    paths:
+      # Run self-tests if we edited the demo drivers, sources, third-party
+      # library code or self-tests
+      - "demo_drivers/**"
+      - "external_distributions/CMakeLists.txt"
+      - "external_distributions/cmake/**"
+      - "external_src/**"
+      - "scripts/**"
+      - "self_test/**"
+      - "src/**"
+      # Don't run self-tests if we've just edited a Makefile.am
+      - "!**/Makefile.am"
 
 # Environment variables that can be read during jobs
 env:

diff --git a/...ons/.github/workflows/build-on-macos.yaml → ...flows/test-third-party-libs-on-macos.yaml b/...ons/.github/workflows/build-on-macos.yaml → ...flows/test-third-party-libs-on-macos.yaml
@@ -1,7 +1,13 @@
 # ------------------------------------------------------------------------------
 
 name: macOS
-on: push
+
+# Test third-party libs building ONLY if we edited code in external_distributions/
+on:
+  push:
+    paths:
+      - "external_distributions/CMakeLists.txt"
+      - "external_distributions/cmake/**"
 
 # Print the output of a test if it fails
 env:
@@ -44,17 +50,19 @@ jobs:
             -DOOMPH_USE_MPFR_FROM=$(brew --prefix mpfr) \
             -DOOMPH_ENABLE_MPI=${{ matrix.mpi }} \
             -B build
+        working-directory: ./external_distributions/
 
       - name: Build/install
         id: build
         run: cmake --build build
+        working-directory: ./external_distributions/
         continue-on-error: true
 
       - name: Upload build logs
         uses: actions/upload-artifact@v3
         with:
           name: build_logs-os_${{ runner.os }}-mpi_${{ matrix.mpi }}
-          path: ./build/logs/
+          path: ./external_distributions/build/logs/
 
       - name: Propagate build status
         if: steps.build.outcome == 'failure'

diff --git a/...ns/.github/workflows/build-on-ubuntu.yaml → ...lows/test-third-party-libs-on-ubuntu.yaml b/...ns/.github/workflows/build-on-ubuntu.yaml → ...lows/test-third-party-libs-on-ubuntu.yaml
@@ -1,7 +1,13 @@
 # ------------------------------------------------------------------------------
 
 name: Ubuntu
-on: push
+
+# Test third-party libs building ONLY if we edited code in external_distributions/
+on:
+  push:
+    paths:
+      - "external_distributions/CMakeLists.txt"
+      - "external_distributions/cmake/**"
 
 # Print the output of a test if it fails
 env:
@@ -38,17 +44,19 @@ jobs:
 
       - name: Configure
         run: cmake -G Ninja -DOOMPH_ENABLE_MPI=${{ matrix.mpi }} -B build
+        working-directory: ./external_distributions/
 
       - name: Build/install
         id: build
         run: cmake --build build
+        working-directory: ./external_distributions/
         continue-on-error: true
 
       - name: Upload build logs
         uses: actions/upload-artifact@v3
         with:
           name: build_logs-os_${{ runner.os }}-mpi_${{ matrix.mpi }}
-          path: ./build/logs/
+          path: ./external_distributions/build/logs/
 
       - name: Propagate build status
         if: steps.build.outcome == 'failure'

diff --git a/.gitignore b/.gitignore
@@ -160,7 +160,7 @@ compile
 src/generic/mumps_module.mod
 
 # Installation
-install/
+**/install/
 
 # Some binaries/scripts that are generated
 external_distributions/hypre/build_script.bash

diff --git a/TODO-LIST.md b/TODO-LIST.md
@@ -4,6 +4,11 @@
 
 Include tasks here that likely need some collaboration with Matthias
 
+* [ ] DISCUSS UPDATED SELF-TEST TRIGGER SYNTAX
+* [ ] Can I wipe the `config/` directory? or do we need to keep it around?
+* [ ] Discuss making `oomph_lib_third_party_libraries` a submodule so we can preserve the README badges (or add tests to main project; should only trigger those workflows if we edit external_distributions/)
+* [ ] Discuss switching to OpenBLAS only (need to change OOMPH_USE_BLAS/LAPACK_FROM)
+
 * [ ] Go through all new commits to the main repository in the last 1-2 years and make sure any changes in Makefiles have been reflected in their corresponding CMakeLists.txt file
 * [ ] Possibly change `oomphlib` -> `oomph_lib`? (carefully(!) avoid changing headers/sources)