Merge pull request #79 from EXP-code/devel

Bug fixes and GitHub action improvement
EXP-code · Jul 10, 2024 · cbd99ce · cbd99ce
2 parents 90c2338 + 7a0e463
commit cbd99ce
Show file tree

Hide file tree

Showing 32 changed files with 910 additions and 308 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: "Test Builds"
+name: "Build and Test"
 
 on:
   push:
@@ -7,12 +7,13 @@ on:
   pull_request:
     branches:
       - main
+      - devel
 jobs:
-  pyexp:
+  exp:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        cc: [gcc, mpicc]
+        cc: [gcc]
 
     name: "Test pyEXP Build"
     runs-on: ${{ matrix.os }}
@@ -25,20 +26,21 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y build-essential libeigen3-dev libfftw3-dev libhdf5-dev libopenmpi-dev
+          sudo pip install numpy
 
       - name: Setup submodule and build
         run: |
           git submodule update --init --recursive
           mkdir -p build/install
 
-      - name: Compile pyEXP
+      - name: Compile EXP
         if: runner.os == 'Linux'
         env:
           CC: ${{ matrix.cc }}
         working-directory: ./build
         run: >-
           cmake
-          -DENABLE_NBODY=NO
+          -DENABLE_NBODY=YES
           -DENABLE_PYEXP=YES
           -DCMAKE_BUILD_TYPE=Release
           -DEigen3_DIR=/usr/include/eigen3/share/eigen3/cmake
@@ -48,48 +50,12 @@ jobs:
 
       - name: Make
         working-directory: ./build
-        run: make -j 2
-
-  # -----------------------------------------------------------------------------------
-
-  exp:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        cc: [gcc, mpicc]
-
-    name: "Test Full EXP Build"
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install core dependencies - ubuntu
-        if: runner.os == 'Linux'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y build-essential libeigen3-dev libfftw3-dev libhdf5-dev libopenmpi-dev
-
-      - name: Setup submodule and build
-        run: |
-          git submodule update --init --recursive
-          mkdir -p build/install
-
-      - name: Compile Full EXP - Linux
-        if: runner.os == 'Linux'
-        env:
-          CC: ${{ matrix.cc }}
-        working-directory: ./build
-        run: >-
-          cmake
-          -DENABLE_NBODY=YES
-          -DENABLE_PYEXP=NO
-          -DCMAKE_BUILD_TYPE=Release
-          -DEigen3_DIR=/usr/include/eigen3/share/eigen3/cmake
-          -DCMAKE_INSTALL_PREFIX=./install
-          -Wno-dev
-          ..
+        run: make -j 4
 
-      - name: Make
+      - name: CTest Quick
         working-directory: ./build
-        run: make -j 2
+        run: ctest -L quick
+
+      #- name: CTest Long
+      #working-directory: ./build
+      #run: ctest -L long
diff --git a/.github/workflows/buildfull.yml b/.github/workflows/buildfull.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.21) # Needed for CUDA, MPI, and CTest features
 
 project(
   EXP
-  VERSION "7.7.30"
+  VERSION "7.7.99"
   HOMEPAGE_URL https://github.com/EXP-code/EXP
   LANGUAGES C CXX Fortran)
 
@@ -228,7 +228,8 @@ add_subdirectory(extern/pybind11)
 # Set options for the HighFive git submodule in extern
 set(HIGHFIVE_EXAMPLES OFF CACHE BOOL "Do not build the examples")
 set(HIGHFIVE_BUILD_DOCS OFF CACHE BOOL "Do not build the documentation")
-set(HIGHFIVE_USE_BOOST OFF CACHE BOOL "Do not use Boost in HighFIve")
+set(HIGHFIVE_USE_BOOST OFF CACHE BOOL "Do not use Boost in HighFive")
+set(HIGHFIVE_UNIT_TESTS OFF CACHE BOOL "Turn off internal testing for HighFIve")
 set(H5_USE_EIGEN TRUE CACHE BOOL "Eigen3 support in HighFive")
 
 add_subdirectory(extern/HighFive EXCLUDE_FROM_ALL)