Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
9e15832
Add new construction to create instance from a cachefile [no ci]
Jun 25, 2024
9cdc6e0
Fix for cache-only constructor [no ci]
Jun 25, 2024
ecd09f2
Missing initialization of accumulation structures [no ci]
Jun 26, 2024
532c267
Call read_cache() to set up grids [no ci]
Jun 26, 2024
c7c6311
Added constructor from cache file for SLGridSph [no ci]
Jun 29, 2024
60957b5
Added Savitsky-Golay smoothing class [no ci]
Jun 29, 2024
6825d70
A draft CONTRIBUTING document for the EXP source tree ported from the…
Jul 2, 2024
c7948ac
Basis expects a node with the 'parameters' key for parsing [no ci]
Jul 4, 2024
0c1a9db
Merge branch 'devel' into createFromCache
The9Cat Jul 4, 2024
b70207f
Fixes for HDF5 libraries with CMake
Jul 4, 2024
77a1ba9
Fixes for velocity field analysis
Jul 4, 2024
5ef2e03
Fix HighFive type mismatch that was causing an exception in writing t…
Jul 4, 2024
3f8e317
Fix H5 type for correct cache writing
Jul 5, 2024
aef82b5
Implement proper coefficient parsing for velocity field basis
Jul 5, 2024
4225791
Parameter name changes for consistency with main N-body code
Jul 5, 2024
eb998dd
Removed some debugging cruft
Jul 5, 2024
971f33d
Pre-release version bump
Jul 6, 2024
1ccff70
Added a routine to dump the basis [no ci]
Jul 6, 2024
689c1fd
Added a factor to make the weight function normalized [no ci]
Jul 6, 2024
ff6c4d4
Merge branch 'createFromCache' into devel
Jul 7, 2024
6353a5a
Removed experimental extensions from previous mixed bug-fix and featu…
Jul 7, 2024
9620935
Missing Koopman removal from the header file [no ci]
Jul 7, 2024
1dfb00c
sqrt not a constexpr in clang
michael-petersen Jul 8, 2024
76c68cf
Add C++17 workaround for sqrt constexpr
michael-petersen Jul 9, 2024
23fbb21
Updates to 'make tests' scripts and config [no ci]
Jul 9, 2024
2e89c5d
Testing testing 1 2 3
michael-petersen Jul 9, 2024
93c48f2
rm old build action [no ci]
michael-petersen Jul 9, 2024
b02f556
Remove temporary files automatically
Jul 9, 2024
b2041ad
A few minor updates and clean ups [no ci]
Jul 9, 2024
78b41f0
Change the component name to prevent a coefficient file name that con…
Jul 9, 2024
60d061e
Change component name to remove spaces from the file name; tested all…
Jul 9, 2024
a78ded5
Typo in temp file removal list. CTest runs should be good to go at t…
Jul 9, 2024
c94e27d
Merge branch 'testsuite' into devel
michael-petersen Jul 9, 2024
824a13e
updates to ctest suite
michael-petersen Jul 9, 2024
68ed00e
numpy dependence tweaks
michael-petersen Jul 9, 2024
7ffd4b8
Fixes to remove numpy
The9Cat Jul 10, 2024
b33418a
Merge branch 'testsuite' of github.com:EXP-code/EXP into testsuite [n…
The9Cat Jul 10, 2024
8c100f0
Toggle off HIGH_UNIT_TESTS manually
Jul 10, 2024
8d1c43c
Merge branch 'devel' into testsuite
Jul 10, 2024
0de5e0d
Fix comment spelling typo [no ci]
Jul 10, 2024
af67456
adjustments to build action
michael-petersen Jul 10, 2024
65dd03a
Remove numpy dependence from Cube OUTLOG check [no ci]
Jul 10, 2024
6dc4bd4
Merge branch 'testsuite' of github.com:EXP-code/EXP into testsuite
Jul 10, 2024
2a42b53
Disable long tests for actions
michael-petersen Jul 10, 2024
4572df8
Rename runner
michael-petersen Jul 10, 2024
7758e86
run tests in serial [no ci]
michael-petersen Jul 10, 2024
7a0e463
Merge pull request #80 from EXP-code/testsuite
michael-petersen Jul 10, 2024
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
62 changes: 14 additions & 48 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Test Builds"
name: "Build and Test"

on:
push:
Expand All @@ -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 }}
Expand All @@ -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
Expand All @@ -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
146 changes: 0 additions & 146 deletions .github/workflows/buildfull.yml

This file was deleted.

5 changes: 3 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)
Expand Down
Loading