Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#676: evaluate simplifying things with pressio-ops #690

Merged
merged 22 commits into from
Oct 14, 2024
Merged

#676: evaluate simplifying things with pressio-ops #690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2c5959b
#676: begin work pulling in separate pressio-ops repo
cwschilly Sep 26, 2024
a936b86
#676: move includes so pressio-ops comes first; fix version compabili…
cwschilly Sep 27, 2024
142ea14
#676: update pressio-ops target branch to main
cwschilly Sep 27, 2024
1c55f7b
#691: clone and include pressio-ops in CI
cwschilly Oct 1, 2024
c0b3119
#676: remove components that have been moved to pressio-ops
cwschilly Oct 1, 2024
91e2a1a
#676: do not link to pressioops target
cwschilly Oct 1, 2024
a6b50c7
#676: target specific branch in templates repo
cwschilly Oct 1, 2024
f29c7f4
#676: restore header guards
cwschilly Oct 8, 2024
7dec97f
fix macros
Oct 12, 2024
f875b01
remove docker wf
Oct 12, 2024
b10ee1b
update ops branch
Oct 12, 2024
ae1eef0
update
Oct 12, 2024
0fc0096
enable passing external pressio-ops
Oct 12, 2024
0163548
fix
Oct 12, 2024
f5cc3a1
fix
Oct 12, 2024
45f0167
fix
Oct 13, 2024
2a973fe
update
Oct 14, 2024
982d96b
update ci wf
Oct 14, 2024
13032ba
update ci wf
Oct 14, 2024
76e9c79
only keep one C++20 build
Oct 14, 2024
5d7aa34
fix order [no ci]
Oct 14, 2024
fbe943f
remove config cmake
Oct 14, 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
90 changes: 33 additions & 57 deletions .github/workflows/ci-baseline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,9 @@ jobs:
cmake_extra_args:
- ''
include:
- image: ubuntu-gnu-11
build_type: Release
cmake_extra_args: '-D CMAKE_CXX_STANDARD=20 -D PRESSIO_ENABLE_CXX20=ON'
- image: ubuntu-clang-14
build_type: Release
cmake_extra_args: '-D CMAKE_CXX_STANDARD=20 -D PRESSIO_ENABLE_CXX20=ON'
- image: fedora-gnu-13
build_type: Release
cmake_extra_args: '-D CMAKE_CXX_STANDARD=20 -D PRESSIO_ENABLE_CXX20=ON'
- image: fedora-clang-17
build_type: Release
cmake_extra_args: '-D CMAKE_CXX_STANDARD=20 -D PRESSIO_ENABLE_CXX20=ON'

runs-on: ubuntu-latest
container:
Expand All @@ -65,6 +56,7 @@ jobs:
env:
eigen_version: 3.4.0
num_cpus: 2 # $(cat /proc/cpuinfo | grep processor -c)
PRESSIO_INSTALL_DIR: ${{ github.workspace }}/pressio_install

steps:
- uses: actions/checkout@v4
Expand All @@ -74,81 +66,65 @@ jobs:
with:
repository: Pressio/pressio-templates-usage-as-library
path: examples
ref: add-compatibility-with-pressio-ops

- name: Checkout pressio-ops
uses: actions/checkout@v4
with:
repository: Pressio/pressio-ops
path: pressio-ops
ref: develop

- name: Preparing environment
run: |
wget https://gitlab.com/libeigen/eigen/-/archive/${{ env.eigen_version }}/eigen-${{ env.eigen_version }}.tar.gz \
&& mkdir -p /eigen \
&& tar -xf eigen-${{ env.eigen_version }}.tar.gz -C /eigen

- name: Example - include only
working-directory: examples
run: |
$CXX \
--std=c++17 \
-DPRESSIO_ENABLE_TPL_EIGEN \
-I/eigen/eigen-${{ env.eigen_version }} \
-I../include \
-c main.cpp \
&& $CXX --std=c++17 -o pressio-example main.o \
&& ./pressio-example

