Squashed commit of the following:

commit 825ff55cbfb8b059f3d2b4a5ace9c4bacedba69b
Author: DavidNorman <davidn@graphcore.ai>
Date:   Sat May 20 18:39:24 2017 +0100

    Merge example backend back from github

commit 7bea64415c437bda1d90dccadb34a82a22b57bb0
Merge: da9d00c 0fb5317
Author: DavidNorman <davidn@graphcore.ai>
Date:   Sat May 20 18:26:35 2017 +0100

    Merge remote-tracking branch 'github/example-evaluator-device' into poplar-plugin

commit da9d00c693276e136354c9879fd9715d39927f05
Author: DavidNorman <davidn@graphcore.ai>
Date:   Sat May 20 18:10:12 2017 +0100

    Fix to match new compiler API

commit dffec8216851941f1854f08a11fc0cf6b59dcb96
Merge: 650ca51 2803742
Author: DavidNorman <davidn@graphcore.ai>
Date:   Sat May 20 17:52:23 2017 +0100

    Merge branch 'poplar' into poplar-plugin

commit 650ca5166cfea1b10ce80e859a6ea0a7e01e7d95
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri May 19 13:19:08 2017 +0100

    Remove cases which would cause errors - types not supported in back end

commit 65d11c99ae681e56f949147728dd5e3a255f2086
Merge: d43762b 0b52c33
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri May 19 11:04:00 2017 +0100

    Merge branch 'poplar' into poplar-plugin

commit d43762bab4a080b20f77f21ca2309b4c2dc71a84
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri May 19 10:56:47 2017 +0100

    Modify example plugin to be hlo executor plugin

commit 191041a633ffac323a5807ca86c455dce9d31af6
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu May 18 18:38:27 2017 +0100

    Add outliner for convolution and matmul

commit 016aad4596ebaade307f453938da2cb94c464998
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu May 18 09:04:50 2017 +0100

    Add poplar to the build and test environments

commit 97ba294bd93d339109284fcbc441b3e989c77dd1
Merge: 3ef9673 319b6ce
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu May 18 08:54:49 2017 +0100

    Merge branch 'master' into poplar-plugin

commit 3ef9673cd9f5f9b134b0bf62f458f490ba0ae02a
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed May 17 16:46:49 2017 +0100

    Use TF style names

commit 14226054994e5dc5d8215d0f2fdbe2a35b4a8f02
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed May 17 16:45:42 2017 +0100

    Rename the visitors - 'Poplar' was extraneous. Introduce a ComputationMap

commit 003b558a2f3992f8cd1fdeff8475bec3fe774b3c
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed May 17 16:23:31 2017 +0100

    Clear the tensor map once the visitor is complete. Save memory.

commit 3feacafa0ec5f292f5096b83f3fec2f5ee7c42a4
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed May 17 14:09:43 2017 +0100

    Use the explicit poplar IEEE half type

commit 58c3c663c048b7f241b9f605083598ba3c79bfe2
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed May 17 09:51:32 2017 +0100

    Remove file added by mistake

commit ed8b1b80655a950d235a691e30674d382d71cd6b
Merge: f3a2028 513b1e4
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed May 17 08:55:50 2017 +0100

    Merge branch 'poplar' into poplar-plugin

commit f3a2028a0d70081119215f439657b8d8bf54e021
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue May 16 16:18:50 2017 +0100

    Change a few more C-style casts to C++ casts

commit 47c0ba4a97c0b253debd0ee9363efdcf81cd651d
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue May 16 12:54:50 2017 +0100

    Actually increase the report counter during execution

commit a976886d4d28a47b1815637a03abaa543c612c9c
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue May 16 12:09:22 2017 +0100

    Append a serial number to the report name

commit 2cecfda4fe2ae6617e882ad511772ed5c57bc63c
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue May 16 11:49:58 2017 +0100

    Ensure non native types pass through the API

commit 8500cf6a9bebeea41294afa8627f6aaecdb1e553
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue May 16 11:47:35 2017 +0100

    Add back 'map' line for mapping single tensor entry across a
    parallel map.

commit 1abec49a00728662f7a21692a95425409173c8e0
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue May 16 10:08:32 2017 +0100

    Add 2 extra F16 tests

commit c5a230b063283db72a064f489ecd709ad42d8c4e
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue May 16 10:07:52 2017 +0100

    Prune unnecessary code

commit 512fb5848ae53d5209c8928153f0952a2e4810b4
Merge: 1cff3a3 c03d5cc
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue May 16 09:30:37 2017 +0100

    Merge branch 'poplar' into poplar-plugin

commit 1cff3a3aa3b6356f3c4a0e315f10795d7b948feb
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon May 15 15:51:33 2017 +0100

    Use an alternative form of local initialization

commit e2c8ffdb9ce6d39003ad4b588f27abab76978d12
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon May 15 15:44:48 2017 +0100

    Changes after code review

commit a39423081215a237ab480b12b140a289a7069490
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon May 15 13:18:06 2017 +0100

    Fix up remaining F16 issues

commit 68468ecbaf72447c2a7233a2cc9815847c3e3856
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon May 15 12:54:48 2017 +0100

    Merge F16 literals back into working order

