diff --git a/Dockerfile b/Dockerfile
index af650f97aefa66967f3021cedb8b7b875e4011db..0247d1d19ce6365f12defbc3a851fa761ce96084 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -92,17 +92,17 @@ RUN localedef -i en_US -f UTF-8 en_US.UTF-8
 # specify sphinx version as 1.5.6 and remove -U option for [pip install -U
 # sphinx-rtd-theme] since -U option will cause sphinx being updated to newest
 # version(1.7.1 for now), which causes building documentation failed.
-RUN pip3 --no-cache-dir install -U wheel py-cpuinfo==4.0.0 && \
+RUN pip3 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
     pip3 --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
     pip3 --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark && \
-    pip3.6 --no-cache-dir install -U wheel py-cpuinfo==4.0.0 && \
+    pip3.6 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
     pip3.6 --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
     pip3.6 --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark && \
-    pip3.7 --no-cache-dir install -U wheel py-cpuinfo==4.0.0 && \
+    pip3.7 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
     pip3.7 --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
     pip3.7 --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark && \
     easy_install -U pip && \
-    pip --no-cache-dir install -U pip setuptools wheel py-cpuinfo==4.0.0 && \
+    pip --no-cache-dir install -U pip setuptools wheel py-cpuinfo==5.0.0 && \
     pip --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
     pip --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark
 
diff --git a/paddle/scripts/Dockerfile.tmp b/paddle/scripts/Dockerfile.tmp
index 21b54a2970f65f54e9226df8dd202b5d9fa740b1..4783b62a44fc71434fa3909f4416f3ab5e693e54 100644
--- a/paddle/scripts/Dockerfile.tmp
+++ b/paddle/scripts/Dockerfile.tmp
@@ -92,17 +92,17 @@ RUN localedef -i en_US -f UTF-8 en_US.UTF-8
 # specify sphinx version as 1.5.6 and remove -U option for [pip install -U
 # sphinx-rtd-theme] since -U option will cause sphinx being updated to newest
 # version(1.7.1 for now), which causes building documentation failed.
-RUN pip3 --no-cache-dir install -U wheel py-cpuinfo==4.0.0 && \
+RUN pip3 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
     pip3 --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
     pip3 --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark && \
-    pip3.6 --no-cache-dir install -U wheel py-cpuinfo==4.0.0 && \
+    pip3.6 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
     pip3.6 --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
     pip3.6 --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark && \
-    pip3.7 --no-cache-dir install -U wheel py-cpuinfo==4.0.0 && \
+    pip3.7 --no-cache-dir install -U wheel py-cpuinfo==5.0.0 && \
     pip3.7 --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
     pip3.7 --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark && \
     easy_install -U pip && \
-    pip --no-cache-dir install -U pip setuptools wheel py-cpuinfo==4.0.0 && \
+    pip --no-cache-dir install -U pip setuptools wheel py-cpuinfo==5.0.0 && \
     pip --no-cache-dir install -U docopt PyYAML sphinx==1.5.6 && \
     pip --no-cache-dir install sphinx-rtd-theme==0.1.9 recommonmark
 
diff --git a/python/paddle/fluid/core.py b/python/paddle/fluid/core.py
index 23827f5677af3b1a866944e8495b1befa0d78f70..dcf275c44425b016a2bb2aec798b4d7a78a015b7 100644
--- a/python/paddle/fluid/core.py
+++ b/python/paddle/fluid/core.py
@@ -58,7 +58,26 @@ except Exception as e:
     raise e
 
 load_noavx = False
-if 'avx' in get_cpu_info()['flags']:
+
+has_avx = False
+if sys.platform == 'darwin':
+    try:
+        has_avx = os.popen('sysctl machdep.cpu.features | grep -i avx').read(
+        ) != ''
+    except Exception as e:
+        sys.stderr.write(
+            'Can not get the AVX flag from machdep.cpu.features.\n')
+    if not has_avx:
+        try:
+            has_avx = os.popen(
+                'sysctl machdep.cpu.leaf7_features | grep -i avx').read() != ''
+        except Exception as e:
+            sys.stderr.write(
+                'Can not get the AVX flag from machdep.cpu.leaf7_features.\n')
+else:
+    has_avx = 'avx' in get_cpu_info()['flags']
+
+if has_avx:
     try:
         from .core_avx import *
         from .core_avx import __doc__, __file__, __name__, __package__
diff --git a/python/requirements.txt b/python/requirements.txt
index e864aa4183d3ce7d10a28ff3498235c9d363217f..f971587bd7c885b04538b08fc075c51e013c80db 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -16,5 +16,4 @@ funcsigs
 pyyaml
 decorator
 prettytable
-py-cpuinfo==5.0.0 ; platform_system=="Windows"
-py-cpuinfo==4.0.0 ; platform_system!="Windows"
+py-cpuinfo==5.0.0