diff options
author | Martin Wicke <wicke@google.com> | 2017-09-02 19:21:45 -0700 |
---|---|---|
committer | TensorFlower Gardener <gardener@tensorflow.org> | 2017-09-02 19:25:56 -0700 |
commit | d57572e996dce24abf4d9cf6ea04e7104b3d743b (patch) | |
tree | ec8f6620e0f3231a8b739a2b6574a2db813e85b3 /tensorflow/stream_executor/device_description.h | |
parent | ddba1e0aadabe26063a28c5d1c48e2cfce44e30f (diff) |
Merge changes from github.
PiperOrigin-RevId: 167401527
Diffstat (limited to 'tensorflow/stream_executor/device_description.h')
-rw-r--r-- | tensorflow/stream_executor/device_description.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tensorflow/stream_executor/device_description.h b/tensorflow/stream_executor/device_description.h index 8e3155475c..f2b35bcb43 100644 --- a/tensorflow/stream_executor/device_description.h +++ b/tensorflow/stream_executor/device_description.h @@ -82,7 +82,7 @@ class DeviceDescription { // Returns the limit on the number of simultaneously resident blocks // on a multiprocessor. - const uint64 blocks_per_core_limit() const { return blocks_per_core_limit_; } + uint64 blocks_per_core_limit() const { return blocks_per_core_limit_; } // Returns the limit on the total number of threads that can be launched in a // single block; i.e. the limit on x * y * z dimensions of a ThreadDim. @@ -141,7 +141,7 @@ class DeviceDescription { uint64 device_memory_size() const { return device_memory_size_; } // Returns the device's core clock rate in GHz. - const float clock_rate_ghz() const { return clock_rate_ghz_; } + float clock_rate_ghz() const { return clock_rate_ghz_; } // Returns whether ECC is enabled. bool ecc_enabled() const { return ecc_enabled_; } |