From 8c296dea759fb64a68f21090a968f8f253b84972 Mon Sep 17 00:00:00 2001
From: Pei Yang <peiyang@baidu.com>
Date: Fri, 8 May 2020 14:31:00 +0800
Subject: [PATCH] fix compile error(cpuid.h not found) on nvidia jetson
 platforms. test=develop (#24329)

---
 cmake/cuda.cmake                  | 1 +
 paddle/fluid/platform/cpu_info.cc | 2 ++
 paddle/fluid/platform/cpu_info.h  | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/cmake/cuda.cmake b/cmake/cuda.cmake
index 6bd9dcbdb98..7d1995360b4 100644
--- a/cmake/cuda.cmake
+++ b/cmake/cuda.cmake
@@ -4,6 +4,7 @@ endif()
 
 
 if (WITH_NV_JETSON)
+  add_definitions(-DWITH_NV_JETSON)
   set(paddle_known_gpu_archs "53 62 72")
   set(paddle_known_gpu_archs7 "53")
   set(paddle_known_gpu_archs8 "53 62")
diff --git a/paddle/fluid/platform/cpu_info.cc b/paddle/fluid/platform/cpu_info.cc
index 6b9bacd7b71..6545e62927f 100644
--- a/paddle/fluid/platform/cpu_info.cc
+++ b/paddle/fluid/platform/cpu_info.cc
@@ -139,6 +139,7 @@ bool MayIUse(const cpu_isa_t cpu_isa) {
   if (cpu_isa == isa_any) {
     return true;
   } else {
+#ifndef WITH_NV_JETSON
     int reg[4];
     cpuid(reg, 0);
     int nIds = reg[0];
@@ -164,6 +165,7 @@ bool MayIUse(const cpu_isa_t cpu_isa) {
         return (reg[1] & avx512f_mask) != 0;
       }
     }
+#endif
     return false;
   }
 }
diff --git a/paddle/fluid/platform/cpu_info.h b/paddle/fluid/platform/cpu_info.h
index 3255f50d4a2..66f05d51c0b 100644
--- a/paddle/fluid/platform/cpu_info.h
+++ b/paddle/fluid/platform/cpu_info.h
@@ -40,12 +40,14 @@ limitations under the License. */
 #ifdef _WIN32
 #define cpuid(reg, x) __cpuidex(reg, x, 0)
 #else
+#ifndef WITH_NV_JETSON
 #include <cpuid.h>
 inline void cpuid(int reg[4], int x) {
   __cpuid_count(x, 0, reg[0], reg[1], reg[2], reg[3]);
 }
 #endif
 #endif
+#endif
 
 namespace paddle {
 namespace platform {
-- 
GitLab