From 771ec83369a72a58c0422266f7f1f93e1a5c528b Mon Sep 17 00:00:00 2001 From: chengduozh Date: Wed, 26 Jun 2019 21:20:24 +0800 Subject: [PATCH 1/3] add cuda_is_available test=develop --- python/paddle/fluid/framework.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/python/paddle/fluid/framework.py b/python/paddle/fluid/framework.py index 07b50c33034c74..23f4dcf44e3eba 100644 --- a/python/paddle/fluid/framework.py +++ b/python/paddle/fluid/framework.py @@ -102,6 +102,20 @@ def _cuda_ids(): return device_ids +def is_compiled_with_cuda(): + """ + Whether this whl package can be used to run the model on GPU. + + Returns (bool): support gpu or not. + + Examples: + .. code-block:: python + + support_gpu = fluid.is_compiled_with_cuda() + """ + return core.is_compiled_with_cuda() + + def cuda_places(device_ids=None): """ Create a list of :code:`fluid.CUDAPlace` objects. @@ -145,8 +159,8 @@ def cpu_places(device_count=None): If :code:`device_count` is None, the device count would be determined by environment variable :code:`CPU_NUM`. - If :code:`CPU_NUM` is not set, the device count would - be determined by :code:`multiprocessing.cpu_count()`. + If :code:`CPU_NUM` is not set, the default value is 1, + i.e. CPU_NUM=1. Args: device_count (None|int): device number. From 6589b10d307a23c104e538af764fa41696a74f4e Mon Sep 17 00:00:00 2001 From: chengduozh Date: Thu, 27 Jun 2019 12:23:12 +0800 Subject: [PATCH 2/3] Fix api.spec test=develop --- paddle/fluid/API.spec | 3 ++- python/paddle/fluid/framework.py | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/paddle/fluid/API.spec b/paddle/fluid/API.spec index bda2f74205d298..31ad8c1cf452ac 100644 --- a/paddle/fluid/API.spec +++ b/paddle/fluid/API.spec @@ -11,9 +11,10 @@ paddle.fluid.default_main_program (ArgSpec(args=[], varargs=None, keywords=None, paddle.fluid.program_guard (ArgSpec(args=['main_program', 'startup_program'], varargs=None, keywords=None, defaults=(None,)), ('document', '78fb5c7f70ef76bcf4a1862c3f6b8191')) paddle.fluid.name_scope (ArgSpec(args=['prefix'], varargs=None, keywords=None, defaults=(None,)), ('document', '61660461e1f44e0480ca22fa8a482c41')) paddle.fluid.cuda_places (ArgSpec(args=['device_ids'], varargs=None, keywords=None, defaults=(None,)), ('document', '7f3068b82fc427bfa04b1af953610992')) -paddle.fluid.cpu_places (ArgSpec(args=['device_count'], varargs=None, keywords=None, defaults=(None,)), ('document', '8b674e9a7ac7944c27fd853b675c2cb2')) +paddle.fluid.cpu_places (ArgSpec(args=['device_count'], varargs=None, keywords=None, defaults=(None,)), ('document', 'dad57e8624794766d770cea905dec1c2')) paddle.fluid.cuda_pinned_places (ArgSpec(args=['device_count'], varargs=None, keywords=None, defaults=(None,)), ('document', 'cc83b6c5ba8be38ff3ee87e9cec9de5f')) paddle.fluid.in_dygraph_mode (ArgSpec(args=[], varargs=None, keywords=None, defaults=None), ('document', 'eddb7a1f0083dcc70e9f6c71ee003cb9')) +paddle.fluid.is_compiled_with_cuda (ArgSpec(args=[], varargs=None, keywords=None, defaults=None), ('document', '15dc1c184c979d827e95f97a4e49a644')) paddle.fluid.Executor.__init__ (ArgSpec(args=['self', 'place'], varargs=None, keywords=None, defaults=None), ('document', '6adf97f83acf6453d4a6a4b1070f3754')) paddle.fluid.Executor.close (ArgSpec(args=['self'], varargs=None, keywords=None, defaults=None), ('document', '3a584496aa1343f36eebf3c46b323a74')) paddle.fluid.Executor.infer_from_dataset (ArgSpec(args=['self', 'program', 'dataset', 'scope', 'thread', 'debug', 'fetch_list', 'fetch_info', 'print_period'], varargs=None, keywords=None, defaults=(None, None, None, 0, False, None, None, 100)), ('document', 'bedc29ad01c1b911e99032ee1e19ac59')) diff --git a/python/paddle/fluid/framework.py b/python/paddle/fluid/framework.py index 23f4dcf44e3eba..bff0c02d7adb1a 100644 --- a/python/paddle/fluid/framework.py +++ b/python/paddle/fluid/framework.py @@ -44,6 +44,7 @@ 'cpu_places', 'cuda_pinned_places', 'in_dygraph_mode', + 'is_compiled_with_cuda', ] EMPTY_VAR_NAME = core.kEmptyVarName() From 92b2c1efda32c8f384b75ba81c7bba8159c11af6 Mon Sep 17 00:00:00 2001 From: chengduozh Date: Thu, 27 Jun 2019 20:56:57 +0800 Subject: [PATCH 3/3] fix api doc test=develop --- paddle/fluid/API.spec | 2 +- python/paddle/fluid/framework.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/paddle/fluid/API.spec b/paddle/fluid/API.spec index 31ad8c1cf452ac..de8405695d61cc 100644 --- a/paddle/fluid/API.spec +++ b/paddle/fluid/API.spec @@ -14,7 +14,7 @@ paddle.fluid.cuda_places (ArgSpec(args=['device_ids'], varargs=None, keywords=No paddle.fluid.cpu_places (ArgSpec(args=['device_count'], varargs=None, keywords=None, defaults=(None,)), ('document', 'dad57e8624794766d770cea905dec1c2')) paddle.fluid.cuda_pinned_places (ArgSpec(args=['device_count'], varargs=None, keywords=None, defaults=(None,)), ('document', 'cc83b6c5ba8be38ff3ee87e9cec9de5f')) paddle.fluid.in_dygraph_mode (ArgSpec(args=[], varargs=None, keywords=None, defaults=None), ('document', 'eddb7a1f0083dcc70e9f6c71ee003cb9')) -paddle.fluid.is_compiled_with_cuda (ArgSpec(args=[], varargs=None, keywords=None, defaults=None), ('document', '15dc1c184c979d827e95f97a4e49a644')) +paddle.fluid.is_compiled_with_cuda (ArgSpec(args=[], varargs=None, keywords=None, defaults=None), ('document', '60c7f107a5050aeb58bb74eb175672b5')) paddle.fluid.Executor.__init__ (ArgSpec(args=['self', 'place'], varargs=None, keywords=None, defaults=None), ('document', '6adf97f83acf6453d4a6a4b1070f3754')) paddle.fluid.Executor.close (ArgSpec(args=['self'], varargs=None, keywords=None, defaults=None), ('document', '3a584496aa1343f36eebf3c46b323a74')) paddle.fluid.Executor.infer_from_dataset (ArgSpec(args=['self', 'program', 'dataset', 'scope', 'thread', 'debug', 'fetch_list', 'fetch_info', 'print_period'], varargs=None, keywords=None, defaults=(None, None, None, 0, False, None, None, 100)), ('document', 'bedc29ad01c1b911e99032ee1e19ac59')) diff --git a/python/paddle/fluid/framework.py b/python/paddle/fluid/framework.py index bff0c02d7adb1a..7a34f93d19889b 100644 --- a/python/paddle/fluid/framework.py +++ b/python/paddle/fluid/framework.py @@ -112,7 +112,8 @@ def is_compiled_with_cuda(): Examples: .. code-block:: python - support_gpu = fluid.is_compiled_with_cuda() + import paddle.fluid as fluid + support_gpu = fluid.is_compiled_with_cuda() """ return core.is_compiled_with_cuda()