- name: Example - include only with embedded definitions
working-directory: examples
run: |
$CXX \
--std=c++17 \
-I/eigen/eigen-${{ env.eigen_version }} \
-I../include \
-c main_with_defines.cpp \
&& $CXX --std=c++17 -o pressio-example main.o \
&& ./pressio-example

- name: Configure
run: |
cmake -B builddir \
-D CMAKE_BUILD_TYPE:STRING=${{ matrix.build_type }} \
-D CMAKE_C_COMPILER=$CC \
-D CMAKE_CXX_COMPILER=$CXX \
-D CMAKE_CXX_FLAGS='-Wall -Werror' \
-D CMAKE_INSTALL_PREFIX:PATH=../install \
-D CMAKE_INSTALL_PREFIX:PATH=${PRESSIO_INSTALL_DIR} \
-D CMAKE_VERBOSE_MAKEFILE:BOOL=ON \
${{ matrix.cmake_extra_args }} \
-D PRESSIO_ENABLE_DEBUG_PRINT=ON \
-D PRESSIO_ENABLE_TESTS:BOOL=ON \
-D PRESSIO_ENABLE_TPL_EIGEN:BOOL=ON \
-D EIGEN_INCLUDE_DIR=/eigen/eigen-${{ env.eigen_version }}
-D EIGEN_INCLUDE_DIR=/eigen/eigen-${{ env.eigen_version }} \
-D PRESSIO_OPS_INCLUDE_DIR=${GITHUB_WORKSPACE}/pressio-ops/include

- name: Build
run: |
cmake --build builddir --target install

- name: Example - CMake installed
working-directory: examples/cmake_find_package
run: |
cmake -B builddir \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_PREFIX_PATH=../../install \
&& cmake --build builddir \
&& ./builddir/pressio-example

- name: Example - CMake add_subdirectory
working-directory: examples/cmake_add_subdirectory
- name: Example - include only
working-directory: examples
run: |
cmake -B builddir \
-DCMAKE_CXX_STANDARD=17 \
-D EIGEN_INCLUDE_DIR=/eigen/eigen-${{ env.eigen_version }} \
&& cmake --build builddir \
&& ./builddir/pressio-example
$CXX \
--std=c++17 \
-DPRESSIO_ENABLE_TPL_EIGEN \
-I/eigen/eigen-${{ env.eigen_version }} \
-I${GITHUB_WORKSPACE}/pressio-ops/include \
-I${PRESSIO_INSTALL_DIR}/include \
-c main.cpp \
&& $CXX --std=c++17 -o pressio-example main.o \
&& ./pressio-example

- name: Example - CMake include_directories
working-directory: examples/cmake_include_directories
- name: Example - include only with embedded definitions
working-directory: examples
run: |
cmake -B builddir \
-DCMAKE_CXX_STANDARD=17 \
-D EIGEN_INCLUDE_DIR=/eigen/eigen-${{ env.eigen_version }} \
&& cmake --build builddir \
&& ./builddir/pressio-example
$CXX \
--std=c++17 \
-I/eigen/eigen-${{ env.eigen_version }} \
-I${GITHUB_WORKSPACE}/pressio-ops/include \
-I${PRESSIO_INSTALL_DIR}/include \
-c main_with_defines.cpp \
&& $CXX --std=c++17 -o pressio-example main.o \
&& ./pressio-example

- name: Run small tests
working-directory: builddir/tests/functional_small
Expand Down
53 changes: 0 additions & 53 deletions .github/workflows/ci-docker.yml
View file
Open in desktop

This file was deleted.

75 changes: 31 additions & 44 deletions .github/workflows/ci-trilinos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ jobs:
eigen_version: 3.4.0
num_cpus: 4
trilinos_dir: /home/pressio_builds/trilinos/install
PRESSIO_INSTALL_DIR: ${{ github.workspace }}/pressio_install