commit 2ede7f56811997e0e9a408954989a74d027c1be5
Merge: dd14ec7 a8271ea
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon May 15 11:44:23 2017 +0100

    Merge branch 'poplar' into poplar-plugin

commit dd14ec708dde6081d3125fb3c54beb4b5974b7b8
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon May 15 11:00:57 2017 +0100

    Don't run on into the error condition

commit 26d3d5937933bc2b4398e7d5f2f6b6b99874242c
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon May 15 10:32:41 2017 +0100

    Add literal support for F16

commit 1344cbaa6fa967db8f66e507acf5eedcf171d16e
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon May 15 10:29:57 2017 +0100

    Add support for F16

commit 886d12fded4e8d93b894f4f0eb8fe95216d8bb58
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri May 12 16:27:21 2017 +0100

    Remove commented out code

commit b135b8e48db110705fd1664fcc4665eb6a357ec1
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri May 12 14:30:41 2017 +0100

    Don't flatten sub-computations

commit dec6948bc984aa891c2d6c2c8f652cac61ff8c73
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri May 12 13:39:40 2017 +0100

    Revert "Use the poplibs unary and binary ops"

    This reverts commit b5f0731e4f9f496facf1e49c59ff765adac352ab.

    Do not use popstd until the predicate operations can be used as the
    predicate in a loop operation.

commit b5f0731e4f9f496facf1e49c59ff765adac352ab
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri May 12 11:37:40 2017 +0100

    Use the poplibs unary and binary ops

commit e502f175e020e5d10c800e0cca09c1d57725278d
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri May 12 10:13:19 2017 +0100

    Use a renet18 that matches the poplar example

commit 3fe1e6603f79ba0544258475db8495f287484aca
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed May 10 12:10:40 2017 +0100

    Implement strides > 1 in strided slice

commit eb48ef25113f43f5c7efa6cd907aa01db1287dea
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue May 9 17:04:51 2017 +0100

    Correct resnet18 to match poplar one

commit 5bd02f276f7110a49616935d90c615b570ba2b40
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue May 9 11:47:47 2017 +0100

    Add inference only resnet18

commit 8b7ec31229c2e64fe86fe517e247dac183597354
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue May 9 10:20:04 2017 +0100

    Use the 2D asym padding interface

commit c34da4ac61894c6f4dae21e1b89a93b995d30c7e
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue May 9 08:12:06 2017 +0100

    Move poplar to the plugin subdirectory of XLA

commit 5bed1a6e437e2a6a3932daa077211f89e62222e4
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue May 9 07:13:31 2017 +0100

    Include options for additional tags

commit 064cc96d84059830c54ee07699fac26ae928669d
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue May 9 06:58:58 2017 +0100

    Allow for multiple  backends

commit fdbad354d3bd040922bb71ac58d4276ed4364e43
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon May 8 18:09:11 2017 +0100

    Need to reference the device target

commit 06be2c080c9f331fc6fbd1c13c81d9c0c251d383
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon May 8 18:08:56 2017 +0100

    Add example

commit 63824e015fdba6b532e70923a485042fc2c73a9a
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon May 8 16:32:36 2017 +0100

    Use a permanent config file scheme for plugin inclusion

commit 6c494391a461c1b704de3a97ad1c871bc1a57363
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon May 8 15:50:38 2017 +0100

    Remove poplar device from the config file

commit b76285ee9a543f0d5311da95c8b12599f2d240fe
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon May 8 15:49:27 2017 +0100

    Add useful message to unchanging file

commit 461262231e5a808fdbb1d7d8ee35bf068c3372f7
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon May 8 15:46:31 2017 +0100

    Remove file in repo from the .gitignore file

commit 2824a392dedef8c6f3f635abe6af6c3485222155
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon May 8 15:40:52 2017 +0100

    Try using an alternative form for plugin unit test management

commit 523f4d86a88fe1ba09bc08546421404aae154d3b
Merge: b52de99 7fa0cf3
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon May 8 14:42:23 2017 +0100

    Merge branch 'master' into poplar-plugin

commit b52de99eac16d92bec107baf1892ad2b6d04e3a9
Merge: 89d9f1c b25f77a
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon May 8 14:40:58 2017 +0100

    Merge branch 'poplar-plugin' of ssh://phabricator.sourcevertex.net/diffusion/TENSORFLOW/tensorflow into poplar-plugin

commit b25f77ac25231c5d252dddd67a79531668ad3e10
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu May 4 13:58:13 2017 +0100

    Use new interface to popconv

commit 89d9f1cef59683b9c92dd5a460b6b49dec63c817
Merge: 9c15cd3 d0042ed
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu May 4 13:45:50 2017 +0100

    Merge branch 'poplar' into poplar-plugin

commit 9c15cd34f9063c9f72b4830b2254c29b4cf04c41
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed May 3 13:31:47 2017 +0100

    Use the new interface for constant tensors

commit afd3515f96b84cdc33e012b3f612500b04ae5e5c
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed May 3 13:11:08 2017 +0100

    Add configurable XLA plugin target

commit d546c6af20f00ba9a95b556859b807141358006c
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri Apr 28 13:08:53 2017 +0100

    Map the weights and input of the conv op

