hlint and format

Author: mstksg

backprop.cabal

@@ -62,20 +62,17 @@ library
     Prelude.Backprop.Explicit
     Prelude.Backprop.Num
 
-  other-modules:
-    Data.Type.Util
-    Numeric.Backprop.Internal
-
+  other-modules:    Data.Type.Util
   hs-source-dirs:   src
   ghc-options:
     -Wall -Wcompat -Wincomplete-record-updates -Wredundant-constraints
+    -Wunused-packages
 
   build-depends:
       base          >=4.7   && <5
     , containers
     , deepseq
     , microlens
-    , primitive
     , reflection
     , transformers
     , vector
@@ -96,7 +93,7 @@ benchmark backprop-mnist-bench
   hs-source-dirs:   bench
   ghc-options:
     -Wall -Wcompat -Wincomplete-record-updates -Wredundant-constraints
-    -threaded -rtsopts -with-rtsopts=-N -O2
+    -threaded -rtsopts -with-rtsopts=-N -O2 -Wunused-packages
 
   build-depends:
       backprop

bench/bench.hs

@@ -11,7 +11,6 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE TypeSynonymInstances #-}
 {-# LANGUAGE ViewPatterns #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
@@ -279,8 +278,8 @@ gradNetManual x t (Net (Layer w1 b1) (Layer w2 b2) (Layer w3 b3)) =
       o2 = o0 / konst o1
       -- o3 = - (log o2 <.> t)
       dEdO3 = 1
-      dEdO2 = dEdO3 * (-t / o2)
-      dEdO1 = -(dEdO2 <.> o0) / (o1 ** 2)
+      dEdO2 = - (dEdO3 * t / o2)
+      dEdO1 = -((dEdO2 <.> o0) / (o1 ** 2))
       dEdO0 = konst dEdO1 + dEdO2 / konst o1
       dEdZ3 = dEdO0 * o0
       dEdY3 = dEdZ3

src/Data/Type/Util.hs

@@ -1,9 +1,7 @@
-{-# LANGUAGE DataKinds #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE PatternSynonyms #-}
-{-# LANGUAGE PolyKinds #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}

src/Numeric/Backprop/Class.hs

@@ -3,8 +3,6 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DefaultSignatures #-}
 {-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE DeriveFoldable #-}
-{-# LANGUAGE DeriveFunctor #-}
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DeriveTraversable #-}
 {-# LANGUAGE EmptyCase #-}
@@ -72,7 +70,6 @@ import Control.Monad
 import Data.Coerce
 import Data.Complex
 import Data.Data
-import Data.Foldable hiding (toList)
 import Data.Functor.Compose
 import Data.Functor.Identity
 import qualified Data.Functor.Product as DFP
@@ -386,12 +383,10 @@ instance NFData a => NFData (NumBP a)
 instance Applicative NumBP where
   pure = NumBP
   {-# INLINE pure #-}
-  f <*> x = NumBP $ (runNumBP f) (runNumBP x)
+  f <*> x = NumBP $ runNumBP f (runNumBP x)
   {-# INLINE (<*>) #-}
 
 instance Monad NumBP where
-  return = NumBP
-  {-# INLINE return #-}
   x >>= f = f (runNumBP x)
   {-# INLINE (>>=) #-}
 

src/Numeric/Backprop/Explicit.hs

@@ -5,8 +5,6 @@
 {-# LANGUAGE FunctionalDependencies #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}

src/Numeric/Backprop/Internal.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE BangPatterns #-}
+{-# LANGUAGE BlockArguments #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE EmptyCase #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GADTs #-}
@@ -14,7 +14,6 @@
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeInType #-}
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE ViewPatterns #-}
 {-# OPTIONS_HADDOCK not-home #-}
 
@@ -672,8 +671,7 @@ initRunner (n, stns) (nx, xs) = do
   for_ (zip [n - 1, n - 2 ..] stns) $ \(i, STN (TN{} :: TapeNode c)) ->
     MV.write delts i $ unsafeCoerce (Nothing @c)
   inps <- MV.new nx
-  for_ (zip [0 ..] xs) . uncurry $ \i z ->
-    MV.write inps i z
+  itraverse_ (MV.write inps) xs
   return $ R delts inps
 {-# INLINE initRunner #-}
 
@@ -910,6 +908,14 @@ itraverse f xs = evalStateT (traverse (StateT . go) xs) 0
     go x i = (,i + 1) <$> f i x
 {-# INLINE itraverse #-}
 
+-- Some utility functions to get around a lens dependency
+itraverse_ ::
+  forall t a b f.
+  (Foldable t, Monad f) =>
+  (Int -> a -> f b) -> t a -> f ()
+itraverse_ f xs = traverse_ (uncurry f) (zip [0 ..] (toList xs))
+{-# INLINE itraverse_ #-}
+
 ixi :: Int -> Lens' [a] a
 ixi _ _ [] = internalError "ixi"
 ixi 0 f (x : xs) = (: xs) <$> f x

src/Numeric/Backprop/Num.hs

@@ -1,7 +1,6 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE GADTs #-}
-{-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE RankNTypes #-}
 {-# OPTIONS_HADDOCK not-home #-}
 

src/Numeric/Backprop/Op.hs

@@ -3,9 +3,9 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE UndecidableInstances #-}
 
@@ -122,7 +122,7 @@ import Control.Applicative
 import Data.Bifunctor
 import Data.Coerce
 import Data.Functor.Identity
-import Data.List
+import Data.List (foldl')
 import Data.Type.Util
 import Data.Vinyl.Core
 import qualified Data.Vinyl.Recursive as VR
@@ -416,15 +416,15 @@ noGrad f = Op $ \xs ->
 -- 'idOp' = 'opIso' 'id' 'id'
 -- @
 idOp :: Op '[a] a
-idOp = op1 $ \x -> (x, id)
+idOp = op1 (,id)
 {-# INLINE idOp #-}
 
 -- | An 'Op' that takes @as@ and returns exactly the input tuple.
 --
 -- >>> gradOp' opTup (1 :& 2 :& 3 :& RNil)
 -- (1 :& 2 :& 3 :& RNil, 1 :& 1 :& 1 :& RNil)
 opTup :: Op as (Rec Identity as)
-opTup = Op $ \xs -> (xs, id)
+opTup = Op (,id)
 {-# INLINE opTup #-}
 
 -- | An 'Op' that runs the input value through an isomorphism.
@@ -694,7 +694,7 @@ instance (RPureConstrained Num as, Floating a) => Floating (Op as a) where
 
 -- | 'Op' for division
 (/.) :: Fractional a => Op '[a, a] a
-(/.) = op2 $ \x y -> (x / y, \g -> (g / y, -g * x / (y * y)))
+(/.) = op2 $ \x y -> (x / y, \g -> (g / y, -(g * x / (y * y))))
 {-# INLINE (/.) #-}
 
 -- | 'Op' for exponentiation
@@ -746,7 +746,7 @@ sqrtOp = op1 $ \x -> (sqrt x, (/ (2 * sqrt x)))
 logBaseOp :: Floating a => Op '[a, a] a
 logBaseOp = op2 $ \x y ->
   ( logBase x y
-  , let dx = -logBase x y / (log x * x)
+  , let dx = -(logBase x y / (log x * x))
      in \g -> (g * dx, g / (y * log x))
   )
 {-# INLINE logBaseOp #-}