From 98c7d22bae886f26202b73c37b240b27b0cf9bd2 Mon Sep 17 00:00:00 2001
From: Jason <jjj2070@163.com>
Date: Wed, 27 Mar 2019 14:02:16 +0800
Subject: [PATCH] Update prepare.md

---
 caffe2fluid/prepare.md | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/caffe2fluid/prepare.md b/caffe2fluid/prepare.md
index e2bb65a..050042c 100644
--- a/caffe2fluid/prepare.md
+++ b/caffe2fluid/prepare.md
@@ -23,15 +23,12 @@ conda install caffe-gpu
 
 # 安装Python的future模块
 pip install future
-# 退出环境
+
+
+# 注意：由于protobuf版本问题，安装框架过程应先安装PaddlePaddle，再安装Caffe。
+# 如若先安装了Caffe，则可以在安装PaddlePaddle后执行下述命令解决
+pip uninstall protobuf
+pip install protobuf==3.6.0
+
 source deactivate
-> # 为了更便利地使用这一环境，需要将环境名与环境路径相匹配
-> vim ~/.bashrc
-> alias caffe-paddle=“Anaconda安装路径/envs/caffe-paddle/bin/python"
->source ~/.bashrc
-> ```
-注意：由于protobuf版本问题，安装框架过程应先安装PaddlePaddle，再安装Caffe。如若先安装了Caffe，则可以在安装PaddlePaddle后执行下述命令行。
-> ```shell
-> pip uninstall protobuf
-> pip install protobuf==3.6.0
 > ```
-- 
GitLab