commit 63717e54f327a3fe8d46adce01f84c1475b9eefc
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri Apr 28 10:52:19 2017 +0100

    Add some vector/vector ops

commit 9fd1dab83a21addceed2fd99cd7c996869b3a36c
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri Apr 28 10:11:19 2017 +0100

    Defend against the second argument to Dot having rank=1

commit dcdbec503ecd6b18f0b67a73cfea2b2151304430
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Apr 27 17:00:43 2017 +0100

    Add the compute time to the execution stats

commit 9fffb3e4bc24c0ebb2949d20b1ebfa97d95dfa29
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Apr 27 16:33:46 2017 +0100

    Commenting TensorControl, and yak-shaving

commit c265cf225fd04b037d46bbdda65c03baa25178e2
Merge: 049a390 6a1825e
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Apr 27 14:20:15 2017 +0100

    Merge branch 'poplar' into poplar-plugin

commit 049a390ba39a0bade0a20b11f1005f1f628994b2
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Apr 27 14:10:43 2017 +0100

    Do not map constant tensors

commit 55026d88393d8e9c7399f500781742b9b0d9e5df
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Apr 27 13:46:01 2017 +0100

    Correct error message

commit e4c170681a07e696727a39b3a1ec220e4effff07
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Apr 27 13:39:37 2017 +0100

    Switch the cast operator to the poplibs version

commit 1bf20150b1d374ec65c4a344c131b67d28aa9507
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Apr 27 12:29:07 2017 +0100

    Add TODO comment regarding type support

commit 3f839f03e75a7f35e824fdcc1c7b454fad68f40c
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Apr 27 12:28:15 2017 +0100

    Remove bool as a type in elementwise predicate comparison inputs

commit 825e42b568fa11238939f4e51b776851144ce1ad
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Apr 27 12:26:20 2017 +0100

    Use a more general exception catch

commit 219b1c9a894292a16b1d15e44b1524dca1180262
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Apr 27 12:25:26 2017 +0100

    Remove Dot now that it is supported through poplibs

commit df45b0ac0ad5c49514206a17429a299ce878bb95
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Apr 27 10:24:56 2017 +0100

    Update to latest poplar convolution interface [WIP]

    There should be a look-forward output tensor generator, but this
    should wait until popconv has more natural tensor shapes

commit 794420e3d04912708239bb7ee6c506e065dc8ca8
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Apr 26 13:17:28 2017 +0100

    Remove 'dot' operator from vertices - now supported by poplin

commit 71713580f399f1c16b67935d21ee3b7ad5c32280
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Apr 26 10:02:41 2017 +0100

    No need for explicit device now that poplar XLA will consume all relevent
    ops

commit 370f3dc689b7b9e9bb9452f2693062a28157ad0a
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Apr 26 09:46:12 2017 +0100

    Ensure that poplar XLA device will consume appropriate operations

commit 911b4f0ff9d72b83f1c5d29336671c13a34bb54d
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Apr 24 14:52:39 2017 +0100

    Adding resnet18 as an example

commit c8a62d8c9082f8ed9b5b6b302b86ce0fb97ce53c
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Apr 24 14:35:56 2017 +0100

    Adding a resnet50 example and a reduce test

commit 09a8ba2a57c33f9bb814e26bb5dbf2665684311e
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Apr 24 09:31:02 2017 +0100

    Add some extra optimization stages to the pre-poplar compilation

commit ac94c5d5a04b5676d1a372c34e289d7d907a1ed4
Merge: ec72868 34c738c
Author: DavidNorman <davidn@graphcore.ai>
Date:   Sun Apr 23 11:57:30 2017 +0100

    Merge branch 'poplar' into poplar-plugin

commit ec72868b4a386dae1e4b6cb1db5b98f3fc39d754
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri Apr 21 14:22:26 2017 +0100

    Defend against unequal paddings (not supported by poplar at the moment)

commit 9501a99c44a2a7da0ff1e395c0e71208a9105da4
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri Apr 21 13:50:00 2017 +0100

    Use a convolution plan cache

commit 82d5ad61177e7fa019acb985e0957b38ad94a6d9
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri Apr 21 11:37:16 2017 +0100

    Create and use a popconv Planning cache

commit 4204cd2ed8511999a9c39a7721414b763f57ba76
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri Apr 21 11:31:36 2017 +0100

    Add a 'compiler resources' struct that can contain per-compile
    resources for the operations.

commit 621b5ab030f9cac8e5fece86588fffd8e855f466
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri Apr 21 11:00:48 2017 +0100

    Use the poplin matmul operation - and extend unit tests

commit eaa794dc5903b9a0857f22e1694b53921e2872ac
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Apr 20 14:52:23 2017 +0100

    Remove unnecessary trace

commit 02ff849be1ed325dc2453fc8f284ba2261daf326
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Apr 20 14:47:59 2017 +0100

    Separate the main visitor into an elementwise only one, and a full
    one.  Also separate the call and map visitors so that the map one
    doesn't get to include non-elementwise operations.

commit 42beb6e5e06f801660b5ed5191f29b3afe63dcf9
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Apr 20 12:22:12 2017 +0100

    Update method signatures to match public HEAD