steps:
- uses: actions/checkout@v4
Expand All @@ -58,6 +59,14 @@ jobs:
with:
repository: Pressio/pressio-templates-usage-as-library
path: examples
ref: add-compatibility-with-pressio-ops

- name: Checkout pressio-ops
uses: actions/checkout@v4
with:
repository: Pressio/pressio-ops
path: pressio-ops
ref: develop

- name: Preparing environment
run: |
Expand All @@ -66,29 +75,6 @@ jobs:
&& mkdir -p /eigen \
&& tar -xf eigen-${{ env.eigen_version }}.tar.gz -C /eigen

- name: Example - include only
working-directory: examples
run: |
$CXX \
--std=c++17 \
-DPRESSIO_ENABLE_TPL_EIGEN \
-DPRESSIO_ENABLE_TPL_TRILINOS \
-I/eigen/eigen-${{ env.eigen_version }} \
-I$trilinos_dir/include \
-I../include \
-c main.cpp

- name: Example - include only with embedded definitions
working-directory: examples
run: |
$CXX \
--std=c++17 \
-DPRESSIO_ENABLE_TPL_TRILINOS \
-I/eigen/eigen-${{ env.eigen_version }} \
-I$trilinos_dir/include \
-I../include \
-c main_with_defines.cpp

- name: Configure
run: |
cmake -B builddir \
Expand All @@ -108,35 +94,36 @@ jobs:
-D PRESSIO_ENABLE_DEBUG_PRINT=ON \
-D EIGEN_INCLUDE_DIR=/eigen/eigen-${{ env.eigen_version }} \
-D Trilinos_DIR=${{ env.trilinos_dir }}/lib/cmake/Trilinos \
-D CMAKE_INSTALL_PREFIX:PATH=../install \
-D CMAKE_INSTALL_PREFIX:PATH=${PRESSIO_INSTALL_DIR} \
-D CMAKE_CXX_FLAGS='-Wall -Werror'

- name: Build
run: cmake --build builddir -j $num_cpus --target install

- name: Example - CMake installed
working-directory: examples/cmake_find_package
run: |
cmake -B builddir \
-DCMAKE_PREFIX_PATH=../../install \
&& cmake --build builddir \
&& ./builddir/pressio-example

- name: Example - CMake include_directories
working-directory: examples/cmake_include_directories
- name: Example - include only
working-directory: examples
run: |
cmake -B builddir \
-D EIGEN_INCLUDE_DIR=/eigen/eigen-${{ env.eigen_version }} \
&& cmake --build builddir \
&& ./builddir/pressio-example
$CXX \
--std=c++17 \
-DPRESSIO_ENABLE_TPL_EIGEN \
-DPRESSIO_ENABLE_TPL_TRILINOS \
-I/eigen/eigen-${{ env.eigen_version }} \
-I$trilinos_dir/include \
-I${GITHUB_WORKSPACE}/pressio-ops/include \
-I${PRESSIO_INSTALL_DIR}/include \
-c main.cpp

- name: Example - CMake add_subdirectory
working-directory: examples/cmake_add_subdirectory
- name: Example - include only with embedded definitions
working-directory: examples
run: |
cmake -B builddir \
-D EIGEN_INCLUDE_DIR=/eigen/eigen-${{ env.eigen_version }} \
&& cmake --build builddir \
&& ./builddir/pressio-example
$CXX \
--std=c++17 \
-DPRESSIO_ENABLE_TPL_TRILINOS \
-I/eigen/eigen-${{ env.eigen_version }} \
-I$trilinos_dir/include \
-I${GITHUB_WORKSPACE}/pressio-ops/include \
-I${PRESSIO_INSTALL_DIR}/include \
-c main_with_defines.cpp

- name: Test
working-directory: builddir
Expand Down
Loading