move dependencies to reinforce-prelude

sentenai · Sep 30, 2017 · 5db65b9 · 5db65b9
1 parent 343fa0b
commit 5db65b9
Show file tree

Hide file tree

Showing 21 changed files with 139 additions and 108 deletions.
diff --git a/reinforce-algorithms/package.yaml b/reinforce-algorithms/package.yaml
@@ -18,20 +18,8 @@ default-extensions:
 
 dependencies:
   - base
-  - bytestring
-  - containers
-  - dlist
-  - hashable
-  - microlens-platform
-  - monad-loops
-  - mtl
-  - mwc-random
   - reinforce
-  - safe-exceptions
-  - statistics
-  - text
-  - unordered-containers
-  - vector
+  - reinforce-prelude
 
 library:
   source-dirs: src

diff --git a/reinforce-algorithms/reinforce-algorithms.cabal b/reinforce-algorithms/reinforce-algorithms.cabal
@@ -15,20 +15,8 @@ library
   ghc-options: -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates
   build-depends:
       base
-    , bytestring
-    , containers
-    , dlist
-    , hashable
-    , microlens-platform
-    , monad-loops
-    , mtl
-    , mwc-random
     , reinforce
-    , safe-exceptions
-    , statistics
-    , text
-    , unordered-containers
-    , vector
+    , reinforce-prelude
   exposed-modules:
       Reinforce.Agents
       Reinforce.Agents.DoubleQTable
@@ -54,20 +42,8 @@ test-suite spec
   ghc-options: -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates
   build-depends:
       base
-    , bytestring
-    , containers
-    , dlist
-    , hashable
-    , microlens-platform
-    , monad-loops
-    , mtl
-    , mwc-random
     , reinforce
-    , safe-exceptions
-    , statistics
-    , text
-    , unordered-containers
-    , vector
+    , reinforce-prelude
     , reinforce-algorithms
     , reinforce-environments
     , hspec

diff --git a/reinforce-environments-gym/package.yaml b/reinforce-environments-gym/package.yaml
@@ -39,16 +39,13 @@ default-extensions:
 
 
 dependencies:
-  - aeson           # >= 1.0  &&  <  1.1
   - base            # >= 4.9  &&  < 4.10
   - http-client
-  - mtl
   - reinforce
   - reinforce-environments
+  - reinforce-prelude
   - gym-http-api
   - servant-client
-  - text            # >= 1.2  &&  <  1.3
-  - vector          # >= 0.11 &&  < 0.12
 
 
 library:

diff --git a/reinforce-environments-gym/reinforce-environments-gym.cabal b/reinforce-environments-gym/reinforce-environments-gym.cabal
@@ -29,16 +29,13 @@ library
   default-extensions: NoImplicitPrelude MultiParamTypeClasses OverloadedStrings LambdaCase TypeFamilies
   ghc-options: -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates
   build-depends:
-      aeson
-    , base
+      base
     , http-client
-    , mtl
     , reinforce
     , reinforce-environments
+    , reinforce-prelude
     , gym-http-api
     , servant-client
-    , text
-    , vector
   exposed-modules:
       Environments.Gym.ClassicControl.AcrobotV1
       Environments.Gym.ClassicControl.CartPoleV0

diff --git a/reinforce-environments-gym/src/Environments/Gym/ClassicControl/AcrobotV1.hs b/reinforce-environments-gym/src/Environments/Gym/ClassicControl/AcrobotV1.hs
@@ -37,6 +37,8 @@ import qualified Environments.Gym.Internal as I
 
 import Data.Aeson.Types
 import OpenAI.Gym (GymEnv(AcrobotV1))
+import Servant.Client (BaseUrl)
+import Network.HTTP.Client (Manager)
 
 
 -- | The Acrobot's State

diff --git a/reinforce-environments-gym/src/Environments/Gym/ClassicControl/CartPoleV0.hs b/reinforce-environments-gym/src/Environments/Gym/ClassicControl/CartPoleV0.hs
@@ -38,6 +38,8 @@ import Control.MonadEnv (MonadEnv(..), Reward)
 import Environments.Gym.Internal (GymEnvironmentT)
 import qualified Environments.Gym.Internal as I
 import OpenAI.Gym (GymEnv(CartPoleV0))
+import Servant.Client (BaseUrl)
+import Network.HTTP.Client (Manager)
 
 
 -- ========================================================================= --

