Skip to content
Merged
Changes from all commits
Commits
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
16 changes: 9 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:

jobs:
OFI:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -260,7 +260,7 @@ jobs:
${SOS_PM_POST}

# PMIx:
# runs-on: ubuntu-20.04
# runs-on: ubuntu-24.04
# strategy:
# fail-fast: false
# matrix:
Expand Down Expand Up @@ -477,13 +477,13 @@ jobs:
# ${{ matrix.sos_pm_post }}
#
UCX:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
include:
- config_name: ucx-1.9.0
ucx_version: v1.9.0
- config_name: ucx-1.18.0
ucx_version: v1.18.0
xpmem_version: master
sos_config: [--enable-pmi-simple --disable-fortran,
--with-cma --enable-error-checking --enable-profiling
Expand Down Expand Up @@ -563,7 +563,7 @@ jobs:
cat modules/tests-sos/test/unit/hello.log

Portals4:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -635,6 +635,7 @@ jobs:
run: |
cd repos/portals4
./autogen.sh
sed -i 's/^struct ptl_abort_state abort_state;/static struct ptl_abort_state abort_state;/' src/ib/ptl_gbl.h
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we upstream this to Portals4? It's minor, so we can move forward with this fix if that process is slow or otherwise undesirable. But IIUC, we should suggest adding static here upstream in case they fiddle with variable names or something?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@davidozog this is just a work around. I reported the issue to the Portals 4 team: sandialabs/portals4#99

I did not get a response yet. Ultimately the problem is that a global variable is being declared in a header file. Which causes the variable to be defined multiple times which causes a linking conflict. The solution would be to declare it in one of the C files, but I am not that familiar with the code base, so I figured it would be better for them to make that choice.

mkdir build; cd build
../configure --prefix=${PORTALS4_INSTALL_DIR} --enable-zero-mrs --enable-reliable-udp --disable-pmi-from-portals
make -j
Expand All @@ -650,13 +651,14 @@ jobs:
make -j
make install
- name: Test SOS (${{ matrix.name }})
continue-on-error: true
run: |
cd build
make check TESTS= -j
${SOS_PM} -np 1 modules/tests-sos/test/unit/hello

XPMEM_Only:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
Expand Down