commit a852939acb762a38d8093038340605b41d9573aa
Merge: 7131c8f 0557e8f
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Apr 20 11:59:01 2017 +0100

    Merge branch 'poplar' into poplar-plugin

commit 7131c8f56be426a38f944adeb9ef54c1769322b6
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Apr 19 14:10:24 2017 +0100

    Update to use the current popnn convolutions

commit a434949178c9cda52efb324c905f57b4c67e1c31
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Apr 18 16:41:27 2017 +0100

    Add options to create poplar report, vertex and compute graphs

commit 7864a4ea1c585f7db4072d0a8413a0803aa1c345
Merge: 9e573f6 fdbeae6
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Apr 18 16:00:18 2017 +0100

    Merge branch 'master' into poplar-plugin

commit 9e573f67a90fbd18d8a2d56ac2f156d9b4a7c506
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Apr 18 14:06:48 2017 +0100

    Add an examples directory and one mnist sized convolution example

commit e8c2af0db8fea45f8805fada47dcdad80d808430
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Apr 18 14:06:10 2017 +0100

    Remove redundant build script

commit 755587b79a297ce93fee2a1a52b346ed131535e2
Author: DavidNorman <davidn@graphcore.ai>
Date:   Sun Apr 16 23:37:04 2017 +0100

    Null engines must be just parameters, or tuples of parameters. Execution
    of null engines means remapping arguments and nothing more.

commit 1053f5476d2bdd0fc3295e019be17c665c5af36d
Author: DavidNorman <davidn@graphcore.ai>
Date:   Sun Apr 16 14:45:39 2017 +0100

    Identify when an engine has outputs that are unchanged inputs

commit c99a7638d2dace9a25cb06b64b45e2902b15d08a
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Apr 13 13:30:48 2017 +0100

    Do all engine execution in a mutex.  The execute function can be called in
    multiple threads.

commit 8b6564ff83aeba8e263f2b61119a85662e7ae481
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Apr 13 12:07:56 2017 +0100

    When a buffer is pre-allocated but is part of a tuple result, ensure
    that it has the correct reference count

commit d396b521b7ec28eb3938d723061c44920da908a6
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Apr 13 12:07:25 2017 +0100

    Track buffers from input to output, and reuse them when they remain the same

commit 064e528958bbed964b4a9688be91d7e1b63d82b5
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Apr 12 14:10:49 2017 +0100

    Add using in place updates for suitable operations

commit 91dc95013c9563e321eb2ea447cd2c03e4387714
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Apr 10 17:22:39 2017 +0100

    Update to use latest poplar release

commit c51bd5406f92a3be9b01dc0313efde743eedc24f
Merge: 3985eb4 901ab86
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Apr 10 15:39:54 2017 +0100

    Merge branch 'master' into poplar-plugin

commit 3985eb4a7aebaacbb1ec3ed615bfcc3590a8adac
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Apr 10 15:22:51 2017 +0100

    Fix error where invalid array index was causing data to be left on card

    Data was being overwritten.

commit f85d00fe2343aebc0eb6a67bdce11cc6cdf30cd8
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Apr 10 15:21:46 2017 +0100

    Adding a multi-run test to the variable ops

commit 513620259f0a0e08c59c35a436617065186fdda4
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Apr 6 10:37:16 2017 +0100

    Add locking around executor members

commit f97ce7c3c2f11a8dce72ab1fcbb6b8f04098cfd0
Merge: 2008f50 b93a88f
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Apr 5 18:29:49 2017 +0100

    Merge branch 'master' into poplar-plugin

commit 2008f507dc3b7596b6e424c00811d9bb8a512679
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Apr 5 15:46:07 2017 +0100

    Remove unused constants

commit 6062d14d6779ceb2347f528144a3399ad688376b
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Apr 5 14:58:14 2017 +0100

    Cache tensors on the device where possible

commit 85cca2c4b8749f57b794cf58d062736bb1547483
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Apr 5 13:27:37 2017 +0100

    Remove unnecessary logging

commit 0ecd7caf103a08a89158929f69f6fef0c3df697b
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Apr 5 11:05:51 2017 +0100

    Use VLOG instead of LOG, and add some extra logging for memory management

commit 7954e4a0f06305b9df685dc07c3eda12a8deb849
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Apr 4 15:59:49 2017 +0100

    Remove redundant test

commit 739fec7c72a1d4acd71a879465b88719aa3c2be4
Merge: 04dbae3 8908272
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Apr 4 14:48:36 2017 +0100

    Merge branch 'poplar' into poplar-plugin

commit 04dbae3d9a90d509b73ba87355705530b8144eee
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Apr 4 14:21:21 2017 +0100

    Add while op - and support for RandomNormal

commit 61fd01f9a8c845bafac1b7da12dd30c0eead91cc
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Apr 4 14:20:10 2017 +0100

    Use the new macro for registering the device ops

commit 6b8d4f91ae02984dc5a9ab3680e4f28469d8bf5d
Merge: 6caeb7d a6008d5
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Apr 3 13:05:35 2017 +0100

    Merge branch 'master' into poplar-plugin

commit 6caeb7d9e4169129907729bbb3fb9218e60d31e5
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Apr 3 12:57:27 2017 +0100

    Use new popnn libraries and headers.

