You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Yi Wang 097f533bca Resolve conflict		7 years ago
..
api	Use PADDLE_WITH_CUDA instead of PADDLE_WITH_GPU	7 years ago
capi	Use PADDLE_WITH_CUDA instead of PADDLE_WITH_GPU	7 years ago
cuda	Merge pull request #4154 from luotao1/avg_pool	8 years ago
framework	Resolve conflict	7 years ago
function	Use PADDLE_WITH_CUDA instead of PADDLE_WITH_GPU	7 years ago
gserver	Use PADDLE_WITH_CUDA instead of PADDLE_WITH_GPU	7 years ago
math	Use PADDLE_WITH_CUDA instead of PADDLE_WITH_GPU	7 years ago
memory	Merge branch 'develop' of https://github.com/paddlepaddle/paddle into paddle_only_cpu	7 years ago
operators	Resolve conflict	7 years ago
optimizer	FIX: virtual OptimizerTest	8 years ago
parameter	use existed sgd updater function	7 years ago
platform	Merge branch 'develop' of https://github.com/paddlepaddle/paddle into paddle_only_cpu	7 years ago
pserver	Use PADDLE_WITH_CUDA instead of PADDLE_WITH_GPU	7 years ago
py_paddle	fix typo	8 years ago
pybind	Use PADDLE_WITH_CUDA instead of PADDLE_WITH_GPU	7 years ago
scripts	fix typo	7 years ago
string	Use PADDLE_WITH_CUDA instead of PADDLE_WITH_GPU	7 years ago
testing	Fix CI tests	8 years ago
trainer	Use PADDLE_WITH_CUDA instead of PADDLE_WITH_GPU	7 years ago
utils	Use PADDLE_WITH_CUDA instead of PADDLE_WITH_GPU	7 years ago
.common_test_util.sh	…
.gitignore	…
.set_port.sh	…
.set_python_path.sh	Update set python path	8 years ago
CMakeLists.txt	Add paddle_pserver back to c-api library, because it is used in Evaluator.h.	8 years ago