Skip to content

Commit 4fc80a6

Browse files
authored
Merge branch 'aibasel:main' into main
2 parents 190df6f + 07e86d1 commit 4fc80a6

File tree

206 files changed

+6742
-4548
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+6742
-4548
lines changed

.github/pull_request_template.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
> **This is a Placeholder**
2+
Replace the content of this field with a meaningful description of the changes made within this pull request. It will be suggested as the commit message when merging the pull request.
3+
4+
For the pull request title, summarize the changes in imperative mood and prepend "[issueX]" where X is the issue number in our issue tracker (issues.fast-downward.org). The title will be suggested as the commit subject.
5+
6+
The commit message (i.e., this field) should highlight how the changes affect planner behavior:
7+
- Do they add functionality?
8+
- Does the command line syntax change?
9+
- Is planner performance affected according to the experiment?
10+
11+
Find our guidelines for commit messages in the Fast Downward Wiki (https://www.fast-downward.org/latest/for-developers/git/#git_conventions).

.github/workflows/autodoc.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

.github/workflows/ubuntu.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ jobs:
2121
matrix:
2222
version:
2323
- {ubuntu: 'ubuntu-22.04', python: '3.10', cc: gcc-12, cxx: g++-12, run_tox_tests: true}
24-
- {ubuntu: 'ubuntu-22.04', python: '3.10', cc: clang-15, cxx: clang++-15, run_tox_tests: false}
24+
# NOTE: Temporarily removing support for the second compiler of the
25+
# older Ubuntu LTS because clang-15 does not support certain C++20
26+
# features we would like to use (e.g., `ranges` and `views`
27+
# libraries).
28+
# - {ubuntu: 'ubuntu-22.04', python: '3.10', cc: clang-15, cxx: clang++-15, run_tox_tests: false}
2529
- {ubuntu: 'ubuntu-24.04', python: '3.10', cc: gcc-14, cxx: g++-14, run_tox_tests: true}
2630
- {ubuntu: 'ubuntu-24.04', python: '3.10', cc: clang-18, cxx: clang++-18, run_tox_tests: false}
2731
env:
@@ -98,7 +102,7 @@ jobs:
98102
99103
- name: Upload archive
100104
if: ${{ matrix.version.run_tox_tests }}
101-
uses: actions/upload-artifact@v3
105+
uses: actions/upload-artifact@v4.4.0
102106
with:
103107
name: compiled-planner-${{ matrix.version.ubuntu }}
104108
path: archive.tar.gz
@@ -118,12 +122,13 @@ jobs:
118122
CPLEX_URL: ${{ secrets.CPLEX2211_LINUX_URL }}
119123
steps:
120124
- name: Download archive
121-
uses: actions/download-artifact@v3
125+
uses: actions/download-artifact@v4.1.8
122126
with:
123127
name: compiled-planner-${{ matrix.version.ubuntu }}
124128

125-
- name: Delete artifact
129+
- name: Delete artifact (ignore if not found)
126130
uses: geekyeggo/delete-artifact@v2
131+
continue-on-error: true
127132
with:
128133
name: compiled-planner-${{ matrix.version.ubuntu }}
129134

@@ -137,7 +142,6 @@ jobs:
137142
pip3 install tox
138143
sudo apt-get -y install zlib1g-dev libgmp3-dev gcc flex bison
139144
140-
# NOTE: VAL does not compile with clang-12.
141145
- name: Install VAL
142146
run: |
143147
git clone https://github.com/KCL-Planning/VAL.git
@@ -160,7 +164,7 @@ jobs:
160164
- name: Run driver, translator and search tests
161165
run: |
162166
cd misc/
163-
tox -e driver,translator,search,parameters,autodoc
167+
tox -e driver,translator,search,parameters,generate-docs
164168
165169
- name: Run CPLEX tests
166170
if: ${{ env.CPLEX_URL != 0 }}
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
---
2+
name: Update website
3+
4+
on:
5+
push:
6+
branches:
7+
- main
8+
9+
jobs:
10+
generate-documentation:
11+
name: Generate documentation
12+
if: github.repository == 'aibasel/downward'
13+
timeout-minutes: 60
14+
runs-on: ubuntu-24.04
15+
steps:
16+
- name: Clone repository
17+
uses: actions/checkout@v3
18+
with:
19+
path: downward
20+
21+
- name: Checkout website repository
22+
uses: actions/checkout@v4
23+
with:
24+
repository: aibasel/downward-markdown
25+
token: ${{ secrets.DOWNWARD_WEBSITE_PAT }}
26+
path: downward-website
27+
ref: head-docs
28+
29+
- name: Install Python
30+
uses: actions/setup-python@v4
31+
with:
32+
python-version: '3.10'
33+
34+
- name: Run autodoc
35+
run: |
36+
# generate documentation for search component
37+
cd downward
38+
python3 build.py
39+
cd misc/autodoc
40+
python3 -m pip install -r requirements.txt
41+
python3 generate-docs.py
42+
cd ../../..
43+
44+
- name: Move website material to website repo
45+
run: |
46+
cd downward-website
47+
git rm --ignore-unmatch -r docs/* # wipe content and fill it from scratch
48+
mkdir -p docs/
49+
cp -r ../downward/docs/* docs/
50+
git add docs
51+
git config user.name "github-actions[bot]"
52+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
53+
if ! git diff-index --quiet HEAD --; then
54+
git commit -m "update documentation"
55+
git push
56+
fi

BUILD.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,19 @@ Note that on Windows, setting up the environment variable might require using `/
3838
**Important:** The GNU Multiple Precision library (GMP) is critical for the performance of SoPlex but the build does not complain if it is not present.
3939
Make sure that the build uses the library (check the output of CMake for `Found GMP`).
4040

41-
As of SoPlex 6.0.4, the release does not support C++-20, so we build from the tip of the [GitHub main branch](https://github.com/scipopt/soplex) (adapt the path if you install a different version or want to use a different location):
41+
We require at least SoPlex 7.1.0, which can be built from source as follows (adapt the paths if you install a different version or want to use a different location):
4242
```bash
4343
sudo apt install libgmp3-dev
44-
git clone https://github.com/scipopt/soplex.git
45-
export soplex_DIR=/opt/soplex-6.0.4x
46-
export CXXFLAGS="$CXXFLAGS -Wno-use-after-free" # Ignore compiler warnings about use-after-free
47-
cmake -S soplex -B build
44+
wget https://github.com/scipopt/soplex/archive/refs/tags/release-710.tar.gz -O - | tar -xz
45+
cmake -S soplex-release-710 -B build
4846
cmake --build build
47+
export soplex_DIR=/opt/soplex-7.1.0
4948
cmake --install build --prefix $soplex_DIR
50-
rm -rf soplex build
49+
rm -rf soplex-release-710 build
5150
```
5251

5352
After installation, permanently set the environment variable `soplex_DIR` to the value you used during the installation.
5453

55-
**Note:** Once [support for C++-20](https://github.com/scipopt/soplex/pull/15) has been included in a SoPlex release, we can update this and can recommend the [SoPlex homepage](https://soplex.zib.de/index.php#download) for downloads instead.
56-
5754

5855
### Optional: Plan Validator
5956

0 commit comments

Comments
 (0)