commit 061b153265fe9bbe14317f8ac338d07fe7ffed0b
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Apr 3 12:56:06 2017 +0100

    Add finders for new popnn libraries, and interface for getting
    at the full path to the lib directories

commit 208d29c345b4efef907ec83217e4d546bad34251
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Mar 28 14:22:17 2017 +0100

    Use VLOG(1) for the nodes in the graph

commit 6f569dcdfd3140823f7aee7bedbfcfdd4deff72c
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Mar 28 13:07:22 2017 +0100

    Remove poplar timer and stream (use host ones). Use synchronous memcpy
    as the target for the asynchronous memcpy on stream.  Execute the
    engine on the stream as expected.

commit 8572c0b56f31145155922a1612ee4491a4cadbbd
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Mar 28 11:15:02 2017 +0100

    Use the new host copy interface, start work on tensor management

commit de5c7eefc2c1c07fd83f669e517e2014f7b1aade
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Mar 28 10:57:10 2017 +0100

    Adding test that runs simple networks multiple times

commit 878d6b1dd33565efc48ca6a28a0e207a91903241
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Mar 27 18:13:39 2017 +0100

    Remove plugin loader from Poplar unit tests

commit 26676aca857dd8a1f3b7be539ca2893a112b47f0
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Mar 27 11:15:08 2017 +0100

    Syncing list of supported ops with CPU

commit c020a44e1763310d5aa46bf42f649e386e9b103d
Merge: 75e2441 bbe056e
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Mar 27 10:07:34 2017 +0100

    Merge branch 'master' into poplar-plugin

commit 75e2441444739aa8a621a1f872d8464aa1fece0d
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri Mar 24 11:07:53 2017 +0000

    Swap poplar plugin into an internal plugin.

commit 710ac2f0aef8873ae4ebf1ea6db545825eaf9270
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri Mar 24 10:57:35 2017 +0000

    Remove pip packaging for poplar .so plugin

commit 9ac6d047c63c3511380b4aa8be5f2489316a995d
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri Mar 24 10:56:41 2017 +0000

    Remove plugin shared object loader part of python test framework

commit 7bbc4939793616fb9fe7b19375671f4204d33863
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri Mar 24 09:03:33 2017 +0000

    Use lower targets for the XLA headers only build

    The :jit target is the one used by the main body of TF to
    link in XLA.  If we are to use it to bring in Poplar too,
    then poplar cannot indirectly depend upon it

commit 8d31942308cb1a8571a2d43f41a099ec3871f712
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Mar 21 16:06:28 2017 +0000

    Use OS/X and linux independent rule

commit c8b76e912b76bd7ce12d7a441dbe45207ef20548
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Mar 21 15:58:24 2017 +0000

    Use a cc_binary rule to avoid the need for protobuf in the final .so file

commit 84cb108bd333ae52956e513c17ba05dea1c9540d
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Mar 21 10:18:18 2017 +0000

    Syncing new ops into the device

commit 37b1cd5012d8782172c2c1279f308e449ec6da29
Merge: c7b6b28 1ff3dad
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Mar 21 08:31:24 2017 +0000

    Merge branch 'poplar-plugin' of phabricator.sourcevertex.net:diffusion/TENSORFLOW/tensorflow into poplar-plugin

commit 1ff3dadaedbbdcd9c92161cd7dab9ce1ec3684d3
Merge: 398c879 fbad4e0
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Mar 21 08:27:42 2017 +0000

    Merge branch 'master' into poplar-plugin

commit c7b6b283c7acc8d448d9d9eb79c6a8c8fb405082
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Mar 21 08:19:03 2017 +0000

    Adding plugin-neutral system for loading XLA plugins into unit
    test framework

commit 398c879126d7be5bde0681c424f3fd7913aed6a2
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Mar 20 10:57:51 2017 +0000

    Remove reference to poplar from main TF stream executor

commit 7bfc16b3f01793474890605e033b828c60c91546
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Mar 20 10:52:26 2017 +0000

    Move poplar_platform_id to a driver local place

commit b2472224129aa9baabf485437dae6e7ee78bcf1e
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Mar 20 10:12:10 2017 +0000

    Remove some unnecessary changes

commit a23bde0b35380d8e8cb1d4c0f70c3edf17c7c917
Author: DavidNorman <davidn@graphcore.ai>
Date:   Sun Mar 19 16:24:27 2017 +0000

    Use header-only rules from XLA

commit db2fb685ae3a4fdc6d7f6d7663f8e5dd10cdf580
Author: DavidNorman <davidn@graphcore.ai>
Date:   Sun Mar 19 16:24:07 2017 +0000

    Adding header-only rules to native XLA

commit f304c38fb90e7250f4c154074e4b739a10c5c4bc
Author: DavidNorman <davidn@graphcore.ai>
Date:   Sat Mar 18 09:40:38 2017 +0000

    Remove unnecessary header includes

commit 5b84dd92fccc229c0c945e94329324c59bcd4af8
Author: DavidNorman <davidn@graphcore.ai>
Date:   Sat Mar 18 09:39:35 2017 +0000

    Remove debug from packaging script

commit 615a64857507d2a29958c0a715a6c6f51eb22a26
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri Mar 17 17:41:56 2017 +0000

    Ensure that the loader works from any directory

