Skip to content

pytorch | Fix linking of qnnpack params on windows. #40920

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.

Sign up for GitHub

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

Jump to bottom
Closed
nlutsenko wants to merge 2 commits into from
Closed

pytorch | Fix linking of qnnpack params on windows. #40920

nlutsenko wants to merge 2 commits into from

Conversation

@nlutsenko
Copy link
Contributor

@nlutsenko nlutsenko commented Jul 2, 2020

Summary: Pytorch depends on this from both C and C++ source files, so unify linking so it's fully fixed.

Test Plan: Build it on Windows

Differential Revision: D22348247

nlutsenko added 2 commits July 2, 2020 08:19
@nlutsenko @facebook-github-bot
pytorch | Namespace init_win symbol in qnnpack.
3a3998b 
Summary: Namespacing the symbol, since it clashes with "the real thing" otherwise.

Test Plan: Sandcastle + build it on windows

Differential Revision: D22348240

fbshipit-source-id: 6e79b7f4925f1a9d2756b215eb257258b956b23d
@nlutsenko @facebook-github-bot
pytorch | Fix linking of qnnpack params on windows.
134bae1 
Summary: Pytorch depends on this from both C and C++ source files, so unify linking so it's fully fixed.

Test Plan: Build it on Windows

Differential Revision: D22348247

fbshipit-source-id: 4afd1ed1c08ead6be237c01abc4ca83a0b8377ab
@facebook-github-bot
Copy link
Contributor

facebook-github-bot commented Jul 2, 2020

This pull request was exported from Phabricator. Differential Revision: D22348247

@peterjc123
Copy link
Collaborator

peterjc123 commented Jul 2, 2020 •
edited
Loading 

--   USE_QNNPACK           : OFF

Is this file covered in CI?

@peterjc123
Copy link
Collaborator

peterjc123 commented Jul 2, 2020

I searched for qnnpack in the log and can only see the following result.

[1655/3021] C:\Users\circleci\project\build\win_tmp\bin\sccache-cl.exe   /TP -DCPUINFO_SUPPORTED_PLATFORM=1 -DFMT_HEADER_ONLY=1 -DIDEEP_USE_MKL -DMINIZ_DISABLE_ZIP_READER_CRC32_CHECKS -DONNXIFI_ENABLE_EXT=1 -DONNX_ML=1 -DONNX_NAMESPACE=onnx_torch -DTH_BLAS_MKL -DUSE_EXTERNAL_MZCRC -DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_DEPRECATE=1 -D_OPENMP_NOFORCE_MANIFEST -Dtorch_cpu_EXPORTS -Iaten\src -I..\aten\src -I. -I..\ -I..\cmake\..\third_party\benchmark\include -Icaffe2\contrib\aten -I..\third_party\onnx -Ithird_party\onnx -I..\third_party\foxi -Ithird_party\foxi -I..\caffe2\..\torch\csrc\api -I..\caffe2\..\torch\csrc\api\include -I..\caffe2\aten\src\TH -Icaffe2\aten\src\TH -I..\caffe2\..\torch\..\aten\src -Icaffe2\aten\src -Icaffe2\..\aten\src -Icaffe2\..\aten\src\ATen -I..\caffe2\..\torch\csrc -I..\caffe2\..\torch\..\third_party\miniz-2.0.8 -I..\aten\src\TH -I..\aten\..\third_party\catch\single_include -I..\aten\src\ATen\.. -Icaffe2\aten\src\ATen -I..\third_party\miniz-2.0.8 -I..\caffe2\core\nomnigraph\include -I..\c10\.. -Ithird_party\ideep\mkl-dnn\include -I..\third_party\ideep\mkl-dnn\src\..\include -I..\third_party\cpuinfo\include -I..\third_party\fbgemm\include -I..\third_party\fbgemm -I..\third_party\fbgemm\third_party\asmjit\src -I..\third_party\FP16\include -I..\third_party\fmt\include -I..\cmake\..\third_party\googletest\googlemock\include -I..\cmake\..\third_party\googletest\googletest\include -I..\third_party\protobuf\src -Iwin_tmp\mkl\include -I..\third_party -I..\cmake\..\third_party\eigen -IC:\Jenkins\Miniconda3\include -IC:\Jenkins\Miniconda3\lib\site-packages\numpy\core\include -I..\cmake\..\third_party\pybind11\include -I..\third_party\ideep\mkl-dnn\include -I..\third_party\ideep\include -I..\caffe2 /DWIN32 /D_WINDOWS /GR /EHsc /w /bigobj -openmp:experimental -DNDEBUG -DUSE_FBGEMM -DUSE_VULKAN_WRAPPER -DHAVE_AVX_CPU_DEFINITION -DHAVE_AVX2_CPU_DEFINITION /MD /O2 /Ob2 /DNDEBUG /w /bigobj -DNDEBUG   -DUSE_GCC_GET_CPUID -DUSE_AVX -DUSE_AVX2 -DTH_HAVE_THREAD /EHsc /DNOMINMAX /wd4267 /wd4251 /wd4522 /wd4838 /wd4305 /wd4244 /wd4190 /wd4101 /wd4996 /wd4275 /bigobj -O2 -openmp:experimental -DCAFFE2_BUILD_MAIN_LIB -DONNX_BUILD_MAIN_LIB -std:c++14 /showIncludes /Focaffe2\CMakeFiles\torch_cpu.dir\__\aten\src\ATen\native\quantized\cpu\init_qnnpack.cpp.obj /Fdcaffe2\CMakeFiles\torch_cpu.dir\ /FS -c ..\aten\src\ATen\native\quantized\cpu\init_qnnpack.cpp
Microsoft (R) C/C++ Optimizing Compiler Version 19.26.28806 for x64
Copyright (C) Microsoft Corporation.  All rights reserved.

So the answer to the previous question is no.

@nlutsenko nlutsenko deleted the export-D22348247 branch July 2, 2020 22:06
@facebook-github-bot
Copy link
Contributor

facebook-github-bot commented Jul 2, 2020

This pull request has been merged in 81aebf3.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

fb-exported Merged

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@nlutsenko @facebook-github-bot @peterjc123 @mruberry