diff --git a/google-shim/LICENSE b/google-shim/LICENSE deleted file mode 100644 index f89eb33..0000000 --- a/google-shim/LICENSE +++ /dev/null @@ -1,203 +0,0 @@ -Copyright 2016 The TensorFlow Authors. All rights reserved. - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2016, The TensorFlow Authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/google-shim/Setup.hs b/google-shim/Setup.hs deleted file mode 100644 index e8ef27d..0000000 --- a/google-shim/Setup.hs +++ /dev/null @@ -1,3 +0,0 @@ -import Distribution.Simple - -main = defaultMain diff --git a/google-shim/google-shim.cabal b/google-shim/google-shim.cabal deleted file mode 100644 index 8116f57..0000000 --- a/google-shim/google-shim.cabal +++ /dev/null @@ -1,24 +0,0 @@ -name: google-shim -version: 0.1.0.0 -synopsis: Adapters to externalize TensorFlow code. -description: Please see README.md -homepage: https://github.com/tensorflow/haskell#readme -license: Apache -license-file: LICENSE -author: TensorFlow authors -maintainer: tensorflow-haskell@googlegroups.com -copyright: Google Inc. -category: Machine Learning -build-type: Simple -cabal-version: >=1.22 - -library - hs-source-dirs: src - exposed-modules: Google.Test - build-depends: base >= 4.7 && < 5 - , test-framework - default-language: Haskell2010 - -source-repository head - type: git - location: https://github.com/tensorflow/haskell diff --git a/google-shim/src/Google/Test.hs b/google-shim/src/Google/Test.hs deleted file mode 100644 index 26e1659..0000000 --- a/google-shim/src/Google/Test.hs +++ /dev/null @@ -1,22 +0,0 @@ --- Copyright 2016 TensorFlow authors. --- --- Licensed under the Apache License, Version 2.0 (the "License"); --- you may not use this file except in compliance with the License. --- You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. - --- | Alternative implementations to make dependent code work without --- changes. -module Google.Test where - -import Test.Framework (Test, defaultMain) - -googleTest :: [Test] -> IO () -googleTest = defaultMain diff --git a/stack.yaml b/stack.yaml index 4d35a73..d777a79 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,7 +1,6 @@ resolver: lts-8.13 packages: -- google-shim - tensorflow - tensorflow-core-ops - tensorflow-logging @@ -10,8 +9,6 @@ packages: - tensorflow-proto - tensorflow-mnist - tensorflow-mnist-input-data -- tensorflow-queue -- tensorflow-nn - tensorflow-records - tensorflow-records-conduit - tensorflow-test diff --git a/tensorflow-mnist/tensorflow-mnist.cabal b/tensorflow-mnist/tensorflow-mnist.cabal index b0d7b3d..f35b4ca 100644 --- a/tensorflow-mnist/tensorflow-mnist.cabal +++ b/tensorflow-mnist/tensorflow-mnist.cabal @@ -64,7 +64,6 @@ Test-Suite ParseTest , bytestring , proto-lens , lens-family - , google-shim , tensorflow , tensorflow-mnist , tensorflow-mnist-input-data diff --git a/tensorflow-mnist/tests/ParseTest.hs b/tensorflow-mnist/tests/ParseTest.hs index 9a0f4db..52efcf7 100644 --- a/tensorflow-mnist/tests/ParseTest.hs +++ b/tensorflow-mnist/tests/ParseTest.hs @@ -51,10 +51,9 @@ import TensorFlow.Ops import TensorFlow.Session (runSession, run, run_, runWithFeeds, build) import TensorFlow.Types (TensorDataType(..), Shape(..), unScalar) -import Test.Framework (Test) +import Test.Framework (defaultMain, Test) import Test.Framework.Providers.HUnit (testCase) import Test.HUnit ((@=?), Assertion) -import Google.Test import qualified Data.Vector as V -- | Test that a file can be read and the GraphDef proto correctly parsed. @@ -168,8 +167,9 @@ testMNISTExec = testCase "testMNISTExec" $ do liftIO $ (fromInteger . toInteger $ label :: Int64) @=? unScalar x main :: IO () -main = googleTest [ testReadMessageFromFileOrDie - , testReadMNIST - , testGraphDefGen - , testGraphDefExec - , testMNISTExec] +main = defaultMain + [ testReadMessageFromFileOrDie + , testReadMNIST + , testGraphDefGen + , testGraphDefExec + , testMNISTExec ] diff --git a/tensorflow-nn/LICENSE b/tensorflow-nn/LICENSE deleted file mode 100644 index f89eb33..0000000 --- a/tensorflow-nn/LICENSE +++ /dev/null @@ -1,203 +0,0 @@ -Copyright 2016 The TensorFlow Authors. All rights reserved. - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2016, The TensorFlow Authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/tensorflow-nn/Setup.hs b/tensorflow-nn/Setup.hs deleted file mode 100644 index e8ef27d..0000000 --- a/tensorflow-nn/Setup.hs +++ /dev/null @@ -1,3 +0,0 @@ -import Distribution.Simple - -main = defaultMain diff --git a/tensorflow-nn/tensorflow-nn.cabal b/tensorflow-nn/tensorflow-nn.cabal deleted file mode 100644 index 03dec0b..0000000 --- a/tensorflow-nn/tensorflow-nn.cabal +++ /dev/null @@ -1,46 +0,0 @@ -name: tensorflow-nn -version: 0.1.0.0 -synopsis: Friendly layer around TensorFlow bindings. -description: Please see README.md -homepage: https://github.com/tensorflow/haskell#readme -license: Apache -license-file: LICENSE -author: TensorFlow authors -maintainer: tensorflow-haskell@googlegroups.com -copyright: Google Inc. -category: Machine Learning -build-type: Simple -cabal-version: >=1.22 - -library - hs-source-dirs: src - exposed-modules: TensorFlow.NN - build-depends: base >= 4.7 && < 5 - , tensorflow-core-ops == 0.1.* - , tensorflow == 0.1.* - , tensorflow-ops == 0.1.* - default-language: Haskell2010 - - -Test-Suite NNTest - default-language: Haskell2010 - type: exitcode-stdio-1.0 - main-is: NNTest.hs - hs-source-dirs: tests - build-depends: HUnit - , QuickCheck - , base - , tensorflow - , tensorflow-test - , tensorflow-ops - , tensorflow-nn - , google-shim - , test-framework - , test-framework-hunit - , test-framework-quickcheck2 - , vector - - -source-repository head - type: git - location: https://github.com/tensorflow/haskell diff --git a/tensorflow-nn/src/TensorFlow/NN.hs b/tensorflow-ops/src/TensorFlow/NN.hs similarity index 100% rename from tensorflow-nn/src/TensorFlow/NN.hs rename to tensorflow-ops/src/TensorFlow/NN.hs diff --git a/tensorflow-queue/src/TensorFlow/Queue.hs b/tensorflow-ops/src/TensorFlow/Queue.hs similarity index 100% rename from tensorflow-queue/src/TensorFlow/Queue.hs rename to tensorflow-ops/src/TensorFlow/Queue.hs diff --git a/tensorflow-ops/tensorflow-ops.cabal b/tensorflow-ops/tensorflow-ops.cabal index 8beadf5..20dd9f3 100644 --- a/tensorflow-ops/tensorflow-ops.cabal +++ b/tensorflow-ops/tensorflow-ops.cabal @@ -17,6 +17,8 @@ library exposed-modules: TensorFlow.Gradient , TensorFlow.Ops , TensorFlow.EmbeddingOps + , TensorFlow.NN + , TensorFlow.Queue , TensorFlow.Variable build-depends: proto-lens == 0.2.* , base >= 4.7 && < 5 @@ -54,7 +56,6 @@ Test-Suite MatrixTest build-depends: base , HUnit , random - , google-shim , tensorflow , tensorflow-core-ops , tensorflow-ops @@ -73,7 +74,6 @@ Test-Suite BuildTest , base , proto-lens , lens-family - , google-shim , tensorflow , tensorflow-ops , tensorflow-proto @@ -92,7 +92,6 @@ Test-Suite EmbeddingOpsTest , base , proto-lens , lens-family - , google-shim , tensorflow , tensorflow-test , tensorflow-core-ops @@ -114,7 +113,6 @@ Test-Suite ArrayOpsTest , base , proto-lens , lens-family - , google-shim , tensorflow , tensorflow-core-ops , tensorflow-ops @@ -136,7 +134,6 @@ Test-Suite OpsTest , bytestring , proto-lens , lens-family - , google-shim , temporary , tensorflow , tensorflow-core-ops @@ -155,7 +152,6 @@ Test-Suite VariableTest hs-source-dirs: tests build-depends: HUnit , base - , google-shim , tensorflow , tensorflow-core-ops , tensorflow-ops @@ -175,7 +171,6 @@ Test-Suite DataFlowOpsTest , base , proto-lens , lens-family - , google-shim , tensorflow , tensorflow-core-ops , tensorflow-ops @@ -194,7 +189,6 @@ Test-Suite GradientTest , base , proto-lens , lens-family - , google-shim , tensorflow , tensorflow-core-ops , tensorflow-ops @@ -213,7 +207,6 @@ Test-Suite MiscTest , base , bytestring , vector - , google-shim , transformers , tensorflow , tensorflow-core-ops @@ -222,6 +215,42 @@ Test-Suite MiscTest , test-framework , test-framework-hunit +Test-Suite NNTest + default-language: Haskell2010 + type: exitcode-stdio-1.0 + main-is: NNTest.hs + hs-source-dirs: tests + build-depends: HUnit + , QuickCheck + , base + , tensorflow + , tensorflow-test + , tensorflow-ops + , test-framework + , test-framework-hunit + , test-framework-quickcheck2 + , vector + +Test-Suite QueueTest + default-language: Haskell2010 + type: exitcode-stdio-1.0 + main-is: QueueTest.hs + hs-source-dirs: tests + -- Uses multiple threads and blocks without this option. + ghc-options: -threaded + build-depends: HUnit + , base + , bytestring + , proto-lens + , lens-family + , tensorflow + , tensorflow-core-ops + , tensorflow-ops + , test-framework + , test-framework-hunit + , transformers + , vector + Test-Suite TracingTest default-language: Haskell2010 type: exitcode-stdio-1.0 @@ -248,7 +277,6 @@ Test-Suite TypesTest , bytestring , proto-lens , lens-family - , google-shim , tensorflow , tensorflow-core-ops , tensorflow-ops diff --git a/tensorflow-ops/tests/ArrayOpsTest.hs b/tensorflow-ops/tests/ArrayOpsTest.hs index e266ace..0725743 100644 --- a/tensorflow-ops/tests/ArrayOpsTest.hs +++ b/tensorflow-ops/tests/ArrayOpsTest.hs @@ -17,8 +17,7 @@ module Main where import Control.Monad.IO.Class (liftIO) import Data.Int (Int64) -import Google.Test (googleTest) -import Test.Framework (Test) +import Test.Framework (defaultMain, Test) import Test.Framework.Providers.HUnit (testCase) import Test.HUnit ((@=?)) import qualified Data.Vector as V @@ -47,6 +46,6 @@ testShapeN = testCase "testShapeN" $ TF.runSession $ do liftIO $ [V.fromList [1], V.fromList [2,3]] @=? (result :: [V.Vector Int64]) main :: IO () -main = googleTest [ testSplit - , testShapeN - ] +main = defaultMain [ testSplit + , testShapeN + ] diff --git a/tensorflow-ops/tests/BuildTest.hs b/tensorflow-ops/tests/BuildTest.hs index 1df0719..1228bef 100644 --- a/tensorflow-ops/tests/BuildTest.hs +++ b/tensorflow-ops/tests/BuildTest.hs @@ -60,10 +60,9 @@ import TensorFlow.Session , runSession , run_ ) -import Test.Framework (Test) +import Test.Framework (defaultMain, Test) import Test.Framework.Providers.HUnit (testCase) import Test.HUnit ((@=?)) -import Google.Test (googleTest) import qualified Data.Vector as V -- | Test 'opName' behavior. @@ -165,12 +164,13 @@ testDeviceColocation = testCase "testDeviceColocation" $ evalBuildT $ do return () main :: IO () -main = googleTest [ testInitializedVariable - , testInitializedVariableShape - , testDeviceColocation - , testOpName - , testNameScoped - , testNamedAndScoped - , testPureRender - , testRenderDedup - ] +main = defaultMain + [ testInitializedVariable + , testInitializedVariableShape + , testDeviceColocation + , testOpName + , testNameScoped + , testNamedAndScoped + , testPureRender + , testRenderDedup + ] diff --git a/tensorflow-ops/tests/DataFlowOpsTest.hs b/tensorflow-ops/tests/DataFlowOpsTest.hs index 184cbd2..4d5d3ce 100644 --- a/tensorflow-ops/tests/DataFlowOpsTest.hs +++ b/tensorflow-ops/tests/DataFlowOpsTest.hs @@ -17,7 +17,7 @@ import Data.Int (Int32, Int64) import Data.List (genericLength) -import Google.Test (googleTest) +import Test.Framework (defaultMain) import Test.Framework.Providers.QuickCheck2 (testProperty) import Test.HUnit ((@=?)) import Test.QuickCheck (Arbitrary(..), Property, choose, vectorOf) @@ -59,7 +59,7 @@ instance Arbitrary a => Arbitrary (StitchExample a) where return $ StitchExample numParts values partitions main :: IO () -main = googleTest +main = defaultMain [ testProperty "DynamicPartitionStitchInverse" (testDynamicPartitionStitchInverse :: StitchExample Int64 -> Property) ] diff --git a/tensorflow-ops/tests/EmbeddingOpsTest.hs b/tensorflow-ops/tests/EmbeddingOpsTest.hs index ecaeaa4..ce7479f 100644 --- a/tensorflow-ops/tests/EmbeddingOpsTest.hs +++ b/tensorflow-ops/tests/EmbeddingOpsTest.hs @@ -22,9 +22,8 @@ module Main where import Control.Monad.IO.Class (liftIO) import Data.Int (Int32, Int64) import Data.List (genericLength) -import Google.Test (googleTest) import TensorFlow.EmbeddingOps (embeddingLookup) -import Test.Framework (Test) +import Test.Framework (defaultMain, Test) import Test.Framework.Providers.QuickCheck2 (testProperty) import Test.HUnit ((@=?)) import Test.Framework.Providers.HUnit (testCase) @@ -169,7 +168,7 @@ instance Arbitrary a => Arbitrary (LookupExample a) where return $ LookupExample numParts (TF.Shape shape) values indices main :: IO () -main = googleTest +main = defaultMain [ testProperty "EmbeddingLookupUndoesSplit" (testEmbeddingLookupUndoesSplit :: LookupExample Double -> Property) , testEmbeddingLookupHasRightShape diff --git a/tensorflow-ops/tests/GradientTest.hs b/tensorflow-ops/tests/GradientTest.hs index cb9222b..5e57c15 100644 --- a/tensorflow-ops/tests/GradientTest.hs +++ b/tensorflow-ops/tests/GradientTest.hs @@ -20,10 +20,9 @@ import Data.Int (Int32, Int64) import Data.List (sort) import Data.ProtoLens.TextFormat (showMessage) -import Google.Test (googleTest) +import Test.Framework (defaultMain, Test) import Lens.Family2 ((^..), (.~)) -import Test.Framework (Test) import Test.Framework.Providers.HUnit (testCase) import Test.HUnit ((@=?), assertEqual) import qualified Data.Vector as V @@ -292,21 +291,22 @@ transAttrs a b = (TF.opAttr "transpose_a" .~ a) . (TF.opAttr "transpose_b" .~ b) main :: IO () -main = googleTest [ testGradientSimple - , testGradientDisconnected - , testCreateGraphStateful - , testCreateGraphNameScopes - , testDiamond - , testMaxGradient - , testReluGrad - , testReluGradGrad - , testFillGrad - , testTileGrad - , testTile2DGrad - , matMulGradient - , matMulGradGrad - , matMulTransposeGradient (False, False) - , matMulTransposeGradient (False, True) - , matMulTransposeGradient (True, False) - , matMulTransposeGradient (True, True) - ] +main = defaultMain + [ testGradientSimple + , testGradientDisconnected + , testCreateGraphStateful + , testCreateGraphNameScopes + , testDiamond + , testMaxGradient + , testReluGrad + , testReluGradGrad + , testFillGrad + , testTileGrad + , testTile2DGrad + , matMulGradient + , matMulGradGrad + , matMulTransposeGradient (False, False) + , matMulTransposeGradient (False, True) + , matMulTransposeGradient (True, False) + , matMulTransposeGradient (True, True) + ] diff --git a/tensorflow-ops/tests/MatrixTest.hs b/tensorflow-ops/tests/MatrixTest.hs index f40c1ca..b990fbd 100644 --- a/tensorflow-ops/tests/MatrixTest.hs +++ b/tensorflow-ops/tests/MatrixTest.hs @@ -10,10 +10,9 @@ import qualified TensorFlow.Gradient as TF import qualified TensorFlow.Ops as TF import qualified Data.Vector as V -import Test.Framework (Test) +import Test.Framework (defaultMain, Test) import Test.Framework.Providers.HUnit (testCase) import TensorFlow.Test (assertAllClose) -import Google.Test (googleTest) randomParam :: TF.Shape -> TF.Session (TF.Tensor TF.Value Float) randomParam (TF.Shape shape) = TF.truncatedNormal (TF.vector shape) @@ -45,4 +44,4 @@ gradientDescent alpha loss params = do TF.group =<< zipWithM applyGrad params =<< TF.gradients loss params main :: IO () -main = googleTest [ fitMatrix ] +main = defaultMain [ fitMatrix ] diff --git a/tensorflow-ops/tests/MiscTest.hs b/tensorflow-ops/tests/MiscTest.hs index 7845b6f..1029052 100644 --- a/tensorflow-ops/tests/MiscTest.hs +++ b/tensorflow-ops/tests/MiscTest.hs @@ -19,10 +19,9 @@ module Main where import Control.Monad.IO.Class (liftIO) import Data.Int (Int32) -import Test.Framework (Test) +import Test.Framework (defaultMain, Test) import Test.Framework.Providers.HUnit (testCase) import Test.HUnit ((@=?)) -import Google.Test import qualified Data.Vector as V import qualified TensorFlow.GenOps.Core as CoreOps @@ -46,6 +45,6 @@ testVarargs = testCase "testVarargs" $ liftIO $ [1..8] @=? V.toList (xs :: V.Vector Float) main :: IO () -main = googleTest [ testMultipleOutputs - , testVarargs - ] +main = defaultMain [ testMultipleOutputs + , testVarargs + ] diff --git a/tensorflow-nn/tests/NNTest.hs b/tensorflow-ops/tests/NNTest.hs similarity index 93% rename from tensorflow-nn/tests/NNTest.hs rename to tensorflow-ops/tests/NNTest.hs index 4051212..0e34359 100644 --- a/tensorflow-nn/tests/NNTest.hs +++ b/tensorflow-ops/tests/NNTest.hs @@ -17,9 +17,8 @@ module Main where -import Google.Test (googleTest) import TensorFlow.Test (assertAllClose) -import Test.Framework (Test) +import Test.Framework (defaultMain, Test) import Test.Framework.Providers.HUnit (testCase) import qualified Data.Vector as V import qualified TensorFlow.Gradient as TF @@ -97,7 +96,8 @@ run :: TF.Fetchable t a => TF.Session t -> IO a run = TF.runSession . (>>= TF.run) main :: IO () -main = googleTest [ testGradientAtZero - , testLogisticOutput - , testLogisticOutputMultipleDim - ] +main = defaultMain + [ testGradientAtZero + , testLogisticOutput + , testLogisticOutputMultipleDim + ] diff --git a/tensorflow-ops/tests/OpsTest.hs b/tensorflow-ops/tests/OpsTest.hs index 4824d6f..6c08c1a 100644 --- a/tensorflow-ops/tests/OpsTest.hs +++ b/tensorflow-ops/tests/OpsTest.hs @@ -19,10 +19,9 @@ module Main where import Control.Monad.IO.Class (liftIO) import Data.Int (Int32, Int64) -import Google.Test (googleTest) +import Test.Framework (defaultMain, Test) import Lens.Family2 ((.~)) import System.IO.Temp (withSystemTempDirectory) -import Test.Framework (Test) import Test.Framework.Providers.HUnit (testCase) import Test.HUnit ((@=?)) import qualified Data.ByteString.Char8 as B8 @@ -106,10 +105,11 @@ testRereadRef = testCase "testReRunAssign" $ TF.runSession $ do liftIO $ (0.0, 0.1) @=? (TF.unScalar f0, TF.unScalar f1) main :: IO () -main = googleTest [ testSaveRestore - , testSize - , testReducedShape - , testPlaceholderCse - , testScalarFeedCse - , testRereadRef - ] +main = defaultMain + [ testSaveRestore + , testSize + , testReducedShape + , testPlaceholderCse + , testScalarFeedCse + , testRereadRef + ] diff --git a/tensorflow-queue/tests/QueueTest.hs b/tensorflow-ops/tests/QueueTest.hs similarity index 94% rename from tensorflow-queue/tests/QueueTest.hs rename to tensorflow-ops/tests/QueueTest.hs index cb4c6ab..d5aca7b 100644 --- a/tensorflow-queue/tests/QueueTest.hs +++ b/tensorflow-ops/tests/QueueTest.hs @@ -20,7 +20,7 @@ module Main where import Control.Monad.IO.Class (liftIO) import Data.Int (Int64) -import Google.Test (googleTest) +import Test.Framework (defaultMain, Test) import TensorFlow.Types (ListOf(..), Scalar(..), (/:/)) import TensorFlow.Ops (scalar) import TensorFlow.Queue @@ -31,7 +31,6 @@ import TensorFlow.Session , runSession , run_ ) -import Test.Framework (Test) import Test.Framework.Providers.HUnit (testCase) import Test.HUnit ((@=?)) import qualified Data.ByteString as BS @@ -85,7 +84,8 @@ testAsync = testCase "testAsync" $ runSession $ do run deq >>= liftIO . (expected @=?) main :: IO () -main = googleTest [ testBasic - , testPump - , testAsync - ] +main = defaultMain + [ testBasic + , testPump + , testAsync + ] diff --git a/tensorflow-ops/tests/TypesTest.hs b/tensorflow-ops/tests/TypesTest.hs index a7fdc84..93c976a 100644 --- a/tensorflow-ops/tests/TypesTest.hs +++ b/tensorflow-ops/tests/TypesTest.hs @@ -26,8 +26,7 @@ import Control.Monad (replicateM) import Control.Monad.IO.Class (liftIO) import Data.Int (Int64) -import Google.Test (googleTest) -import Test.Framework (Test) +import Test.Framework (defaultMain, Test) import Test.Framework.Providers.HUnit (testCase) import Test.Framework.Providers.QuickCheck2 (testProperty) import Test.HUnit ((@=?)) @@ -126,9 +125,10 @@ typeConstraintTests = testCase "type constraints" $ do main :: IO () -main = googleTest [ testFFIRoundTrip - , testEncodeDecodeQcFloat - , testEncodeDecodeQcInt64 - , testEncodeDecodeQcString - , typeConstraintTests - ] +main = defaultMain + [ testFFIRoundTrip + , testEncodeDecodeQcFloat + , testEncodeDecodeQcInt64 + , testEncodeDecodeQcString + , typeConstraintTests + ] diff --git a/tensorflow-ops/tests/VariableTest.hs b/tensorflow-ops/tests/VariableTest.hs index e9cf303..f752a60 100644 --- a/tensorflow-ops/tests/VariableTest.hs +++ b/tensorflow-ops/tests/VariableTest.hs @@ -3,7 +3,6 @@ module Main (main) where import Control.Monad.IO.Class (liftIO) import qualified Data.Vector.Storable as V -import Google.Test (googleTest) import TensorFlow.Core ( unScalar , render @@ -19,17 +18,18 @@ import TensorFlow.Variable , assignAdd , variable ) -import Test.Framework (Test) +import Test.Framework (defaultMain, Test) import Test.Framework.Providers.HUnit (testCase) import Test.HUnit ((@=?)) main :: IO () -main = googleTest [ testInitializedVariable - , testInitializedVariableShape - , testDependency - , testRereadRef - , testAssignAdd - ] +main = defaultMain + [ testInitializedVariable + , testInitializedVariableShape + , testDependency + , testRereadRef + , testAssignAdd + ] testInitializedVariable :: Test testInitializedVariable = diff --git a/tensorflow-queue/LICENSE b/tensorflow-queue/LICENSE deleted file mode 100644 index f89eb33..0000000 --- a/tensorflow-queue/LICENSE +++ /dev/null @@ -1,203 +0,0 @@ -Copyright 2016 The TensorFlow Authors. All rights reserved. - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2016, The TensorFlow Authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/tensorflow-queue/Setup.hs b/tensorflow-queue/Setup.hs deleted file mode 100644 index e8ef27d..0000000 --- a/tensorflow-queue/Setup.hs +++ /dev/null @@ -1,3 +0,0 @@ -import Distribution.Simple - -main = defaultMain diff --git a/tensorflow-queue/tensorflow-queue.cabal b/tensorflow-queue/tensorflow-queue.cabal deleted file mode 100644 index bd0e562..0000000 --- a/tensorflow-queue/tensorflow-queue.cabal +++ /dev/null @@ -1,53 +0,0 @@ -name: tensorflow-queue -version: 0.1.0.0 -synopsis: Basic access to TensorFlow queues. -description: Please see README.md -homepage: https://github.com/tensorflow/haskell#readme -license: Apache -license-file: LICENSE -author: TensorFlow authors -maintainer: tensorflow-haskell@googlegroups.com -copyright: Google Inc. -category: Machine Learning -build-type: Simple -cabal-version: >=1.22 - -library - hs-source-dirs: src - exposed-modules: TensorFlow.Queue - build-depends: proto-lens == 0.2.* - , base >= 4.7 && < 5 - , bytestring - , lens-family - , containers - , tensorflow-proto == 0.1.* - , tensorflow-core-ops == 0.1.* - , tensorflow - , text - default-language: Haskell2010 - -Test-Suite QueueTest - default-language: Haskell2010 - type: exitcode-stdio-1.0 - main-is: QueueTest.hs - hs-source-dirs: tests - -- Uses multiple threads and blocks without this option. - ghc-options: -threaded - build-depends: HUnit - , base - , bytestring - , proto-lens - , lens-family - , google-shim - , tensorflow - , tensorflow-core-ops - , tensorflow-ops - , tensorflow-queue - , test-framework - , test-framework-hunit - , transformers - , vector - -source-repository head - type: git - location: https://github.com/tensorflow/haskell diff --git a/tensorflow/tensorflow.cabal b/tensorflow/tensorflow.cabal index 2233078..79bb48c 100644 --- a/tensorflow/tensorflow.cabal +++ b/tensorflow/tensorflow.cabal @@ -85,7 +85,6 @@ Test-Suite VarIntTest build-depends: base , attoparsec , bytestring - , google-shim , tensorflow , test-framework , test-framework-quickcheck2 diff --git a/tensorflow/tests/VarIntTest.hs b/tensorflow/tests/VarIntTest.hs index 3ad62a5..7df88c4 100644 --- a/tensorflow/tests/VarIntTest.hs +++ b/tensorflow/tests/VarIntTest.hs @@ -15,8 +15,7 @@ module Main where import Data.ByteString.Builder (toLazyByteString) -import Google.Test (googleTest) -import Test.Framework (Test) +import Test.Framework (defaultMain, Test) import Test.Framework.Providers.QuickCheck2 (testProperty) import qualified Data.Attoparsec.ByteString.Lazy as Atto @@ -30,5 +29,5 @@ testEncodeDecode = testProperty "testEncodeDecode" $ \x -> Right y -> x == y main :: IO () -main = googleTest [ testEncodeDecode - ] +main = defaultMain [ testEncodeDecode + ]