polish avx/no_avx install

PaddlePaddle · Jun 28, 2021 · c463913 · c463913 · paddle-bot-old · Jun 28, 2021
1 parent 0f31ed7
commit c463913
Showing 1 changed file with 10 additions and 17 deletions.
diff --git a/python/paddle/fluid/core.py b/python/paddle/fluid/core.py
@@ -290,17 +290,13 @@ def to_list(s):
         else:
             from .. import compat as cpt
             sys.stderr.write(
-                "WARNING: AVX is supported on local machine, but you have installed "
-                "paddlepaddle without avx core. Hence, no_avx core which has worse "
-                "preformance will be imported.\nYou could reinstall paddlepaddle by "
-                "'python -m pip install --force-reinstall paddlepaddle-gpu[==version]' or rebuild "
-                "paddlepaddle WITH_AVX=ON to get better performance.\n"
-                "The original error is: %s\n" % cpt.get_exception_message(e))
+                "Hint: Your machine support AVX, but the installed paddlepaddle doesn't have avx core. "
+                "Hence, no-avx core with worse preformance will be imported.\nIf you like, you could "
+                "reinstall paddlepaddle by 'python -m pip install --force-reinstall paddlepaddle-gpu[==version]' "
+                "to get better performance.\nThe original error is: %s\n" %
+                cpt.get_exception_message(e))
             load_noavx = True
 else:
-    sys.stderr.write(
-        "WARNING: AVX is not support on your machine. Hence, no_avx core will be imported, "
-        "It has much worse preformance than avx core.\n")
     load_noavx = True
 
 if load_noavx:
@@ -339,17 +335,14 @@ def to_list(s):
                 current_path + os.sep + 'core_noavx.' + core_suffix + '\n')
         elif avx_supported():
             sys.stderr.write(
-                "Error: AVX is support on your machine, but you have installed "
-                "paddlepaddle without avx core, you should reinstall paddlepaddle by "
-                "'python -m pip install --force-reinstall paddlepaddle-gpu[==version]\n"
+                "Error: The installed PaddlePaddle is incorrect. You should reinstall it by "
+                "'python -m pip install --force-reinstall paddlepaddle-gpu[==version]'\n"
             )
         else:
             sys.stderr.write(
-                "Error: AVX is not support on your machine, but you have installed "
-                "paddlepaddle without no_avx core, you should reinstall paddlepaddle by "
-                "'python -m pip install --force-reinstall paddlepaddle-gpu[==version] -f "
-                "https://paddlepaddle.org.cn/whl/mkl/stable/noavx.html or "
-                "https://paddlepaddle.org.cn/whl/openblas/stable/noavx.html\n")
+                "Error: Your machine doesn't support AVX, but the installed PaddlePaddle is avx core, "
+                "you should reinstall paddlepaddle with no-avx core.\n")
+
         raise e