Merge pull request PaddlePaddle#1787 from reyoung/feature/fix_pyhome_…

…error Fix PyHome Setted in PythonUtil.cpp
roysh · Apr 15, 2017 · 8239fbe · 8239fbe
2 parents 877df13 + d25357e
commit 8239fbe
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 13 deletions.
diff --git a/paddle/utils/.gitignore b/paddle/utils/.gitignore
@@ -1,2 +1 @@
 enable_virtualenv.c
-PythonUtil.cpp
diff --git a/paddle/utils/CMakeLists.txt b/paddle/utils/CMakeLists.txt
@@ -1,7 +1,4 @@
 # The utilities for paddle
-
-configure_file(PythonUtil.cpp.in ${PROJ_ROOT}/paddle/utils/PythonUtil.cpp)
-
 file(GLOB UTIL_HEADERS . *.h)
 file(GLOB UTIL_SOURCES . *.cpp)
 create_resources(enable_virtualenv.py enable_virtualenv.c)

diff --git a/paddle/utils/PythonUtil.cpp.in → paddle/utils/PythonUtil.cpp b/paddle/utils/PythonUtil.cpp.in → paddle/utils/PythonUtil.cpp
@@ -195,15 +195,6 @@ extern const char enable_virtualenv_py[];
 }
 void initPython(int argc, char** argv) {
 #ifndef PADDLE_NO_PYTHON
-  std::string pyHome;
-#if defined(__APPLE__) || defined(__OSX__)
-  pyHome = "/usr/local/Frameworks/Python.framework/Versions/2.7";
-  Py_SetPythonHome(const_cast<char*>(pyHome.c_str()));
-#endif
-  pyHome = "@PYTHON_INSTALL_DIR@"; // NOLINT
-  if (!pyHome.empty()) {
-    Py_SetPythonHome(const_cast<char*>(pyHome.c_str()));
-  }
   Py_SetProgramName(argv[0]);
   Py_Initialize();
   PySys_SetArgv(argc, argv);