Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/actions/run-clang-tidy-pr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ tidyerr=0
if ((filecount > 0 && filecount <= 25)); then
echo "====Configure CMake===="
mkdir build && cd build || exit
cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DGRIDDYN_BUILD_C_SHARED_LIBRARY=ON -DGRIDDYN_ENABLE_FMI_EXPORT=ON -DGRIDDYN_ENABLE_NETWORKING_LIBRARY=ON -DGRIDDYN_ENABLE_OPTIMIZATION_LIBRARY=ON -DGRIDDYN_ENABLE_TCP=ON -DGRIDDYN_ENABLE_DIME=ON -DGRIDDYN_ENABLE_ZMQ=ON ..
cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DGRIDDYN_BUILD_CXX_SHARED_LIBRARY=ON -DGRIDDYN_ENABLE_FMI_EXPORT=ON -DGRIDDYN_ENABLE_NETWORKING_LIBRARY=ON -DGRIDDYN_ENABLE_OPTIMIZATION_LIBRARY=ON -DGRIDDYN_ENABLE_TCP=ON -DGRIDDYN_ENABLE_DIME=ON -DGRIDDYN_ENABLE_ZMQ=ON ..
TIDY_EXTRA_ARGS=()
KLU_INCLUDE_DIR=$(grep '^KLU_INCLUDE_DIR:' CMakeCache.txt | cut -d= -f2- || true)
append_include_args "$KLU_INCLUDE_DIR"
Expand Down
31 changes: 19 additions & 12 deletions .github/workflows/braid-build.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
name: Braid Build

on:
push:
branches:
- main
pull_request:
branches:
- main
workflow_dispatch:

permissions:
Expand All @@ -27,18 +21,31 @@ jobs:
with:
submodules: recursive

- name: Install Braid dependencies
shell: bash
run: |
apt-get update
apt-get install -y --no-install-recommends liblapacke-dev

- name: Build XBraID
shell: bash
run: ./scripts/xbraid_build.sh
run: |
./scripts/xbraid_build.sh
test -f "${GITHUB_WORKSPACE}/../xbraid/braid/braid.h"
test -f "${GITHUB_WORKSPACE}/../xbraid/braid/libbraid.a"

- name: Configure
shell: bash
run: |
mkdir -p build
cd build
eval cmake .. ${CMAKE_FLAGS}
env:
CMAKE_FLAGS: -DGRIDDYN_ENABLE_MPI=ON -DGRIDDYN_ENABLE_OPENMP=OFF -DGRIDDYN_ENABLE_EXTRA_SOLVERS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_BRAID_SOLVER=ON -DBRAID_INSTALL_DIR=${{ github.workspace }}/../xbraid/braid
cmake -S . -B build \
-DGRIDDYN_ENABLE_MPI=ON \
-DGRIDDYN_ENABLE_OPENMP=OFF \
-DGRIDDYN_ENABLE_EXTRA_SOLVERS=ON \
-DBUILD_SHARED_LIBS=OFF \
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-DBUILD_BRAID_SOLVER=ON \
"-DBRAID_INSTALL_DIR=${GITHUB_WORKSPACE}/../xbraid/braid"
grep -Fq "loadExtraSolvers();" build/src/gridDynLoader/libraryLoader.cpp

- name: Build
shell: bash
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/compiler-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ jobs:
include:
- name: GCC 14
container: helics/buildenv:gcc14-builder
cmake_flags: -DGRIDDYN_BUILD_TESTS=ON -DGRIDDYN_BUILD_C_SHARED_LIBRARY=ON -DGRIDDYN_ENABLE_FMI_EXPORT=ON
cmake_flags: -DGRIDDYN_BUILD_TESTS=ON -DGRIDDYN_BUILD_CXX_SHARED_LIBRARY=ON -DGRIDDYN_ENABLE_FMI_EXPORT=ON
- name: GCC 15
container: helics/buildenv:gcc15-builder
cmake_flags: -DGRIDDYN_BUILD_TESTS=ON -DGRIDDYN_ENABLE_OPTIMIZATION_LIBRARY=ON
- name: Clang 20
container: helics/buildenv:clang20-builder
cmake_flags: -DGRIDDYN_BUILD_TESTS=ON -DGRIDDYN_BUILD_C_SHARED_LIBRARY=ON -DGRIDDYN_ENABLE_FMI_EXPORT=ON -DGRIDDYN_ENABLE_ZMQ=ON -DGRIDDYN_ENABLE_NETWORKING_LIBRARY=ON -DGRIDDYN_ENABLE_TCP=ON
cmake_flags: -DGRIDDYN_BUILD_TESTS=ON -DGRIDDYN_BUILD_CXX_SHARED_LIBRARY=ON -DGRIDDYN_ENABLE_FMI_EXPORT=ON -DGRIDDYN_ENABLE_ZMQ=ON -DGRIDDYN_ENABLE_NETWORKING_LIBRARY=ON -DGRIDDYN_ENABLE_TCP=ON
- name: Clang 22
container: helics/buildenv:clang22-builder
cmake_flags: -DCMAKE_CXX_STANDARD=26 -DGRIDDYN_BUILD_TESTS=ON -DGRIDDYN_BUILD_C_SHARED_LIBRARY=ON -DGRIDDYN_ENABLE_FMI_EXPORT=ON
cmake_flags: -DCMAKE_CXX_STANDARD=26 -DGRIDDYN_BUILD_TESTS=ON -DGRIDDYN_BUILD_CXX_SHARED_LIBRARY=ON -DGRIDDYN_ENABLE_FMI_EXPORT=ON

