Skip to content

Commit

Permalink
Update to devtoolset-10 properly (#741)
Browse files Browse the repository at this point in the history
Use devtoolset-10 in all workflows
Update documentation
  • Loading branch information
JasonMarechal25 authored Jan 5, 2024
1 parent 9b407b7 commit e87e993
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/centos-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ jobs:
else
export XPRESS_VALUE="OFF"
fi
source /opt/rh/devtoolset-9/enable
source /opt/rh/devtoolset-10/enable
export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib:$LD_LIBRARY_PATH
export PATH=/usr/lib64/openmpi/bin:$PATH
cmake3 -B _build -S . \
Expand All @@ -197,7 +197,7 @@ jobs:
- name: Build
shell: bash
run: |
source /opt/rh/devtoolset-9/enable
source /opt/rh/devtoolset-10/enable
export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib:$LD_LIBRARY_PATH
export PATH=/usr/lib64/openmpi/bin:$PATH
cmake3 --build _build --config Release -j2 --target install
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/centos7-system-deps-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:

- name: Configure
run: |
source /opt/rh/devtoolset-9/enable
source /opt/rh/devtoolset-10/enable
export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib:$LD_LIBRARY_PATH
export PATH=/usr/lib64/openmpi/bin:$PATH
cmake -B _build -S . \
Expand All @@ -108,7 +108,7 @@ jobs:
- name: Build
run: |
source /opt/rh/devtoolset-9/enable
source /opt/rh/devtoolset-10/enable
export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib:$LD_LIBRARY_PATH
export PATH=/usr/lib64/openmpi/bin:$PATH
cmake --build _build --config Release -j2 --target install
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ The compilation of Antares-Xpansion requires C++17 support in order to use [exe
sudo yum config-manager --set-enabled PowerTools
```

You can then use a more recent version of GCC by enabling `devtoolset-9`:
You can then use a more recent version of GCC by enabling `devtoolset-10`:
```
sudo yum install devtoolset-9
sudo yum install devtoolset-10
```

Before compiling Antares-Xpansion, we must launch a new shell with `scl` tool :
```
scl enable devtoolset-9 bash
scl enable devtoolset-10 bash
```
=== "Ubuntu"

Expand Down
5 changes: 3 additions & 2 deletions docs/developer-guide/install_from_sources/3-Build.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Build

## Environnement settings
On Centos, enable `devtoolset-9` and `rh-git227` and load `mpi` module:

On Centos, enable `devtoolset-10` and `rh-git227` and load `mpi` module:
```
scl enable devtoolset-9 bash
scl enable devtoolset-10 bash
source /opt/rh/rh-git227/enable
module load mpi
```
Expand Down

0 comments on commit e87e993

Please sign in to comment.