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

Jump to bottom

Update to fc39 #1419

Merged
merged 5 commits into from
Jan 23, 2024
Merged

Update to fc39 #1419

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0fa21ec
pyverbs: Fix compilation error in Fedora 39
rleon Nov 15, 2023
c0377a2
pyverbs: Fix runtime warnings in Fedora 39
EdwardSro Dec 28, 2023
4dbbf9b
pyverbs: Adapt includes in Fedora 39
EdwardSro Jan 18, 2024
1462a87
build: Fix cmake warning
EdwardSro Jan 16, 2024
20ab780
cbuild: Update to Fedora 39
rleon Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
pyverbs: Adapt includes in Fedora 39 
Replace Cython includes with cimports to work around a Cython 3 bug
(#5860 on the Cython GitHub) that causes the following compilation
errors:

build/pyverbs/device.c:14743:18: error: redefinition of ‘__Pyx_Enum_enum__space_ibv_event_type_to_py’
14743 | static PyObject *__Pyx_Enum_enum__space_ibv_event_type_to_py(enum ibv_event_type __pyx_v_c_val) {
      |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
build/pyverbs/device.c:10914:18: note: previous definition of ‘__Pyx_Enum_enum__space_ibv_event_type_to_py’ with
type ‘PyObject *(enum ibv_event_type)’ {aka ‘struct _object *(enum ibv_event_type)’}
10914 | static PyObject *__Pyx_Enum_enum__space_ibv_event_type_to_py(enum ibv_event_type __pyx_v_c_val) {
      |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Edward Srouji <[email protected]>
  • Loading branch information
@EdwardSro
EdwardSro committed Jan 21, 2024
commit 4dbbf9bf4adc28d425a0331ccdcc0d2c87eed4d6
3 changes: 2 additions & 1 deletion pyverbs/libibverbs.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@

#cython: language_level=3

include 'libibverbs_enums.pxd'
from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t
from posix.time cimport timespec
from pyverbs.libibverbs_enums cimport *


cdef extern from 'infiniband/verbs.h':

Expand Down
5 changes: 3 additions & 2 deletions pyverbs/librdmacm.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@

#cython: language_level=3

include 'libibverbs.pxd'
include 'librdmacm_enums.pxd'
from libc.stdint cimport uint8_t, uint32_t
from pyverbs.librdmacm_enums cimport *
from pyverbs.libibverbs cimport *


cdef extern from '<rdma/rdma_cma.h>':

Expand Down
3 changes: 1 addition & 2 deletions pyverbs/providers/mlx5/libmlx5.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@

#cython: language_level=3

include 'mlx5_enums.pxd'

from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
from posix.types cimport off_t
from libcpp cimport bool
cimport libc.stdio as s

from pyverbs.providers.mlx5.mlx5_enums cimport *
cimport pyverbs.libibverbs as v


Expand Down