Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consolidate some packages. #111

Merged
merged 1 commit into from
May 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
203 changes: 0 additions & 203 deletions google-shim/LICENSE

This file was deleted.

3 changes: 0 additions & 3 deletions google-shim/Setup.hs

This file was deleted.

24 changes: 0 additions & 24 deletions google-shim/google-shim.cabal

This file was deleted.

22 changes: 0 additions & 22 deletions google-shim/src/Google/Test.hs

This file was deleted.

3 changes: 0 additions & 3 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
resolver: lts-8.13

packages:
- google-shim
- tensorflow
- tensorflow-core-ops
- tensorflow-logging
Expand All @@ -10,8 +9,6 @@ packages:
- tensorflow-proto
- tensorflow-mnist
- tensorflow-mnist-input-data
- tensorflow-queue
- tensorflow-nn
- tensorflow-records
- tensorflow-records-conduit
- tensorflow-test
Expand Down
1 change: 0 additions & 1 deletion tensorflow-mnist/tensorflow-mnist.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ Test-Suite ParseTest
, bytestring
, proto-lens
, lens-family
, google-shim
, tensorflow
, tensorflow-mnist
, tensorflow-mnist-input-data
Expand Down
14 changes: 7 additions & 7 deletions tensorflow-mnist/tests/ParseTest.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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 ]
Loading