Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Change mx.test_utils.list_gpus to mx.context.num_gpus where possible #14946

Merged
merged 7 commits into from
May 30, 2019
Merged

Change mx.test_utils.list_gpus to mx.context.num_gpus where possible #14946

merged 7 commits into from
May 30, 2019

Conversation

larroy
Copy link
Contributor

@larroy larroy commented May 14, 2019

Follow up from #14926

Description

Change mx_test_utils.list_gpus to mx.context.num_gpus where possible. mx.test_utils.list_gpus fails in machines where nvidia-smi is not installed, better not to use that function.

Checklist

Essentials

Please feel free to remove inapplicable items for your PR.

  • The PR title starts with [MXNET-$JIRA_ID], where $JIRA_ID refers to the relevant JIRA issue created (except PRs with tiny changes)
  • Changes are complete (i.e. I finished coding on this PR)
  • All changes have test coverage:
  • Unit tests are added for small changes to verify correctness (e.g. adding a new operator)
  • Nightly tests are added for complicated/long-running ones (e.g. changing distributed kvstore)
  • Build tests will be added for build configuration changes (e.g. adding a new build option with NCCL)
  • Code is well-documented:
  • For user-facing API changes, API doc string has been updated.
  • For new C++ functions in header files, their functionalities and arguments are documented.
  • For new examples, README.md is added to explain the what the example does, the source of the dataset, expected performance on test set and reference to the original paper if applicable
  • Check the API doc at http://mxnet-ci-doc.s3-accelerate.dualstack.amazonaws.com/PR-$PR_ID/$BUILD_ID/index.html
  • To the my best knowledge, examples are either not affected by this change, or have been fixed to be compatible with this change

@larroy larroy requested a review from szha as a code owner May 14, 2019 21:31
wkcn
wkcn approved these changes May 14, 2019
View reviewed changes
Copy link
Member

@wkcn wkcn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thank you!

@larroy
Copy link
Contributor Author

larroy commented May 15, 2019

@mxnet-label-bot add [pr-awaiting-merge, tutorials]

@marcoabreu marcoabreu added the pr-awaiting-merge Review and CI is complete. Ready to Merge label May 15, 2019
@larroy
Copy link
Contributor Author

larroy commented May 17, 2019

This is good to merge.

szha
szha suggested changes May 18, 2019
View reviewed changes
Copy link
Member

@szha szha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please only include relevant changes. dmlc-core upgrade doesn't seem relevant.

@larroy
Copy link
Contributor Author

larroy commented May 21, 2019

@szha thanks for noticing, that was an accident.

@larroy
Copy link
Contributor Author

larroy commented May 21, 2019

@szha did I address your comments?

szha
szha reviewed May 22, 2019
View reviewed changes
python/mxnet/test_utils.py Outdated Show resolved Hide resolved
@haojin2 haojin2 mentioned this pull request May 22, 2019
Merged
5 tasks
@larroy
Copy link
Contributor Author

larroy commented May 30, 2019

@szha

@szha szha merged commit e9a5a0a into apache:master May 30, 2019
haohuanw pushed a commit to haohuanw/incubator-mxnet that referenced this pull request Jun 23, 2019
@larroy
Change mx.test_utils.list_gpus to mx.context.num_gpus where possible (a…
32f176e 
…pache#14946)

* Change mx_test_utils.list_gpus to mx.context.num_gpus where possible
apache#14926

* Remove mx.test_utils.list_gpus

* revert accidental unrelated dmlc-core changes

* Fix basic_layers.py import

* Fix typo

* restore list_gpus() in tests_utils for compat

* restore dmlc-core
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wkcn wkcn wkcn approved these changes

@szha szha szha approved these changes

Assignees
No one assigned
Labels
pr-awaiting-merge Review and CI is complete. Ready to Merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@larroy @szha @wkcn @marcoabreu