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

[SAI-PTF]Include sai expermential for generate the rpc headers #1660

Merged

Conversation

richardyu-ms
Copy link
Collaborator

@richardyu-ms richardyu-ms commented Nov 20, 2022

When generate the sai_adapter it depends on the files in sai expermental https://github.com/opencomputeproject/SAI/blob/master/meta/Makefile#L72

CFLAGS += -I../inc -I../experimental $(WARNINGS)

In gensairpc
https://github.com/opencomputeproject/SAI/blob/master/meta/gensairpc.pl#L132

our $EXPERIMENTAL_DIR = catdir( $sai_dir,      'experimental' );

But when generate the py headers for RPC service, it doesn't include that. In order to make them matched, then add that dependences.

Test done:
Local compile and checked the headers

When generate the sai_adapter it depends on the files in  sai expermental
https://github.com/opencomputeproject/SAI/blob/master/meta/Makefile#L72
```
CFLAGS += -I../inc -I../experimental $(WARNINGS)
```
In gensairpc
https://github.com/opencomputeproject/SAI/blob/master/meta/gensairpc.pl#L132
```
our $EXPERIMENTAL_DIR = catdir( $sai_dir,      'experimental' );
```
But when generate the py headers for RPC service, it doesn't include that.
In order to make them matched, then add that dependences.

Test done:
Local compile and checked the headers

Signed-off-by: richardyu <richardyu@contoso.com>
@richardyu-ms richardyu-ms merged commit 6dbce98 into opencomputeproject:master Nov 20, 2022
richardyu-ms added a commit to richardyu-ms/SAI that referenced this pull request Nov 20, 2022
…omputeproject#1660)

When generate the sai_adapter it depends on the files in  sai expermental
https://github.com/opencomputeproject/SAI/blob/master/meta/Makefile#L72
```
CFLAGS += -I../inc -I../experimental $(WARNINGS)
```
In gensairpc
https://github.com/opencomputeproject/SAI/blob/master/meta/gensairpc.pl#L132
```
our $EXPERIMENTAL_DIR = catdir( $sai_dir,      'experimental' );
```
But when generate the py headers for RPC service, it doesn't include that.
In order to make them matched, then add that dependences.

Test done:
Local compile and checked the headers

Signed-off-by: richardyu <richardyu@contoso.com>

Signed-off-by: richardyu <richardyu@contoso.com>
Co-authored-by: richardyu <richardyu@contoso.com>
richardyu-ms added a commit to richardyu-ms/SAI that referenced this pull request Nov 20, 2022
…omputeproject#1660)

When generate the sai_adapter it depends on the files in  sai expermental
https://github.com/opencomputeproject/SAI/blob/master/meta/Makefile#L72
```
CFLAGS += -I../inc -I../experimental $(WARNINGS)
```
In gensairpc
https://github.com/opencomputeproject/SAI/blob/master/meta/gensairpc.pl#L132
```
our $EXPERIMENTAL_DIR = catdir( $sai_dir,      'experimental' );
```
But when generate the py headers for RPC service, it doesn't include that.
In order to make them matched, then add that dependences.

Test done:
Local compile and checked the headers

Signed-off-by: richardyu-ms <richard.yu@microsoft.com>
richardyu-ms added a commit that referenced this pull request Nov 20, 2022
#1661)

When generate the sai_adapter it depends on the files in  sai expermental
https://github.com/opencomputeproject/SAI/blob/master/meta/Makefile#L72
```
CFLAGS += -I../inc -I../experimental $(WARNINGS)
```
In gensairpc
https://github.com/opencomputeproject/SAI/blob/master/meta/gensairpc.pl#L132
```
our $EXPERIMENTAL_DIR = catdir( $sai_dir,      'experimental' );
```
But when generate the py headers for RPC service, it doesn't include that.
In order to make them matched, then add that dependences.

Test done:
Local compile and checked the headers

Signed-off-by: richardyu-ms <richard.yu@microsoft.com>

Signed-off-by: richardyu-ms <richard.yu@microsoft.com>
richardyu-ms added a commit to richardyu-ms/sonic-sairedis that referenced this pull request Nov 23, 2022
cherry-pick from sonic-net#1155

Advance SAI head pointer

[SAI-PTF]add conditional import for unit test opencomputeproject/SAI#1656
[SAI-PTF] add invocation logger opencomputeproject/SAI#1651
[SAI-PTF]Include sai expermential for generate the rpc headers opencomputeproject/SAI#1660
Signed-off-by: richardyu-ms <richard.yu@microsoft.com>
richardyu-ms added a commit to sonic-net/sonic-sairedis that referenced this pull request Nov 23, 2022
cherry-pick from #1155

Advance SAI head pointer

[SAI-PTF]add conditional import for unit test opencomputeproject/SAI#1656
[SAI-PTF] add invocation logger opencomputeproject/SAI#1651
[SAI-PTF]Include sai expermential for generate the rpc headers opencomputeproject/SAI#1660
Signed-off-by: richardyu-ms <richard.yu@microsoft.com>
JaiOCP pushed a commit to JaiOCP/SAI that referenced this pull request Dec 14, 2022
…omputeproject#1660)

When generate the sai_adapter it depends on the files in  sai expermental
https://github.com/opencomputeproject/SAI/blob/master/meta/Makefile#L72
```
CFLAGS += -I../inc -I../experimental $(WARNINGS)
```
In gensairpc
https://github.com/opencomputeproject/SAI/blob/master/meta/gensairpc.pl#L132
```
our $EXPERIMENTAL_DIR = catdir( $sai_dir,      'experimental' );
```
But when generate the py headers for RPC service, it doesn't include that.
In order to make them matched, then add that dependences.

Test done:
Local compile and checked the headers

Signed-off-by: richardyu <richardyu@contoso.com>

Signed-off-by: richardyu <richardyu@contoso.com>
Co-authored-by: richardyu <richardyu@contoso.com>
@richardyu-ms richardyu-ms deleted the fix-sai-experimental branch January 1, 2023 04:15
@kcudnik
Copy link
Collaborator

kcudnik commented Aug 29, 2023

@richardyu-ms what errors this causing ? since i test this locally and with experimental include or not i still get the same gen-py/sai/sai_headers.py generated

can you share exact steps how you reproduce that the experimental are missing?

@richardyu-ms
Copy link
Collaborator Author

@richardyu-ms what errors this causing ? since i test this locally and with experimental include or not i still get the same gen-py/sai/sai_headers.py generated

can you share exact steps how you reproduce that the experimental are missing?

@kcudnik I cannot recall the actual vendor OS version which caused this issue, but i remember the RC was the local SAI headers(from SAI repo) did not match the vendor SAI headers within their SDK

@kcudnik
Copy link
Collaborator

kcudnik commented Oct 16, 2023

yes, differences between vendor and actual SAI headers can lead to weird errors, and it could be even hard to track, since they can pop up while runtime at some point

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.

2 participants