commit c38d91fea9fd4f20021f7d200880df13323080eb
Author: DavidNorman <davidn@graphcore.ai>
Date:   Fri Mar 17 16:53:50 2017 +0000

    Adding pip installer

commit d012e3ddf479061c35862de96e0b5c8bb524197a
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Mar 16 12:06:37 2017 +0000

    Clean some dependencies

commit 69cd3bbc899d950cbccdc067c8b58740dc8660e5
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Mar 16 11:33:21 2017 +0000

    Don't try calling install_name_tool if not present

commit 7fd51c2ab7dea21b3af98d34ce82f07d325a8a98
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Mar 16 11:25:56 2017 +0000

    Adding exported symbols to the linux script too

commit 201cb94dc7c4648432677d4d27ed6408b14673d2
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Mar 14 10:29:40 2017 +0000

    Add extra op support to match current head of XLA

commit 25a79a3c4d360d00fc4a0de474cc8560b50a55da
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Mar 14 10:16:46 2017 +0000

    Fix interface to match new XLA executable

commit 34c21edf42eb3b6d0672fa17e2df88b39737f215
Merge: e233fd5 60ef131
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Mar 13 15:58:24 2017 +0000

    Merge branch 'master' into poplar-plugin

commit e233fd5cb30162963b1530e04d2cd503fd2a1909
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Mar 13 14:39:46 2017 +0000

    Reverse order of poplar Copy arguments to match the new interface

commit fbff48d0b97e52b246227453296a96ae4de625ca
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Mar 13 14:30:47 2017 +0000

    Put the Graph prog file finder into the right namespace

commit a50742a4442b9861eeb44b2c4799f52b79b3c2bd
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Mar 13 13:37:30 2017 +0000

    Use the new graph program interface

commit d4f6d9526cf06e4d6c47524b28691d0c8fc7c90a
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Mar 8 09:45:17 2017 +0000

    Add the unsafe variable read op registration

commit e7fae222a2bc2b6ecc7774b1604d53e71b8b4cfd
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Mar 7 15:23:33 2017 +0000

    Include another protobug symbol

commit 71a23828b638a8ffab0bf8a46bc4b93f70cfeb5a
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Mar 7 13:53:46 2017 +0000

    Add select and scatter

commit 6381510024efbf0ac8afd771bbb3efe96be2db68
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Mar 7 13:53:09 2017 +0000

    Move the unary/binary op lookup to the maths_ops file

commit b96c726055b32428fc2771684c4479f86916d5a1
Merge: 5e029b2 bb112d3
Author: DavidNorman <davidn@graphcore.ai>
Date:   Tue Mar 7 08:29:06 2017 +0000

    Merge branch 'poplar-plugin' of phabricator.sourcevertex.net:diffusion/TENSORFLOW/tensorflow into poplar-plugin

commit 5e029b25267097d0a74ff920b1150fc63ea0cd7d
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Mar 6 16:02:21 2017 +0000

    Syncing list of supported ops with the XLA CPU list

commit 2e4cbae45d5229a744a81814f9c1011d137d1f9b
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Mar 6 14:12:26 2017 +0000

    Update to bring API in line with recent XLA base changes

commit 0446661f2e6c41c93b19deddd5f0d2e075cb2458
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Mar 6 09:47:50 2017 +0000

    Use expanding preprocessor macro for reduction ops

commit 94db6d1be30f0e2619a5bb4143003c5ca552c285
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Mar 2 10:55:42 2017 +0000

    Fix error in layout of the kernel for convolution

commit 863ef6c2250aee1c219648ba13e0064b3b3b0322
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Mar 2 09:08:49 2017 +0000

    Restrict protobuf to the minimum set required for loading the plugin

commit c3f745cb71144ba6bb5ce51babba268f66a30875
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Mar 1 17:49:06 2017 +0000

    Add random op

commit 2d95cf2f4d20e57a0c6fac42c2f0096c383c8a87
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Mar 1 15:51:36 2017 +0000

    Correct windowed reduce for left side padding

commit bd3c1e53f309ef75401b58606bc452bf2d2b97b8
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Mar 1 15:25:09 2017 +0000

    Add strided reduce operation

commit b7bc14f135d66c353680280ae2e78ce5866feff5
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Mar 1 09:41:05 2017 +0000

    Add convolution op (2d only, no dilated conv)

commit 8d3b4f0ef0babf6460d18f7a01c61a024019cdda
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Feb 27 17:23:27 2017 +0000

    Add int32 support to device, and prevent int64 indices when device doesn't support them

commit 3b66332aa4956f9a89d80085f6fd3f0873d3418c
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Feb 27 16:58:09 2017 +0000

    Add int64 to the list of supported types - internally map it to int32

commit 7e3f43f315a836d6ca272df517bef294047cac31
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Jan 25 11:01:04 2017 +0000

    Poplar plugin, including support for most binary and unary ops

commit bb112d3a9d9e3f00951dccdc4c972c6f82232391
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Mar 6 16:02:21 2017 +0000

    Syncing list of supported ops with the XLA CPU list

commit f76b39202054b63e6ba33137260a5e44a136c420
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Mar 6 14:12:26 2017 +0000

    Update to bring API in line with recent XLA base changes

