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

Fix profiler check #14677

Merged
merged 10 commits into from
Apr 12, 2019
Merged

Fix profiler check #14677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5016170
Relax constexpr restriction
anirudh2290 Feb 5, 2019
30bfab2
Image classifcation mkldnn
anirudh2290 Mar 19, 2019
888e013
Merge branch 'master' of https://github.com/apache/incubator-mxnet
anirudh2290 Apr 10, 2019
87bf420
Merge branch 'master' of https://github.com/apache/incubator-mxnet
anirudh2290 Apr 11, 2019
7725973
Check mem profiler greater than 0
anirudh2290 Apr 11, 2019
664de66
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
anirudh2290 Apr 11, 2019
a4e4e2f
Revert "Relax constexpr restriction"
anirudh2290 Apr 11, 2019
6cae338
Revert "Image classifcation mkldnn"
anirudh2290 Apr 11, 2019
1bc41c3
Add test for profiler
anirudh2290 Apr 11, 2019
c7b85d8
Simplify test
anirudh2290 Apr 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/profiler/profiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,12 @@ struct ProfileCounter : public ProfileObject {
return IncrementValue(static_cast<uint64_t>(v));
}
}

inline bool operator >=(int64_t v) {
CHECK_GE(v, 0);
return value_ >= static_cast<uint64_t>(v);
}

/*! \brief operator: object = v */
inline ProfileCounter& operator = (uint64_t v) {
SetValue(v);
Expand Down
6 changes: 5 additions & 1 deletion src/profiler/storage_profiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,11 @@ class DeviceStorageProfiler {
Init(); // In case of bug which tries to free first
const size_t idx = prof->DeviceIndex(handle.ctx.dev_type, handle.ctx.dev_id);
CHECK_LT(idx, mem_counters_.size()) << "Invalid device index: " << idx;
*mem_counters_[idx] -= handle.size;
if (*mem_counters_[idx] >= handle.size) {
*mem_counters_[idx] -= handle.size;
} else {
*mem_counters_[idx] = 0;
}
}
}
}
Expand Down
16 changes: 16 additions & 0 deletions tests/python/unittest/test_exc_handling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,22 @@ def test_multiple_waitalls():
assert caught, "No exception thrown"
mx.nd.waitall()

@with_seed()
def test_exc_profiler():
Copy link
Contributor

Choose a reason for hiding this comment

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

seems a bit heavy for a unittest, I think passing some nd.ones() through a simple dense layer would do the same right?

Copy link
Member Author

Choose a reason for hiding this comment

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

I have simplified it. Please take a look

def run_training_iteration(data):
output = net(data)

net = gluon.nn.HybridSequential()
with net.name_scope():
net.add(gluon.nn.Dense(10))

ctx = default_context()
net.collect_params().initialize(mx.init.Xavier(), ctx=ctx)
data = mx.nd.ones((3, 4))
mx.profiler.set_state("run")
run_training_iteration(data)
mx.nd.waitall()
mx.profiler.set_state("stop")


if __name__ == '__main__':
Expand Down