Skip to content

Commit a8caf20

Browse files
committed
use container for ci
1 parent ef55369 commit a8caf20

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

.github/workflows/ci.yml

+1-7
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@ jobs:
4444
repository: JCSDA-internal/ufo
4545
token: ${{ secrets.GH_PAT }}
4646

47-
- name: checkout atlas-orca
48-
uses: actions/checkout@v3
49-
with:
50-
path: ci/atlas-orca
51-
repository: ECMWF/atlas-orca
52-
5347
- name: checkout atlas-data
5448
uses: actions/checkout@v3
5549
with:
@@ -64,4 +58,4 @@ jobs:
6458
--entrypoint=/usr/local/src/orca-jedi/ci/build-and-test.sh \
6559
--workdir=/usr/local/src/orca-jedi/ci \
6660
--volume $PWD:/usr/local/src/orca-jedi \
67-
'jcsda/docker-gnu-openmpi-dev:latest'
61+
'ghcr.io/twsearle/orca-jedi/ci-almalinux9:develop'

ci/build-and-test.sh

+14-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,20 @@ trap finally EXIT
2020

2121
cd "${WORKD}"
2222

23-
source /opt/spack-environment/activate.sh
23+
if [[ -f /opt/spack-environment/activate.sh ]]; then
24+
source /opt/spack-environment/activate.sh
25+
fi
26+
27+
# -- Enable OpenMPI over subscription -----------------------------------------
28+
if command -v ompi_info &>/dev/null; then
29+
echo "Check support for MPI_THREAD_MULTIPLE"
30+
ompi_info | grep -i 'thread support'
31+
ompi_vn=$(ompi_info | awk '/Ident string:/ {print $3}')
32+
case $ompi_vn in
33+
4.*) export OMPI_MCA_rmaps_base_oversubscribe=1 ;;
34+
5.*) export PRTE_MCA_rmaps_default_mapping_policy=:oversubscribe ;;
35+
esac
36+
fi
2437

2538
echo "
2639
-------------------------------
@@ -41,11 +54,6 @@ ln -s '..' "${HERE}/orca-jedi"
4154
ecbuild -S "${HERE}"
4255
make -j "${NPROC}"
4356

44-
if [[ ! -f share/plugins/atlas-orca.yml ]]; then
45-
echo "ERROR atlas-orca.yml not found!" | tee >(cat >&2)
46-
exit 1
47-
fi
48-
4957
env OMPI_ALLOW_RUN_AS_ROOT=1 OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1 \
5058
ATLAS_TRACE=1 ATLAS_DEBUG=1 \
5159
LD_LIBRARY_PATH="${HERE}/lib:${LD_LIBRARY_PATH}" \

0 commit comments

Comments
 (0)