diff --git a/reinforce-environments-gym/src/Environments/Gym/ClassicControl/CartPoleV1.hs b/reinforce-environments-gym/src/Environments/Gym/ClassicControl/CartPoleV1.hs
@@ -37,6 +37,8 @@ module Environments.Gym.ClassicControl.CartPoleV1
 import Reinforce.Prelude hiding (State)
 import Data.CartPole
 import OpenAI.Gym (GymEnv(CartPoleV1))
+import Servant.Client (BaseUrl)
+import Network.HTTP.Client (Manager)
 import Environments.Gym.ClassicControl.CartPoleV0 as Env hiding
   ( runEnvironment
   , runEnvironmentT

diff --git a/reinforce-environments-gym/src/Environments/Gym/ClassicControl/MountainCarContinuousV0.hs b/reinforce-environments-gym/src/Environments/Gym/ClassicControl/MountainCarContinuousV0.hs
@@ -37,6 +37,8 @@ module Environments.Gym.ClassicControl.MountainCarContinuousV0
 
 import Reinforce.Prelude hiding (State)
 import OpenAI.Gym (GymEnv(MountainCarContinuousV0))
+import Servant.Client (BaseUrl)
+import Network.HTTP.Client (Manager)
 import Environments.Gym.ClassicControl.MountainCarV0 as Env hiding
   ( runEnvironment
   , runDefaultEnvironment

diff --git a/reinforce-environments-gym/src/Environments/Gym/ClassicControl/MountainCarV0.hs b/reinforce-environments-gym/src/Environments/Gym/ClassicControl/MountainCarV0.hs
@@ -45,7 +45,8 @@ import qualified Environments.Gym.Internal as I
 
 import Data.Aeson.Types
 import OpenAI.Gym (GymEnv(MountainCarV0))
-
+import Servant.Client (BaseUrl)
+import Network.HTTP.Client (Manager)
 
 -- | State of a car stuck between two hills
 data State = State

diff --git a/reinforce-environments-gym/src/Environments/Gym/ClassicControl/PendulumV0.hs b/reinforce-environments-gym/src/Environments/Gym/ClassicControl/PendulumV0.hs
@@ -35,6 +35,8 @@ import qualified Environments.Gym.Internal as I
 
 import Data.Aeson.Types
 import OpenAI.Gym (GymEnv(PendulumV0))
+import Servant.Client as X (BaseUrl)
+import Network.HTTP.Client as X (Manager)
 
 
 -- | State of a PendulumV0 environment

diff --git a/reinforce-environments-gym/src/Environments/Gym/ToyText/FrozenLakeV0.hs b/reinforce-environments-gym/src/Environments/Gym/ToyText/FrozenLakeV0.hs
@@ -41,6 +41,8 @@ import qualified Data.Vector as V
 import Data.Aeson
 import Data.Aeson.Types
 import OpenAI.Gym (GymEnv(FrozenLakeV0))
+import Servant.Client as X (BaseUrl)
+import Network.HTTP.Client as X (Manager)
 
 
 -- | The current position of the agent on the frozen lake

diff --git a/reinforce-environments/package.yaml b/reinforce-environments/package.yaml
@@ -16,7 +16,7 @@ description: See <https://github.com/Sentenai/reinforce README.md>.
     <https://github.com/openai/gym-http-api/ gym-http-api>, as well as
     haskell-native environments which provide a substantial speed-up to the
     http-server interface.
-    
+
     This is an environment-first library, with basic reinforcment
     learning algorithms being developed on branches in subpackages (see
     <https://github.com/Sentenai/reinforce#development-and-milestones
@@ -39,19 +39,13 @@ default-extensions:
 
 
 dependencies:
-  - aeson           # >= 1.0  &&  <  1.1
   - base            # >= 4.9  &&  < 4.10
-  - dlist           #
-  - mwc-random      # >= 0.13 &&  < 0.14
   - reinforce
-  - safe-exceptions # >= 0.1  &&  <  0.2
-  - vector          # >= 0.11 &&  < 0.12
+  - reinforce-prelude
 
 
 library:
   source-dirs: src
-  dependencies:
-    - gym-http-api
   reexported-modules:
     - Control.MonadEnv, Reinforce.Spaces.Action, Data.Logger, Data.Event, Reinforce.Spaces, Reinforce.Spaces.State
 

diff --git a/reinforce-environments/reinforce-environments.cabal b/reinforce-environments/reinforce-environments.cabal
@@ -29,14 +29,9 @@ library
   default-extensions: NoImplicitPrelude MultiParamTypeClasses OverloadedStrings LambdaCase TypeFamilies
   ghc-options: -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates
   build-depends:
-      aeson
-    , base
-    , dlist
-    , mwc-random
+      base
     , reinforce
-    , safe-exceptions
-    , vector
-    , gym-http-api
+    , reinforce-prelude
   exposed-modules:
       Data.CartPole
       Data.Gym

diff --git a/reinforce-prelude/LICENSE b/reinforce-prelude/LICENSE
@@ -0,0 +1 @@
+../LICENSE
diff --git a/reinforce-prelude/package.yaml b/reinforce-prelude/package.yaml
@@ -0,0 +1,57 @@
+name:        reinforce-prelude
+version:     0.0.0.1
+synopsis:    Reinforcement learning in Haskell
+category:    Reinforcement learning, machine learning, artificial intelligence
+author:      Sam Stites, Sentenai Inc.
+maintainer:  sam@sentenai.com
+github:      Sentenai/reinforce/reinforce-prelude
+license:     BSD3
+copyright:   2017 Sentenai, Inc.
+ghc-options: -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates
+    # -Wmissing-import-lists <-- due to NoImplicitPrelude.
+
+description: See <https://github.com/Sentenai/reinforce README.md>.
+    @reinforce@ is a library which exports an OpenAI-gym-like
+    typeclass, @MonadEnv@, with both an interface to the
+    <https://github.com/openai/gym-http-api/ gym-http-api>, as well as
+    haskell-native environments which provide a substantial speed-up to the
+    http-server interface.
+
+    This is an environment-first library, with basic reinforcment
+    learning algorithms being developed on branches in subpackages (see
+    <https://github.com/Sentenai/reinforce#development-and-milestones
+    Development and Milestones>). @reinforce@ is currently an "alpha"
+    release since it still needs some work defining some formal structures
+    around what state-spaces and action-spaces should look like,
+    however haskell's typesystem is expressive enough that this seems to be
+    more of a "nice-to-have."
+
+    It's in active development and has some beginner-friendly contributions -
+    from porting new gym environments to implementing new algorithms.
+
+
+default-extensions:
+  - NoImplicitPrelude
+
+library:
+  source-dirs: src
+  dependencies:
+    - aeson           # >= 1.0  &&  <  1.1
+    - base            # >= 4.9  &&  < 4.10
+    - dlist           # >= 0.8  &&  <  0.9
+    - hashable        # >= 1.2  &&  <  1.3
+    - http-client     # >= 0.4  &&  <  0.6
+    - mtl             # >= 2.2  &&  <  2.3
+    - microlens-platform
+    - mwc-random      # >= 0.13 &&  < 0.14
+    - primitive       # >= 0.6  &&  <  0.7
+    - safe-exceptions # >= 0.1  &&  <  0.2
+    - statistics      # >= 0.13 &&  < 0.14
+    - text            # >= 1.2  &&  <  1.3
+    - unordered-containers
+    - vector          # >= 0.11 &&  < 0.12
+
+  reexported-modules:
+    - Control.Monad.Primitive, Data.Text, Data.Vector, Statistics.Distribution, System.Random.MWC, Data.HashMap.Strict, Control.Exception.Safe, Data.Aeson, Data.Aeson.Types, Data.DList, Control.Monad.Except
+
+
diff --git a/reinforce-prelude/reinforce-prelude.cabal b/reinforce-prelude/reinforce-prelude.cabal
@@ -0,0 +1,53 @@
+-- This file has been generated from package.yaml by hpack version 0.18.1.
+--
+-- see: https://github.com/sol/hpack
+
+name:           reinforce-prelude
+version:        0.0.0.1
+synopsis:       Reinforcement learning in Haskell
+description:    See <https://github.com/Sentenai/reinforce README.md>. @reinforce@ is a library which exports an OpenAI-gym-like typeclass, @MonadEnv@, with both an interface to the <https://github.com/openai/gym-http-api/ gym-http-api>, as well as haskell-native environments which provide a substantial speed-up to the http-server interface.
+                This is an environment-first library, with basic reinforcment learning algorithms being developed on branches in subpackages (see <https://github.com/Sentenai/reinforce#development-and-milestones Development and Milestones>). @reinforce@ is currently an "alpha" release since it still needs some work defining some formal structures around what state-spaces and action-spaces should look like, however haskell's typesystem is expressive enough that this seems to be more of a "nice-to-have."
+                It's in active development and has some beginner-friendly contributions - from porting new gym environments to implementing new algorithms.
+category:       Reinforcement learning, machine learning, artificial intelligence
+homepage:       https://github.com/Sentenai/reinforce#readme
+bug-reports:    https://github.com/Sentenai/reinforce/issues
+author:         Sam Stites, Sentenai Inc.
+maintainer:     sam@sentenai.com
+copyright:      2017 Sentenai, Inc.
+license:        BSD3
+license-file:   LICENSE
+build-type:     Simple
+cabal-version:  >= 1.21
+
+source-repository head
+  type: git
+  location: https://github.com/Sentenai/reinforce
+  subdir: reinforce-prelude
+
+library
+  hs-source-dirs:
+      src
+  default-extensions: NoImplicitPrelude
+  ghc-options: -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates
+  build-depends:
+      aeson
+    , base
+    , dlist
+    , hashable
+    , http-client
+    , mtl
+    , microlens-platform
+    , mwc-random
+    , primitive
+    , safe-exceptions
+    , statistics
+    , text
+    , unordered-containers
+    , vector
+  exposed-modules:
+      Reinforce.Prelude
+  other-modules:
+      Paths_reinforce_prelude
+  reexported-modules:
+      Control.Monad.Primitive, Data.Text, Data.Vector, Statistics.Distribution, System.Random.MWC, Data.HashMap.Strict, Control.Exception.Safe, Data.Aeson, Data.Aeson.Types, Data.DList, Control.Monad.Except
+  default-language: Haskell2010
diff --git a/reinforce/src/Reinforce/Prelude.hs → reinforce-prelude/src/Reinforce/Prelude.hs b/reinforce/src/Reinforce/Prelude.hs → reinforce-prelude/src/Reinforce/Prelude.hs
@@ -49,11 +49,6 @@ import Lens.Micro.Platform             as X
 import Statistics.Distribution.Normal  as X (normalDistr, NormalDistribution)
 import System.Random.MWC               as X (GenIO, Variate)
 
--- ========================================================================= --
--- Gym-required types:
-import Servant.Client as X (BaseUrl(..), ServantError(..))
-import Network.HTTP.Client as X (Manager)
-
 -- ========================================================================= --
 
 import qualified Prelude as P (head)

diff --git a/reinforce/package.yaml b/reinforce/package.yaml
@@ -41,21 +41,7 @@ default-extensions:
 library:
   source-dirs: src
   dependencies:
-    - aeson           # >= 1.0  &&  <  1.1
     - base            # >= 4.9  &&  < 4.10
-    - dlist           # >= 0.8  &&  <  0.9
-    - hashable        # >= 1.2  &&  <  1.3
-    - http-client     # >= 0.4  &&  <  0.6
-    - mtl             # >= 2.2  &&  <  2.3
-    - microlens-platform
-    - mwc-random      # >= 0.13 &&  < 0.14
-    - primitive       # >= 0.6  &&  <  0.7
-    - safe-exceptions # >= 0.1  &&  <  0.2
-    - servant-client  # >= 0.10 &&  < 0.11
-    - servant-client  # >= 0.9  &&  < 0.10
-    - statistics      # >= 0.13 &&  < 0.14
-    - text            # >= 1.2  &&  <  1.3
-    - unordered-containers
-    - vector          # >= 0.11 &&  < 0.12
+    - reinforce-prelude
 
 
diff --git a/reinforce/reinforce.cabal b/reinforce/reinforce.cabal
@@ -30,29 +30,14 @@ library
   default-extensions: NoImplicitPrelude MultiParamTypeClasses OverloadedStrings LambdaCase TypeFamilies
   ghc-options: -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates
   build-depends:
-      aeson
-    , base
-    , dlist
-    , hashable
-    , http-client
-    , mtl
-    , microlens-platform
-    , mwc-random
-    , primitive
-    , safe-exceptions
-    , servant-client
-    , servant-client
-    , statistics
-    , text
-    , unordered-containers
-    , vector
+      base
+    , reinforce-prelude
   exposed-modules:
       Control.MonadEnv
       Control.MonadMWCRandom
       Data.Event
       Data.Logger
       Reinforce.Gym
-      Reinforce.Prelude
       Reinforce.Spaces
       Reinforce.Spaces.Action
       Reinforce.Spaces.State