commit 3858fb718e1ead27da73c1f89bb107d48ed004cf
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Mar 6 09:47:50 2017 +0000

    Use expanding preprocessor macro for reduction ops

commit 85addfc67ba482f1e63b08c497c0eabb5570003c
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Mar 2 10:55:42 2017 +0000

    Fix error in layout of the kernel for convolution

commit a0c18947ebbe5fdccdebd20eeeac505d448ca0fd
Author: DavidNorman <davidn@graphcore.ai>
Date:   Thu Mar 2 09:08:49 2017 +0000

    Restrict protobuf to the minimum set required for loading the plugin

commit 7177942c674b3504fd70381eebbdd917054c8c34
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Mar 1 17:49:06 2017 +0000

    Add random op

commit 7a666ead8f87b8c56c83d4f44a3455f5932ac3e4
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Mar 1 15:51:36 2017 +0000

    Correct windowed reduce for left side padding

commit 68f5f5e529c8775c2f3720743941da36052a86a0
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Mar 1 15:25:09 2017 +0000

    Add strided reduce operation

commit 3c47a48334dd296b04eb3106eeedd0b09c177379
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Mar 1 09:41:05 2017 +0000

    Add convolution op (2d only, no dilated conv)

commit a1887b9fc336b498c584ce7748d8516e4292a1a0
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Feb 27 17:23:27 2017 +0000

    Add int32 support to device, and prevent int64 indices when device doesn't support them

commit c207d8876613eeca89e2a40ba3947fb169a30da2
Author: DavidNorman <davidn@graphcore.ai>
Date:   Mon Feb 27 16:58:09 2017 +0000

    Add int64 to the list of supported types - internally map it to int32

commit aeb4f0451e6ca39b83a0bd25438aa88856ecc0c9
Author: DavidNorman <davidn@graphcore.ai>
Date:   Wed Jan 25 11:01:04 2017 +0000

    Poplar plugin, including support for most binary and unary ops

6 files changed, 14 insertions, 25 deletions