steps:
- uses: actions/checkout@v6
Expand Down
49 changes: 7 additions & 42 deletions config/cmake/FindLAPACKE.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,8 @@ if(LAPACKE_FOUND)
endif()

# ##################################################################################################
# First search for headers
find_path(
LAPACKE_CBLAS_INCLUDE_DIR
NAMES cblas.h
PATHS ${LAPACKE_SEARCH_PATHS}
PATH_SUFFIXES include include/lapack
)
# First search for headers. GridDyn uses the LAPACKE API directly and does not require a separately
# installed CBLAS header or library.
find_path(
LAPACKE_LAPACKE_INCLUDE_DIR
NAMES lapacke.h
Expand All @@ -88,24 +83,8 @@ find_library(
PATHS ${LAPACKE_SEARCH_PATHS}
PATH_SUFFIXES ${PATH_SUFFIXES_LIST}
)
find_library(
CBLAS_LIB
NAMES cblas
PATHS ${LAPACKE_SEARCH_PATHS}
PATH_SUFFIXES ${PATH_SUFFIXES_LIST}
)
find_library(
LAPACK_LIB
NAMES lapack
PATHS ${LAPACKE_SEARCH_PATHS}
PATH_SUFFIXES ${PATH_SUFFIXES_LIST}
)
find_library(
BLAS_LIB
NAMES blas
PATHS ${LAPACKE_SEARCH_PATHS}
PATH_SUFFIXES ${PATH_SUFFIXES_LIST}
)
find_package(LAPACK QUIET)
find_package(BLAS QUIET)

# TODO: Get version components
# ------------------------------------------------------------------------
Expand Down Expand Up @@ -134,32 +113,18 @@ include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(
LAPACKE
FOUND_VAR LAPACKE_FOUND
REQUIRED_VARS
LAPACKE_CBLAS_INCLUDE_DIR
LAPACKE_LAPACKE_INCLUDE_DIR
LAPACKE_LIB
LAPACK_LIB
CBLAS_LIB
BLAS_LIB
REQUIRED_VARS LAPACKE_LAPACKE_INCLUDE_DIR LAPACKE_LIB LAPACK_FOUND BLAS_FOUND
VERSION_VAR LAPACKE_VERSION_STRING
)

if(LAPACKE_FOUND)
set(LAPACKE_INCLUDE_DIRS ${LAPACKE_CBLAS_INCLUDE_DIR} ${LAPACKE_CBLAS_INCLUDE_DIR})
list(REMOVE_DUPLICATES LAPACKE_INCLUDE_DIRS)
set(LAPACKE_INCLUDE_DIRS ${LAPACKE_LAPACKE_INCLUDE_DIR})
if("${CMAKE_C_COMPILER_ID}" MATCHES ".*Clang.*" OR "${CMAKE_C_COMPILER_ID}" MATCHES ".*GNU.*"
OR "${CMAKE_C_COMPILER_ID}" MATCHES ".*Intel.*"
) # NOT MSVC
set(MATH_LIB m)
endif()
list(
APPEND
LAPACKE_LIBRARIES
${LAPACKE_LIB}
${LAPACK_LIB}
${BLAS_LIB}
${CBLAS_LIB}
)
list(APPEND LAPACKE_LIBRARIES ${LAPACKE_LIB} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
# Check for a common combination, and find required gfortran support libraries

if(1)
Expand Down
Loading