commit d343c22897e014f9c55e78006276711b79702d67
author Marat Dukhan <maratek@google.com> Mon Oct 07 09:22:14 2019 -0700
committer XNNPACK Team <xnnpack-github-robot@google.com> Mon Oct 07 09:22:38 2019 -0700
tree 4df96a30a3d5fb080461f1c18d5b09d23b6355e6
parent 1aaabb6ec5e66b595f0a37c90ffdb602eb631e39

Avoid cpuinfo dependency in Emscripten builds
- OSS cpuinfo doesn't support Emscripten.
- Removing cpuinfo dependency reduces build size.
- cpuinfo on Emscripten is of little value anyway, because no information about
  CPU is provided by the environment.

PiperOrigin-RevId: 273307573

src/init.c

diff --git a/src/init.c b/src/init.c
index fec29dc..1296eb6 100644
--- a/src/init.c
+++ b/src/init.c
@@ -12,7 +12,9 @@
 
 #include <pthread.h>
 
-#include <cpuinfo.h>
+#ifndef __EMSCRIPTEN__
+  #include <cpuinfo.h>
+#endif
 
 #include <xnnpack.h>
 #include <xnnpack/argmaxpool.h>
@@ -953,9 +955,11 @@
 }
 
 enum xnn_status xnn_initialize(void) {
-  if (!cpuinfo_initialize()) {
-    return xnn_status_out_of_memory;
-  }
+  #ifndef __EMSCRIPTEN__
+    if (!cpuinfo_initialize()) {
+      return xnn_status_out_of_memory;
+    }
+  #endif
   pthread_once(&init_guard, &init);
   if (xnn_params.initialized) {
     return xnn_status_success;
@@ -965,6 +969,8 @@
 }
 
 enum xnn_status xnn_deinitialize(void) {
-  cpuinfo_deinitialize();
+  #ifndef __EMSCRIPTEN__
+    cpuinfo_deinitialize();
+  #endif
   return xnn_status_success;
 }

src/wasm-stubs.c

diff --git a/src/wasm-stubs.c b/src/wasm-stubs.c
index b9273c5..ae9ee1a 100644
--- a/src/wasm-stubs.c
+++ b/src/wasm-stubs.c
@@ -5,9 +5,10 @@
 
 #include <stdint.h>
 
-#include <cpuinfo.h>
 #include <fp16.h>
 
+#include <xnnpack/common.h>
+
 uint32_t xnn_stub_wasm_f32_sub(uint32_t a, uint32_t b) {
   return fp32_to_bits(fp32_from_bits(a) - fp32_from_bits(b));
 }