diff --git a/tensorflow/compiler/plugin/example/compiler.cc b/tensorflow/compiler/plugin/example/compiler.cc
index 562492be51..cd8a337a05 100644
--- a/tensorflow/compiler/plugin/example/compiler.cc
+++ b/tensorflow/compiler/plugin/example/compiler.cc
@@ -49,7 +49,6 @@ namespace exampleplugin {
  * contains useful optimization passes.
  */
 Status ExampleCompiler::RunHloOptimization(HloModule* hlo_module,
-                                           HloModuleConfig* module_config,
                                            HloDumper dump_hlo) {
   HloPassPipeline pipeline("Example", dump_hlo);
   pipeline.AddPass<Inliner>();
@@ -68,15 +67,13 @@ Status ExampleCompiler::RunHloOptimization(HloModule* hlo_module,
 }
 
 StatusOr<std::unique_ptr<Executable>> ExampleCompiler::Compile(
-    std::unique_ptr<HloModule> hlo_module,
-    std::unique_ptr<HloModuleConfig> module_config, HloDumper dump_hlo,
-    se::StreamExecutor* stream_exec) {
+        std::unique_ptr<HloModule> hlo_module, HloDumper dump_hlo,
+        se::StreamExecutor* stream_exec) {
   TF_RET_CHECK(stream_exec != nullptr);
 
   VLOG(1) << "Generate graph " << hlo_module->name();
 
-  TF_RETURN_IF_ERROR(
-      RunHloOptimization(hlo_module.get(), module_config.get(), dump_hlo));
+  TF_RETURN_IF_ERROR(RunHloOptimization(hlo_module.get(), dump_hlo));
 
   // Typically you would visit the HLO graph, building up a compiled equivalent
   // In this case we are using an Hlo evaluator at execution time, so we don't
@@ -84,16 +81,15 @@ StatusOr<std::unique_ptr<Executable>> ExampleCompiler::Compile(
 
   // Create executable from only the Hlo module
   std::unique_ptr<Executable> executable;
-  executable.reset(
-      new ExampleExecutable(std::move(hlo_module), std::move(module_config)));
+  executable.reset(new ExampleExecutable(std::move(hlo_module)));
 
   return std::move(executable);
 }
 
 StatusOr<std::vector<std::unique_ptr<Executable>>> ExampleCompiler::Compile(
-    std::vector<std::unique_ptr<HloModule>> hlo_modules,
-    std::vector<std::unique_ptr<HloModuleConfig>> module_configs,
-    HloDumper dump_hlos, std::vector<se::StreamExecutor*> stream_execs) {
+        std::vector<std::unique_ptr<HloModule>> hlo_modules,
+        HloDumper dump_hlos, std::vector<se::StreamExecutor*> stream_execs) {
+
   return tensorflow::errors::Unimplemented(
       "Compilation of multiple HLO modules is not supported on Example.");
 }
@@ -101,9 +97,7 @@ StatusOr<std::vector<std::unique_ptr<Executable>>> ExampleCompiler::Compile(
 StatusOr<std::vector<std::unique_ptr<AotCompilationResult>>>
 ExampleCompiler::CompileAheadOfTime(
     std::vector<std::unique_ptr<HloModule>> hlo_modules,
-    std::vector<std::unique_ptr<HloModuleConfig>> module_configs,
     HloDumper dump_hlo, const AotCompilationOptions& aot_options) {
-  TF_RET_CHECK(hlo_modules.size() == module_configs.size());
 
   return tensorflow::errors::InvalidArgument(
       "AOT compilation not supported on Example");
diff --git a/tensorflow/compiler/plugin/example/compiler.h b/tensorflow/compiler/plugin/example/compiler.h
index f45aa7680e..bcc451bed5 100644
--- a/tensorflow/compiler/plugin/example/compiler.h
+++ b/tensorflow/compiler/plugin/example/compiler.h
@@ -35,19 +35,17 @@ class ExampleCompiler : public Compiler {
 
   StatusOr<std::unique_ptr<Executable>> Compile(
       std::unique_ptr<HloModule> hlo_module,
-      std::unique_ptr<HloModuleConfig> module_config, HloDumper dump_hlo,
+      HloDumper dump_hlo,
       perftools::gputools::StreamExecutor* stream_exec) override;
 
   StatusOr<std::vector<std::unique_ptr<Executable>>> Compile(
       std::vector<std::unique_ptr<HloModule>> hlo_module,
-      std::vector<std::unique_ptr<HloModuleConfig>> module_config,
       HloDumper dump_hlo,
       std::vector<perftools::gputools::StreamExecutor*> stream_exec) override;
 
   StatusOr<std::vector<std::unique_ptr<AotCompilationResult>>>
   CompileAheadOfTime(
       std::vector<std::unique_ptr<HloModule>> module,
-      std::vector<std::unique_ptr<HloModuleConfig>> module_config,
       HloDumper dump_hlo, const AotCompilationOptions& options) override;
 
   int64 ShapeSizeBytes(const Shape& shape) const override;
@@ -55,8 +53,7 @@ class ExampleCompiler : public Compiler {
   perftools::gputools::Platform::Id PlatformId() const override;
 
  private:
-  Status RunHloOptimization(HloModule* hlo_module,
-                            HloModuleConfig* module_config, HloDumper dump_hlo);
+  Status RunHloOptimization(HloModule* hlo_module, HloDumper dump_hlo);
 
   TF_DISALLOW_COPY_AND_ASSIGN(ExampleCompiler);
 };
diff --git a/tensorflow/compiler/plugin/example/executable.cc b/tensorflow/compiler/plugin/example/executable.cc
index 6875323722..da01bd1a7a 100644
--- a/tensorflow/compiler/plugin/example/executable.cc
+++ b/tensorflow/compiler/plugin/example/executable.cc
@@ -27,10 +27,8 @@ namespace sep = ::perftools::gputools::exampleplugin;
 namespace xla {
 namespace exampleplugin {
 
-ExampleExecutable::ExampleExecutable(
-    std::unique_ptr<HloModule> hlo_module,
-    std::unique_ptr<HloModuleConfig> module_config)
-    : Executable(std::move(hlo_module), std::move(module_config)) {}
+ExampleExecutable::ExampleExecutable(std::unique_ptr<HloModule> hlo_module)
+    : Executable(std::move(hlo_module)) {}
 
 ExampleExecutable::~ExampleExecutable() {}
 
diff --git a/tensorflow/compiler/plugin/example/executable.h b/tensorflow/compiler/plugin/example/executable.h
index 99d2da77dd..e745b7ad11 100644
--- a/tensorflow/compiler/plugin/example/executable.h
+++ b/tensorflow/compiler/plugin/example/executable.h
@@ -37,8 +37,7 @@ namespace exampleplugin {
 
 class ExampleExecutable : public Executable {
  public:
-  ExampleExecutable(std::unique_ptr<HloModule> hlo_module,
-                    std::unique_ptr<HloModuleConfig> module_config);
+  ExampleExecutable(std::unique_ptr<HloModule> hlo_module);
   ~ExampleExecutable() override;
 
   StatusOr<perftools::gputools::DeviceMemoryBase> ExecuteOnStream(
diff --git a/tensorflow/compiler/plugin/example/transfer_manager.cc b/tensorflow/compiler/plugin/example/transfer_manager.cc
index cef8a49e19..14cb00b971 100644
--- a/tensorflow/compiler/plugin/example/transfer_manager.cc
+++ b/tensorflow/compiler/plugin/example/transfer_manager.cc
@@ -31,6 +31,8 @@ limitations under the License.
 #include <utility>
 #include <vector>
 
+namespace sep = ::perftools::gputools::exampleplugin;
+
 namespace xla {
 namespace exampleplugin {
 
diff --git a/tensorflow/compiler/plugin/example/transfer_manager.h b/tensorflow/compiler/plugin/example/transfer_manager.h
index 0f7b81e613..3b6e0c6a42 100644
--- a/tensorflow/compiler/plugin/example/transfer_manager.h
+++ b/tensorflow/compiler/plugin/example/transfer_manager.h
@@ -29,7 +29,6 @@ limitations under the License.
 #include <vector>
 
 namespace se = ::perftools::gputools;
-namespace sep = ::perftools::gputools::exampleplugin;
 
 namespace xla {
 namespace exampleplugin {