commit a5977df8a3a4228222784abdd2657004e1c76750
author Marat Dukhan <maratek@google.com> Wed Oct 30 22:02:15 2019 -0700
committer XNNPACK Team <xnnpack-github-robot@google.com> Wed Oct 30 22:02:47 2019 -0700
tree 214a5ca657fecf97a3850f1bd17d0118dc3cdd8a
parent 64a5bfea3f4cdba9bec3e9e49cf273860835a6b8

Fix CMake build

- Add missing cpuinfo dependency in SoftArgMax micro-kernels
- Add missing VSCALE micro-kernels to the build

PiperOrigin-RevId: 277651521

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34b1ded..10da046 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -482,7 +482,8 @@
   src/x8-zip/xm-sse2.c)
 
 SET(XNNPACK_AVX_MICROKERNEL_SRCS
-  src/f32-rmax/avx.c)
+  src/f32-rmax/avx.c
+  src/f32-vscale/avx-unroll32.c)
 
 SET(XNNPACK_AVX2_MICROKERNEL_SRCS
   src/f32-raddexpminusmax/avx2-p5-unroll64.c
@@ -500,6 +501,7 @@
   src/f32-raddextexp/avx512f-p5-scalef-unroll128.c
   src/f32-raddstoreexpminusmax/avx512f-p5-scalef-unroll128.c
   src/f32-rmax/avx512f.c
+  src/f32-vscale/avx512f-unroll64.c
   src/f32-vscaleexpminusmax/avx512f-p5-scalef-unroll128.c
   src/f32-vscaleextexp/avx512f-p5-scalef-unroll128.c
   src/math/exp-avx512f-p5-scalef.c
@@ -1056,7 +1058,7 @@
     CXX_STANDARD_REQUIRED YES
     CXX_EXTENSIONS YES)
   TARGET_INCLUDE_DIRECTORIES(f32-raddextexp-test PRIVATE src test)
-  TARGET_LINK_LIBRARIES(f32-raddextexp-test PRIVATE XNNPACK fp16 gtest gtest_main)
+  TARGET_LINK_LIBRARIES(f32-raddextexp-test PRIVATE XNNPACK cpuinfo fp16 gtest gtest_main)
   ADD_TEST(f32-raddextexp-test f32-raddextexp-test)
 
   ADD_EXECUTABLE(f32-raddstoreexpminusmax-test test/f32-raddstoreexpminusmax.cc)
@@ -1128,7 +1130,7 @@
     CXX_STANDARD_REQUIRED YES
     CXX_EXTENSIONS YES)
   TARGET_INCLUDE_DIRECTORIES(f32-vscaleextexp-test PRIVATE src test)
-  TARGET_LINK_LIBRARIES(f32-vscaleextexp-test PRIVATE XNNPACK fp16 gtest gtest_main)
+  TARGET_LINK_LIBRARIES(f32-vscaleextexp-test PRIVATE XNNPACK cpuinfo fp16 gtest gtest_main)
   ADD_TEST(f32-vscaleextexp-test f32-vscaleextexp-test)
 
   ADD_EXECUTABLE(f32-vsub-test test/f32-vsub.cc)