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

Fix CI for Ubuntu 24.04 #360

Merged
merged 6 commits into from
Dec 18, 2024
Merged

Fix CI for Ubuntu 24.04 #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9b772ef
automake is missing on the ubuntu 24.04 image
FG-TUM Dec 18, 2024
0a3ab85
link to AutoPas dependencies
FG-TUM Dec 18, 2024
00f74ff
bump AutoPas version
FG-TUM Dec 18, 2024
fc7f8ed
use system uuid instead of bundled
FG-TUM Dec 18, 2024
8bffc76
always enable advanced tuning
FG-TUM Dec 18, 2024
d92c623
fix wrong package
FG-TUM Dec 18, 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
3 changes: 3 additions & 0 deletions .github/workflows/ls1_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ jobs:
sudo apt-get update
# MPICH 4.0.3 seems to have a bug that triggers a FP exception in our collective communication when doing 0+0.
sudo apt-get install -y \
uuid-dev \
libcppunit-dev \
libopenmpi-dev \
libomp-dev \
Expand Down Expand Up @@ -86,6 +87,7 @@ jobs:
cmake -DVECTOR_INSTRUCTIONS=${{ matrix.vector }} \
-DCMAKE_BUILD_TYPE=${{ matrix.target }} \
-DENABLE_AUTOPAS=${{ matrix.autopas }} \
-DAUTOPAS_ENABLE_RULES_BASED_AND_FUZZY_TUNING=ON \
-DENABLE_ALLLBL=$alllbl_enabled \
-DOPENMP=${{ matrix.openmp }} \
-DENABLE_MPI=$mpi_enabled \
Expand Down Expand Up @@ -148,6 +150,7 @@ jobs:
cmake -DVECTOR_INSTRUCTIONS=${{ matrix.vector }} \
-DCMAKE_BUILD_TYPE=${{ matrix.target }} \
-DENABLE_AUTOPAS=${{ matrix.autopas }} \
-DAUTOPAS_ENABLE_RULES_BASED_AND_FUZZY_TUNING=ON \
-DENABLE_ALLLBL=$alllbl_enabled \
-DOPENMP=${{ matrix.openmp }} \
-DENABLE_MPI=$mpi_enabled \
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Prerequisites
* [FFTW3](http://www.fftw.org)
* [VTK](http://www.vtk.org)
* [QuickSched](https://arxiv.org/abs/1601.05384)

* If [AutoPas](https://autopas.github.io/doxygen_documentation/git-master/) is enabled, make sure to have [its requirements](https://github.com/AutoPas/AutoPas/blob/master/docs/userdoc/Building.md) installed.

Installation
------------
Expand Down
4 changes: 2 additions & 2 deletions cmake/modules/autopas.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ if (ENABLE_AUTOPAS)
set(AUTOPAS_USE_VECTORIZATION ${USE_VECTORIZATION} CACHE BOOL "Set via USE_VECTORIZATION" FORCE)
set(AUTOPAS_VECTOR_INSTRUCTIONS ${VECTOR_INSTRUCTIONS} CACHE STRING "Set via VECTOR_INSTRUCTIONS_OPTIONS" FORCE)

# Merge of #830 (fixRegionIterators); includes #787 (combined tuning)
set(AUTOPAS_TAG faef573 CACHE STRING "AutoPas Git tag or commit id to use")
# Last version without 3 Body support. Newer versions have API changes
set(AUTOPAS_TAG v2.0.0 CACHE STRING "AutoPas Git tag or commit id to use")

FetchContent_Declare(
autopasfetch
Expand Down
Loading