Remove mx.test_utils.list_gpus

apache · May 17, 2019 · a37eb61 · a37eb61
1 parent 9e9c5cd
commit a37eb61
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 21 deletions.
diff --git a/3rdparty/dmlc-core b/3rdparty/dmlc-core
diff --git a/example/distributed_training-horovod/gluon_mnist.py b/example/distributed_training-horovod/gluon_mnist.py
@@ -45,7 +45,7 @@
 
 if not args.no_cuda:
     # Disable CUDA if there are no GPUs.
-    if not mx.test_utils.list_gpus():
+    if mx.context.num_gpus() == 0:
         args.no_cuda = True
 
 logging.basicConfig(level=logging.INFO)

diff --git a/example/image-classification/test_score.py b/example/image-classification/test_score.py
@@ -51,11 +51,10 @@ def test_imagenet1k_inception_bn(**kwargs):
     assert r > g and r < g + .1
 
 if __name__ == '__main__':
-    gpus = mx.test_utils.list_gpus()
-    assert len(gpus) > 0
-    batch_size = 16 * len(gpus)
-    gpus = ','.join([str(i) for i in gpus])
-
+    num_gpus = mx.context.num_gpus()
+    assert num_gpus > 0
+    batch_size = 16 * num_gpus
+    gpus = ','.join(map(str, range(num_gpus)))
     kwargs = {'gpus':gpus, 'batch_size':batch_size, 'max_num_examples':500}
     download_data()
     test_imagenet1k_resnet(**kwargs)

diff --git a/python/mxnet/gluon/contrib/nn/basic_layers.py b/python/mxnet/gluon/contrib/nn/basic_layers.py
@@ -233,7 +233,7 @@ def _get_num_devices(self):
         warnings.warn("Caution using SyncBatchNorm: "
                       "if not using all the GPUs, please mannually set num_devices",
                       UserWarning)
-        num_devices = len(test_utils.list_gpus())
+        num_devices = mx.context.num_gpus()
         num_devices = num_devices if num_devices > 0 else 1
         return num_devices
 

diff --git a/python/mxnet/test_utils.py b/python/mxnet/test_utils.py
@@ -1431,16 +1431,6 @@ def check_consistency(sym, ctx_list, scale=1.0, grad_req='write',
 
     return gt
 
-def list_gpus():
-    """Return a list of GPUs
-
-    Returns
-    -------
-    list of int:
-        If there are n GPUs, then return a list [0,1,...,n-1]. Otherwise returns
-        [].
-    """
-    return range(mx.util.get_gpu_count())
 
 def download(url, fname=None, dirname=None, overwrite=False, retries=5):
     """Download an given URL

diff --git a/tools/caffe_converter/test_converter.py b/tools/caffe_converter/test_converter.py
@@ -90,9 +90,9 @@ def main():
         gpus = [-1]
         default_batch_size = 32
     else:
-        gpus = mx.test_utils.list_gpus()
-        assert gpus, 'At least one GPU is needed to run test_converter in GPU mode'
-        default_batch_size = 32 * len(gpus)
+        num_gpus = mx.context.nu_gpus()
+        assert num_gpus, 'At least one GPU is needed to run test_converter in GPU mode'
+        default_batch_size = 32 * num_gpus
 
     models = ['bvlc_googlenet', 'vgg-16', 'resnet-50']
+8 −9		CMakeLists.txt
+11 −0		include/dmlc/base.h
+2 −1		include/dmlc/build_config.h
+1 −1		include/dmlc/endian.h
+93 −71		include/dmlc/logging.h
+3 −0		include/dmlc/omp.h
+13 −0		include/dmlc/parameter.h
+1 −1		scripts/lint.py
+2 −2		scripts/packages.mk
+25 −0		src/data/libsvm_parser.h
+7 −4		src/io/filesys.cc
+34 −13		test/unittest/unittest_parser.cc
+1 −1		tracker/dmlc-submit
+1 −1		tracker/dmlc_tracker/kubernetes.py
+1 −1		tracker/dmlc_tracker/launcher.py
+1 −1		tracker/dmlc_tracker/mesos.py
+1 −1		tracker/dmlc_tracker/ssh.py
+0 −1		tracker/yarn/src/main/java/org/apache/hadoop/yarn/dmlc/ApplicationMaster.java