Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
manage cabal files, ignore profiling work
  • Loading branch information
Sam Stites committed Sep 30, 2018
1 parent 320860c commit d2da1cd
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 199 deletions.
16 changes: 16 additions & 0 deletions .gitignore
Expand Up @@ -23,6 +23,21 @@ output/raw
result
result-*

# profiling files
*.log
*.ps
*.hp
*.svg
*.folded
*.prof
*.svg

# old dependencies (moved to github.com/hasktorch/ffi)
vendor/

# files created by python examples
data/

# Created by https://www.gitignore.io/api/c,vim,c++,linux,macos,emacs,haskell

### C ###
Expand Down Expand Up @@ -241,3 +256,4 @@ tags
# End of https://www.gitignore.io/api/c,vim,c++,linux,macos,emacs,haskell



24 changes: 12 additions & 12 deletions examples/hasktorch-examples.cabal
Expand Up @@ -29,7 +29,7 @@ executable gradient-descent
ghc-options: -Wall -fno-cse
build-depends:
base >=4.7 && <5
, hasktorch-core
, hasktorch
, microlens >=0.4.8.1
, dimensions
, singletons
Expand All @@ -44,7 +44,7 @@ executable multivariate-normal
ghc-options: -Wall -fno-cse
build-depends:
base >=4.7 && <5
, hasktorch-core
, hasktorch
other-modules:
Paths_hasktorch_examples
default-language: Haskell2010
Expand All @@ -58,7 +58,7 @@ executable lasso
ghc-options: -Wall -fno-cse
build-depends:
base >=4.7 && <5
, hasktorch-core
, hasktorch
, microlens
other-modules:
Paths_hasktorch_examples
Expand All @@ -71,7 +71,7 @@ executable ad
ghc-options: -Wall -fno-cse
build-depends:
base >=4.7 && <5
, hasktorch-core
, hasktorch
, singletons
, dimensions
other-modules:
Expand All @@ -86,7 +86,7 @@ executable bayesian-regression
ghc-options: -Wall -fno-cse
build-depends:
base >=4.7 && <5
, hasktorch-core
, hasktorch
other-modules:
Paths_hasktorch_examples
if flag(cuda)
Expand All @@ -104,7 +104,7 @@ executable download-mnist
, cryptonite
, directory
, filepath
, hasktorch-core
, hasktorch
, network-uri
other-modules:
Paths_hasktorch_examples
Expand All @@ -117,7 +117,7 @@ executable ff-typed
ghc-options: -Wall -fno-cse
build-depends:
base >=4.7 && <5
, hasktorch-core
, hasktorch
, dimensions
other-modules:
Paths_hasktorch_examples
Expand All @@ -130,7 +130,7 @@ executable ff-untyped
ghc-options: -Wall -fno-cse
build-depends:
base >=4.7 && <5
, hasktorch-core
, hasktorch
, dimensions
, singletons
other-modules:
Expand All @@ -144,7 +144,7 @@ executable static-tensor-usage
ghc-options: -Wall -fno-cse
build-depends:
base >=4.7 && <5
, hasktorch-core
, hasktorch

other-modules:
Paths_hasktorch_examples
Expand All @@ -167,7 +167,7 @@ executable lenet-cifar10
build-depends:
base >=4.7 && <5
, backprop
, hasktorch-core
, hasktorch
, unordered-containers
, dimensions
, hasktorch-zoo
Expand Down Expand Up @@ -208,7 +208,7 @@ executable lenet-cifar10-initialization
, filepath
, unordered-containers
, ghc-typelits-natnormalise
, hasktorch-core
, hasktorch
, hasktorch-zoo

, dlist
Expand Down Expand Up @@ -245,7 +245,7 @@ executable lenet-cifar10-trainfour
, directory
, filepath
, ghc-typelits-natnormalise
, hasktorch-core
, hasktorch
, hasktorch-zoo

, dlist
Expand Down
33 changes: 18 additions & 15 deletions hasktorch/hasktorch-core.cabal → hasktorch/hasktorch.cabal
@@ -1,5 +1,5 @@
cabal-version: 2.2
name: hasktorch-core
name: hasktorch
version: 0.1.0.0
synopsis: Torch for tensors and neural networks in Haskell
description: core tensor abstractions wrapping raw TH bindings
Expand Down Expand Up @@ -28,7 +28,7 @@ executable memcheck
hs-source-dirs: exe
build-depends:
base >=4.7 && <5
, hasktorch-core
, hasktorch

test-suite spec
type: exitcode-stdio-1.0
Expand All @@ -42,7 +42,8 @@ test-suite spec
, base >=4.7 && <5
, dimensions
, ghc-typelits-natnormalise
, hasktorch-core
, hasktorch
, hasktorch-types-th
, hspec >=2.4.4
-- , hspec-discover
, singletons >= 2.4.1
Expand All @@ -51,22 +52,24 @@ test-suite spec
, mtl
, microlens-platform
, monad-loops
, managed
, singletons
, time
, transformers
other-modules:
Orphans
, MemorySpec
, RawLapackSVDSpec
, GarbageCollectionSpec
, Torch.Prelude.Extras
, Torch.Core.LogAddSpec
, Torch.Core.RandomSpec
-- , MemorySpec
-- , RawLapackSVDSpec
-- , GarbageCollectionSpec
-- , Torch.Prelude.Extras
-- , Torch.Core.LogAddSpec
-- , Torch.Core.RandomSpec

-- We can't move this to hasktorch-indef until backpack gets some updates:
, Torch.Static.TensorSpec
, Torch.Static.NN.AbsSpec
, Torch.Static.NN.LinearSpec
, Torch.StorageSpec
-- , Torch.Static.NN.AbsSpec
-- , Torch.Static.NN.LinearSpec
-- , Torch.Static.NN.Conv1dSpec
-- , Torch.Static.NN.Conv2dSpec
-- , Torch.Static.NN.ReLUSpec
Expand All @@ -78,7 +81,7 @@ library
hs-source-dirs: utils
build-depends:
base >=4.7 && <5
, hasktorch-core-cpu
, hasktorch-cpu
, hasktorch-types-th

, containers
Expand Down Expand Up @@ -149,7 +152,7 @@ library
}
if flag(cuda) {
build-depends:
hasktorch-core-gpu
hasktorch-gpu

reexported-modules:
Torch.Cuda.Long
Expand Down Expand Up @@ -188,7 +191,7 @@ library
}


library hasktorch-core-cpu
library hasktorch-cpu
hs-source-dirs: src, utils
default-language: Haskell2010
default-extensions: LambdaCase, DataKinds, TypeFamilies, TypeSynonymInstances
Expand Down Expand Up @@ -882,7 +885,7 @@ library hasktorch-core-cpu



library hasktorch-core-gpu
library hasktorch-gpu
hs-source-dirs: src, utils
default-language: Haskell2010
default-extensions: LambdaCase, DataKinds, TypeFamilies, TypeSynonymInstances
Expand Down
144 changes: 0 additions & 144 deletions indef/hasktorch-indef-gpu.cabal

This file was deleted.

File renamed without changes.

0 comments on commit d2da1cd

Please sign in to comment.