Skip to content

Hardcode WinML umbrella lib to windowsapp.lib, fix building of NodeJS bindings#4133

Merged
tiagoshibata merged 1 commit intomasterfrom
user/ticastro/hardcode-winml-umbrella
Jun 8, 2020
Merged

Hardcode WinML umbrella lib to windowsapp.lib, fix building of NodeJS bindings#4133
tiagoshibata merged 1 commit intomasterfrom
user/ticastro/hardcode-winml-umbrella

Conversation

@tiagoshibata
Copy link
Contributor

Description: Use windowsapp.lib umbrella lib. This is a no-op when building WinML w/ CMAKE_SYSTEM_NAME == WindowsStore, but is required to work around some linking bugs in internal builds. We'll get it removed after some more review and discussion.

@tiagoshibata tiagoshibata requested a review from a team as a code owner June 4, 2020 19:48
ryanlai2
ryanlai2 previously approved these changes Jun 4, 2020
target_link_libraries(winml_dll PRIVATE winml_lib_telemetry)

target_link_libraries(winml_dll PRIVATE RuntimeObject.lib)
target_link_libraries(winml_dll PRIVATE windowsapp.lib)
Copy link
Member

Choose a reason for hiding this comment

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

Can you add a comment here explaining why this needs to be linked here?

@tiagoshibata tiagoshibata changed the title Hardcode WinML umbrella lib to windowsapp.lib Hardcode WinML umbrella lib to windowsapp.lib, fix building of NodeJS bindings Jun 5, 2020
snnn
snnn previously approved these changes Jun 5, 2020
(REBUILD ? 'reconfigure' : 'configure'),
'--arch=x64',
'--CDnapi_build_version=3',
'--CDnapi_build_version=6',
Copy link
Contributor

Choose a reason for hiding this comment

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

Thank you.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're welcome :)

Copy link
Contributor

Choose a reason for hiding this comment

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

The build issue is figured out in #4148 . by upgrading node_addon_api to v3.0.0 we are able to compile in all Node.js version using NAPI v3.

@snnn
Copy link
Contributor

snnn commented Jun 5, 2020

Please feel safe to ignore the test failure in "Windows-CPU-CI", which is a test job scheduled by me.

@tiagoshibata
Copy link
Contributor Author

Should I re-run the other failed pipelines?

@snnn
Copy link
Contributor

snnn commented Jun 5, 2020

Should I re-run the other failed pipelines?

I'll do it on behalf of you.

@snnn snnn self-requested a review June 5, 2020 21:48
Copy link
Contributor

@fs-eire fs-eire left a comment

Choose a reason for hiding this comment

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

Please revert back to using NAPI v3

@tiagoshibata tiagoshibata force-pushed the user/ticastro/hardcode-winml-umbrella branch from 417e3bc to c8ad161 Compare June 8, 2020 07:06
@tiagoshibata tiagoshibata requested a review from fs-eire June 8, 2020 07:06
@tiagoshibata tiagoshibata merged commit 6bbd18e into master Jun 8, 2020
@tiagoshibata tiagoshibata deleted the user/ticastro/hardcode-winml-umbrella branch June 8, 2020 18:04
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.

5 participants