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

Repairing warnings and error regarding Version.h by using pkgconfig to link to preCICE #149

Merged
merged 27 commits into from
Aug 25, 2022
Merged

Repairing warnings and error regarding Version.h by using pkgconfig to link to preCICE #149

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
589d91f
Assign value to _value in read_scalar_data function to avoid compiler…
IshaanDesai Aug 22, 2022
917ebeb
Run cmake in setup test action and copy over Version.h file to dummy …
IshaanDesai Aug 22, 2022
f2521b9
Install Boost in build-and-test action so that cmake can find it
IshaanDesai Aug 22, 2022
4eed96a
Install Eigen via apt so that cmake finds it
IshaanDesai Aug 22, 2022
3770ff5
Correcting path to dummy preCICE directory in build and test action
IshaanDesai Aug 22, 2022
6ecd4d9
Use pkgconfig to detect library flag needed for Version.h in build an…
IshaanDesai Aug 23, 2022
996cf88
Install pkg-config via apt-get in the build and test action
IshaanDesai Aug 23, 2022
6cbdc86
Add pkgconfig include flags to setup.py
IshaanDesai Aug 23, 2022
c57a2d8
Spelling mistake
IshaanDesai Aug 23, 2022
2572e50
Check if pkg-config finds precice
IshaanDesai Aug 23, 2022
f3dc95c
Check if pkg-config finds libprecice
IshaanDesai Aug 23, 2022
79858e4
Specifically use container precice/precice:2.4.0
IshaanDesai Aug 23, 2022
1ed435f
Add pkgconfig command to testing part of setup.py
IshaanDesai Aug 23, 2022
c157a14
Check version of libprecice detected by pkg-config in setup_test work…
IshaanDesai Aug 23, 2022
210278e
Check if PKG_CONFIG_PATH is set in the build_test workflow
IshaanDesai Aug 24, 2022
6a525d7
Set PKG_CONFIG_PATH in the correct step
IshaanDesai Aug 24, 2022
20e2cb4
Check if pk-config finds libprecice
IshaanDesai Aug 24, 2022
ee08333
Add cflags to compile arguments in setup.py
IshaanDesai Aug 24, 2022
de70079
Add PKG_CONFIG_SYSTEM_INCLUDE_PATH env to build and test workflow
IshaanDesai Aug 24, 2022
cda20dd
Split cflags from pkgconfig before appending them to compile_args in …
IshaanDesai Aug 24, 2022
0c670ed
Strip double quotes from cflags
IshaanDesai Aug 24, 2022
34ea0e9
Change how pkgconfig cflags are added to compile_args in setup.py
IshaanDesai Aug 24, 2022
656ff66
Build pkg-config in all workflows of build and test
IshaanDesai Aug 24, 2022
a8c236f
Add pkg-config installation to run-solverdummy workflow
IshaanDesai Aug 24, 2022
9539ec3
Remove :2.4.0 version tag from setup_install workflow to see what hap…
IshaanDesai Aug 25, 2022
eef9119
Removing 2.4.0 version tag from all workflows
IshaanDesai Aug 25, 2022
f0659a5
Merge branch 'develop' into IshaanDesai-patch-1
IshaanDesai Aug 25, 2022
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
6 changes: 5 additions & 1 deletion .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
- name: Install OpenMPI
BenjaminRodenberg marked this conversation as resolved.
Show resolved Hide resolved
run: |
sudo apt-get -yy update
sudo apt-get install -y libopenmpi-dev
sudo apt-get install -y libopenmpi-dev cmake libboost-all-dev libeigen3-dev
sudo rm -rf /var/lib/apt/lists/*
- uses: BSFishy/pip-action@v1
with:
Expand All @@ -94,6 +94,10 @@ jobs:
git clone https://github.com/precice/precice.git precice-core
mkdir -p precice
cp precice-core/src/precice/SolverInterface.hpp precice/SolverInterface.hpp
cd precice-core
mkdir build && cd build
cmake .. -DPRECICE_MPICommunication=OFF -DPRECICE_PETScMapping=OFF -DPRECICE_PythonActions=OFF -DBUILD_TESTING=OFF
BenjaminRodenberg marked this conversation as resolved.
Show resolved Hide resolved
cp src/precice/Version.h ../../precice/
IshaanDesai marked this conversation as resolved.
Show resolved Hide resolved
- name: Install dependencies
run: |
python3 -c 'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))' | pip3 install -r /dev/stdin
Expand Down
2 changes: 1 addition & 1 deletion cyprecice/cyprecice.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,7 +1207,7 @@ cdef class Interface:
>>> vertex_id = 5
>>> value = interface.read_scalar_data(data_id, vertex_id)
"""
cdef double _value
cdef double _value = 0
self.thisptr.readScalarData (data_id, vertex_id, _value)
return _value

Expand Down