Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Backport 3rdparty/openmp fixes #17193

Merged
merged 4 commits into from
Dec 30, 2019
Merged

Backport 3rdparty/openmp fixes #17193

merged 4 commits into from
Dec 30, 2019

Conversation

leezu
Copy link
Contributor

@leezu leezu commented Dec 30, 2019

Description

Backport #17098 #17039 #17012 #17155

The commits contain fixes for the cmake build with openmp enabled.
The cmake build is not used for binary releases on pypi, but the fixes may be helpful for people or organizations building with cmake from source.

leezu and others added 3 commits December 30, 2019 10:10
* Disable OpenMP offloading support for 3rdparty/openmp

OpenMP offloading was introduced some time during the past two years and is
enabled by default. With upgrading 3rdparty/openmp in
apache#17012
it was made part of the MXNet CMake build.

But we don't use OpenMP offloading and the Cuda target in the llvm OpenMP
Offloading build is broken in our setting.

* Update CMake on CI
@ptrendx
Copy link
Member

ptrendx commented Dec 30, 2019

@leezu is there a fix for those numpy errors? We need to backport that as well.

@leezu
Copy link
Contributor Author

leezu commented Dec 30, 2019

@ptrendx no real fix yet as far as I'm aware. For now numpy 1.18 is marked as unsupported. I'll include the commit that marks 1.18 as unsupported.

* fix reshape interoperability test

* fix for scipy import
@leezu leezu merged commit 80a850d into apache:v1.6.x Dec 30, 2019
@leezu leezu deleted the backportomp branch December 30, 2019 22:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants