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

[MXNET-1287] Fix test memory with ResourceScope #14666

Merged
merged 1 commit into from
May 18, 2019
Merged

Conversation

zachgk
Copy link
Contributor

@zachgk zachgk commented Apr 10, 2019

Description

Adds ResourceScope to various tests to avoid memory leaks. Otherwise, it is possible to run out of memory on smaller machines. Contains a part of #13995.

@lanking520 @andrewfayres

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

@zachgk
Copy link
Contributor Author

zachgk commented Apr 10, 2019

@mxnet-label-bot add [Scala, pr-awaiting-review]

@marcoabreu marcoabreu added pr-awaiting-review PR is waiting for code review Scala labels Apr 10, 2019
@zachgk zachgk mentioned this pull request Apr 10, 2019
12 tasks
@lanking520
Copy link
Member

lanking520 commented Apr 10, 2019

Try to clean up this:
NDArrayCollector introduced in 1.2, we can use ResourceScope to replace them now.

All the rest LGTM

@zachgk
Copy link
Contributor Author

zachgk commented Apr 12, 2019

This PR now removes all usages of NDArrayCollector throughout the code. It also officially deprecates it as of 1.5. I also improved the ResourceScope to recursively move NDArrays to outer scope when in hierarchical structure of Traversables (list, set, map, etc.) and Products (tuples).

@nswamy
Copy link
Member

nswamy commented Apr 23, 2019

@zachgk can you please move this to a separate PR along with tests for this change?

I also improved the ResourceScope to recursively move NDArrays to outer scope when in hierarchical structure of Traversables (list, set, map, etc.) and Products (tuples).

nswamy
nswamy previously requested changes Apr 23, 2019
Copy link
Member

@nswamy nswamy left a comment

Choose a reason for hiding this comment

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

Thanks for working on this.
Please create a separate PR for modifying the MoveToOuterScope along with tests.

@zachgk
Copy link
Contributor Author

zachgk commented Apr 23, 2019

By recommendation of @nswamy, this PR no longer contains the deprecation of NDArrayCollector and improvements to ResourceScope as they have been moved to #14780.

@vandanavk
Copy link
Contributor

@nswamy is this PR good to go?

@zachgk zachgk requested a review from nswamy May 9, 2019 17:57
Copy link
Member

@lanking520 lanking520 left a comment

Choose a reason for hiding this comment

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

LGTM

@lanking520
Copy link
Member

@nswamy I believe this one is good to go. Please take a look

@zachgk zachgk dismissed nswamy’s stale review May 18, 2019 02:00

The requested changes have been addressed

@zachgk zachgk merged commit c8ee1b3 into apache:master May 18, 2019
haohuanw pushed a commit to haohuanw/incubator-mxnet that referenced this pull request Jun 23, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
pr-awaiting-review PR is waiting for code review Scala
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants