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.

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

[v1.18.x] Cherry-picked fixes to allow CI build check to pass #9570

Merged
merged 8 commits into from
Nov 16, 2023

Conversation

j-xiong
Copy link
Contributor

@j-xiong j-xiong commented Nov 15, 2023

(1) Fix MacOS build issues
(2) Fix build issue with '--with-lttng' configure option
(3) Fix fi_rdm_tagged_peek test that would fail the ucx provider

darrylabbate and others added 5 commits November 14, 2023 18:13
When configured with LTTng-UST support without specifying an
installation prefix (--with-lttng), the resulting CPPFLAGS and LDFLAGS
contain the (likely) non-existant `yes/` path.

This is a little hacky since it technically breaks builds for people who
use `yes/` for some reason, but seems to be the convention used elsewhere.

Signed-off-by: Darryl Abbate <[email protected]>
(cherry picked from commit bbcbaf2)

NOTE:

This commit is cherry-picked from main to make CI build check work properly.
Without this one, the '--with-lttng' configure option used by CI would lead
to failure with the following error message:

    checking if libibverbs is linkable by libtool... no
    ......
    configure: verbs provider: disabled
    configure: WARNING: verbs provider was requested, but cannot be compiled
    configure: error: Cannot continue

Commented-by: Jianxin Xiong <[email protected]>
These are necessary to compile on MacOS.

Signed-off-by: Ken Raffenetti <[email protected]>
(cherry picked from commit c0191d2)
This causes a compile error on MacOS with clang 14.0.0 because memset is
substituted as a builtin function by the preprocessor.

common/hmem.c:172:25: error: no member named '__builtin___memset_chk' in 'struct ft_hmem_ops'
        return hmem_ops[iface].memset(device, buf, value, size);
               ~~~~~~~~~~~~~~~ ^

Signed-off-by: Ken Raffenetti <[email protected]>
(cherry picked from commit dd2ce59)
sched_setaffinity is only available on Linux.

Signed-off-by: Ken Raffenetti <[email protected]>
(cherry picked from commit 3425fa7)
Signed-off-by: Ken Raffenetti <[email protected]>
(cherry picked from commit 9ad3a20)
@shefty
Copy link
Member

shefty commented Nov 16, 2023

no pudding cups :(

@j-xiong
Copy link
Contributor Author

j-xiong commented Nov 16, 2023

@shefty I heard you. The last update should do the trick.

shijin-aws and others added 3 commits November 15, 2023 19:25
…r_comp

Introduce a separate function ft_read_cq to do the cq read part
in ft_get_cq_comp,

Also introduce tag as an input parameter for ft_read_cq and its
child functions. It is aimed to avoid setting the global ft_tag
which could be messy.

Signed-off-by: Shi Jin <[email protected]>
(cherry picked from commit 2419731)
The current rdm_tagged_peek test uses sread which is not
available for some provider like efa. This patch
makes this test more general to support all available
comp_method, including sread and the default non-wait read.
It also makes the do_send retry fi_tsend when it hits EAGAIN.

Signed-off-by: Shi Jin <[email protected]>
(cherry picked from commit 61fa45d)
It was possible for the client to complete the finalize send before
the server gets the last 0xabc completion, causing a tag mismatch
when processing the incorrect receive.

This removes the extra synchronization sends and adds an OOB sync to
make sure all of the test sends have finished before quitting the test.

Signed-off-by: Alexia Ingerson <[email protected]>
(cherry picked from commit 09ca779)
@j-xiong j-xiong merged commit 895c1b2 into ofiwg:v1.18.x Nov 16, 2023
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants