diff --git a/paddle/utils/.gitignore b/paddle/utils/.gitignore index 956b606a18cae1bb11322accfa174ae5ce1580de..f2cfd7409412de68f4183daebcb48e7a3ae37672 100644 --- 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 index 10d906ee16656a808122b81d8b2fef55b8e7b7e9..171eae381af70e9e76210a77a409e56a527cab06 100644 --- 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 b/paddle/utils/PythonUtil.cpp similarity index 95% rename from paddle/utils/PythonUtil.cpp.in rename to paddle/utils/PythonUtil.cpp index a51b8f765f41f6febb86002f371b14e8797e7e4d..7faeff55c28b9065179ad27b3b604a9f411249e5 100644 --- a/paddle/utils/PythonUtil.cpp.in +++ b/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(pyHome.c_str())); -#endif - pyHome = "@PYTHON_INSTALL_DIR@"; // NOLINT - if (!pyHome.empty()) { - Py_SetPythonHome(const_cast(pyHome.c_str())); - } Py_SetProgramName(argv[0]); Py_Initialize(); PySys_SetArgv(argc, argv);