-
Notifications
You must be signed in to change notification settings - Fork 75
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
[ Meson ] BCQTensor dependency is added for Android build #2823
[ Meson ] BCQTensor dependency is added for Android build #2823
Conversation
nntrainer/meson.build
Outdated
@@ -11,6 +11,17 @@ nntrainer_inc_abs = [ | |||
meson.source_root() / 'api' / 'ccapi' / 'include' | |||
] | |||
|
|||
# The code below feeds BiQGEMM absolute path to android.mk | |||
# The BiQGEMM absolute path is included only when biqgemm is enabled. | |||
if get_option('enable-biqgemm') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just to be sure, this won't affect tools/package_android.sh
, isn't it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. This won't affect to the current tools/package_android.sh
. This aims for the case where meson build -Dplatform=android -Denable-biqgemm=true
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
One minor suggestion: How about adding it to the tensor/meson.build for consistency?
nntrainer/nntrainer/tensor/meson.build
Lines 79 to 83 in cd17a66
if get_option('enable-biqgemm') | |
tensor_headers += 'bcq_tensor.h' | |
tensor_sources += 'bcq_tensor.cpp' | |
nntrainer_inc += biqgemm_inc | |
endif |
949d373
to
78067df
Compare
- This commit add BiQGEMM path to nntrainer_inc_abs to support Android build with enable-biqgemm option. **Self evaluation:** Build test: [X]Passed [ ]Failed [ ]Skipped Run test: [X]Passed [ ]Failed [ ]Skipped Signed-off-by: Eunju Yang <[email protected]>
78067df
to
0854dde
Compare
Following the suggestion from @djeong20, I moved the code to nntrainer/nntrainer/tensor/meson.build Line 83 in 0854dde
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
DO NOT HARDCODE EXTERNAL PATHS IN MESON SCRIPT! If pkgconfig or cmake is not ready with BiQGEMM, |
And..
is completely non-sense. Other developers (e.g., nntrainer users in other departments) won't understand what's going on here. You should try
|
@myungjoo, Thank you for the detailed comment and guidance :) I will make additional PR to make it feasible following your suggestion. Sincerely. |
meson.build
Self evaluation:
Build test: [X]Passed [ ]Failed [ ]Skipped
Run test: [X]Passed [ ]Failed [ ]Skipped