Skip to content

Support CMake find_package#69

Merged
malfet merged 2 commits intopytorch:masterfrom
luncliff:master
Mar 26, 2022
Merged

Support CMake find_package#69
malfet merged 2 commits intopytorch:masterfrom
luncliff:master

Conversation

@luncliff
Copy link
Copy Markdown
Contributor

@luncliff luncliff commented Oct 10, 2021

Changes

CMake build generates cpuinfo-config.cmake and some other CMake scripts.
These files will be installed under {prefix}/share/cpuinfo.

Folder PATH listing for volume Local Disk
Volume serial number is 58BA-9039
C:\USERS\LUNCL\SOURCE\CPUINFO\INSTALL
├───bin
│       cache-info.exe
│       cpu-info.exe
│       cpuid-dump.exe
│       isa-info.exe
│       
├───include
│       clog.h
│       cpuinfo.h
│       
├───lib
│   │   clog.lib
│   │   cpuinfo.lib
│   │   
│   └───pkgconfig
│           libcpuinfo.pc
│
└───share
    └───cpuinfo
            cpuinfo-config.cmake
            cpuinfo-targets-debug.cmake
            cpuinfo-targets.cmake

After install, CMake users can search the libraries (cpuinfo and clog) using find_package config mode.

find_package(cpuinfo CONFIG REQUIRED)
target_link_libraries(main
PRIVATE
    cpuinfo::cpuinfo cpuinfo::clog
)

@luncliff
Support CMake 'find_package'
7324ba5 
* export 2 target 'cpuinfo', 'clog'
* create cpuinfo-config.cmake template
@luncliff
fix script include
b23b0d3
@LukasAnda LukasAnda mentioned this pull request Jan 24, 2022
Closed
@petrhosek
Copy link
Copy Markdown
Contributor

petrhosek commented Mar 2, 2022

We're planning on taking a dependency on cpuinfo from LLVM (transitively via TFLite) and this change is one of the blockers so we would really like to see it merged. Is there any way we can help? I have looked over the change and it looks good to me.

@malfet malfet merged commit ba0f4a2 into pytorch:master Mar 26, 2022
This was referenced Apr 2, 2022
Merged
Merged
megengine-bot pushed a commit to MegEngine/cpuinfo that referenced this pull request Sep 5, 2022
@megvii-mge
Support CMake find_package (pytorch#69)
e5a663e 
* Support CMake 'find_package'

* export 2 target 'cpuinfo', 'clog'
* create cpuinfo-config.cmake template

* fix script include

GitOrigin-RevId: ba0f4a2
@salilsdesai salilsdesai mentioned this pull request Sep 12, 2022
Closed
salilsdesai added a commit to salilsdesai/pytorch that referenced this pull request Sep 16, 2022
@salilsdesai @facebook-github-bot
[QNNPACK] Export cpuinfo-targets in clog CMakeLists (pytorch#84876)
3740c35 
Summary:
Pull Request resolved: pytorch#84876

Fixes the following error when building qnnpack:
```
CMake Error: install(EXPORT "cpuinfo-targets" ...) includes target "cpuinfo" which requires target "clog" that is not in any export set.
```

This diff mirrors the changes to the CMakeLists of
- pytorch/cpuinfo#69
- pytorch/cpuinfo#89

Test Plan:
# Build Qnnpack
```
export ANDROID_NDK=/opt/android_ndk/r20
export ANDROID_NDK_HOME=${ANDROID_NDK}
export ANDROID_SDK=/opt/android_sdk
export ANDROID_HOME=${ANDROID_SDK}

cd ~/fbsource/fbcode/caffe2/aten/src/ATen/native/quantized/cpu/qnnpack

./scripts/build-android-arm64.sh
```
Succeeds

Differential Revision: D39438768

fbshipit-source-id: 9bd0119ffea984d274e85b8b756b630743a89f0f
pytorchmergebot pushed a commit to pytorch/pytorch that referenced this pull request Sep 16, 2022
@salilsdesai @pytorchmergebot
[QNNPACK] Export cpuinfo-targets in clog CMakeLists (#84876)
d559299 
Summary:
Fixes the following error when building qnnpack:
```
CMake Error: install(EXPORT "cpuinfo-targets" ...) includes target "cpuinfo" which requires target "clog" that is not in any export set.
```

This diff mirrors the changes to the CMakeLists of
pytorch/cpuinfo#69

Test Plan:
# Build Qnnpack
```
export ANDROID_NDK=/opt/android_ndk/r20
export ANDROID_NDK_HOME=${ANDROID_NDK}
export ANDROID_SDK=/opt/android_sdk
export ANDROID_HOME=${ANDROID_SDK}

cd ~/fbsource/fbcode/caffe2/aten/src/ATen/native/quantized/cpu/qnnpack

./scripts/build-android-arm64.sh
```
Succeeds

Differential Revision: D39438768

Pull Request resolved: #84876
Approved by: https://github.com/digantdesai
mehtanirav pushed a commit to pytorch/pytorch that referenced this pull request Oct 4, 2022
@salilsdesai @mehtanirav
[QNNPACK] Export cpuinfo-targets in clog CMakeLists (#84876)
b14c2ec 
Summary:
Fixes the following error when building qnnpack:
```
CMake Error: install(EXPORT "cpuinfo-targets" ...) includes target "cpuinfo" which requires target "clog" that is not in any export set.
```

This diff mirrors the changes to the CMakeLists of
pytorch/cpuinfo#69

Test Plan:
# Build Qnnpack
```
export ANDROID_NDK=/opt/android_ndk/r20
export ANDROID_NDK_HOME=${ANDROID_NDK}
export ANDROID_SDK=/opt/android_sdk
export ANDROID_HOME=${ANDROID_SDK}

cd ~/fbsource/fbcode/caffe2/aten/src/ATen/native/quantized/cpu/qnnpack

./scripts/build-android-arm64.sh
```
Succeeds

Differential Revision: D39438768

Pull Request resolved: #84876
Approved by: https://github.com/digantdesai
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@malfet malfet malfet approved these changes

Assignees

No one assigned

Labels

cla signed

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@luncliff @petrhosek @malfet @facebook-github-bot