feat: Remove NFData instance from Columnable

Messes with persistent.

Author: mchav

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["9.4.8", "9.6.7", "9.8.4", "9.10.3", "9.12.2"]
+        ghc: ["9.6.7", "9.8.4", "9.10.3", "9.12.2"]
 
     steps:
       - uses: actions/checkout@v4

examples/Iris.lhs

@@ -26,7 +26,6 @@ Think of these like compiler flags in C++ or decorator syntax in Python:
 > {-# LANGUAGE OverloadedStrings #-}
 > {-# LANGUAGE RecordWildCards #-}
 > {-# LANGUAGE TypeApplications #-}
-> {-# LANGUAGE DeriveAnyClass #-}
 >
 > module Iris (run) where
 
@@ -45,7 +44,6 @@ in Python or `#include` in C++:
 > import qualified Data.Text as T
 > import qualified Data.Vector as V
 > import qualified Data.Vector.Unboxed as VU
-> import Control.DeepSeq
 > import GHC.Generics
 
 DataFrame is a Haskell library similar to pandas in Python:
@@ -73,7 +71,7 @@ as an algebraic data type (similar to an enum in other languages):
 >     = Setosa
 >     | Versicolor
 >     | Virginica
->     deriving (Eq, Show, Read, Ord, Enum, Generic, NFData)
+>     deriving (Eq, Show, Read, Ord, Enum)
 
 The `deriving` clause automatically generates useful functions:
 - `Eq`: Allows us to compare Iris values for equality

scripts/presubmit.sh

@@ -8,14 +8,14 @@ set -e
 cabal build
 cabal test
 
-cd examples
-
-cabal build all
-
 cd ../dataframe-persistent
 
 cabal build
 
 cd ../dataframe-hasktorch
 
 cabal build
+
+cd examples
+
+cabal build all

src/DataFrame/IO/CSV.hs

@@ -27,6 +27,7 @@ import qualified Data.Vector.Unboxed.Mutable as VUM
 import Data.Csv.Streaming (Records (..))
 import qualified Data.Csv.Streaming as CsvStream
 
+import Control.DeepSeq
 import Control.Monad
 import Data.Char
 import qualified Data.Csv as Csv
@@ -272,7 +273,7 @@ readSeparated :: ReadOptions -> FilePath -> IO DataFrame
 readSeparated opts !path = do
     let stripUtf8Bom bs = fromMaybe bs (BL.stripPrefix "\xEF\xBB\xBF" bs)
     csvData <- stripUtf8Bom <$> BL.readFile path
-    decodeSeparated opts csvData
+    fmap force (decodeSeparated opts csvData)
 
 decodeSeparated :: ReadOptions -> BL.ByteString -> IO DataFrame
 decodeSeparated !opts csvData = do

src/DataFrame/Internal/Column.hs

@@ -134,9 +134,9 @@ instance (Show a) => Show (TypedColumn a) where
     show (TColumn col) = show col
 
 instance NFData Column where
-    rnf (BoxedColumn (v :: VB.Vector a)) = rnf v
+    rnf (BoxedColumn (v :: VB.Vector a)) = VB.foldl' (const (`seq` ())) () v
     rnf (UnboxedColumn v) = v `seq` ()
-    rnf (OptionalColumn (v :: VB.Vector (Maybe a))) = rnf v
+    rnf (OptionalColumn (v :: VB.Vector (Maybe a))) = VB.foldl' (const (`seq` ())) () v
 
 instance Show Column where
     show :: Column -> String

src/DataFrame/Internal/Expression.hs

@@ -13,7 +13,6 @@
 
 module DataFrame.Internal.Expression where
 
-import Control.DeepSeq (NFData (..))
 import Data.String
 import qualified Data.Text as T
 import Data.Type.Equality (TestEquality (testEquality), type (:~:) (Refl))
@@ -38,9 +37,6 @@ data BinaryOp a b c = MkBinaryOp
 data MeanAcc = MeanAcc {-# UNPACK #-} !Double {-# UNPACK #-} !Int
     deriving (Show, Eq, Ord, Read)
 
-instance NFData MeanAcc where
-    rnf (MeanAcc _ _) = ()
-
 data AggStrategy a b where
     CollectAgg ::
         (VG.Vector v b, Typeable v) => T.Text -> (v b -> a) -> AggStrategy a b

src/DataFrame/Internal/Row.hs

@@ -17,7 +17,6 @@ import qualified Data.Vector.Algorithms.Merge as VA
 import qualified Data.Vector.Generic as VG
 import qualified Data.Vector.Unboxed as VU
 
-import Control.DeepSeq (NFData (..))
 import Control.Exception (throw)
 import Control.Monad.ST (runST)
 import Data.Function (on)
@@ -58,9 +57,6 @@ instance Show Any where
     show :: Any -> String
     show (Value a) = T.unpack (showValue a)
 
-instance NFData Any where
-    rnf (Value a) = rnf a
-
 showValue :: forall a. (Columnable a) => a -> T.Text
 showValue v = case testEquality (typeRep @a) (typeRep @T.Text) of
     Just Refl -> v

src/DataFrame/Internal/Types.hs

@@ -13,14 +13,13 @@
 
 module DataFrame.Internal.Types where
 
-import Control.DeepSeq (NFData)
 import Data.Int (Int16, Int32, Int64, Int8)
 import Data.Kind (Constraint, Type)
 import Data.Typeable (Typeable)
 import qualified Data.Vector.Unboxed as VU
 import Data.Word (Word16, Word32, Word64, Word8)
 
-type Columnable' a = (Typeable a, Show a, Ord a, Eq a, Read a, NFData a)
+type Columnable' a = (Typeable a, Show a, Ord a, Eq a, Read a)
 
 {- | A type with column representations used to select the
 "right" representation when specializing the `toColumn` function.

tests/Operations/Provenance.hs

@@ -3,9 +3,7 @@
 
 module Operations.Provenance where
 
-import qualified Data.List as L
 import qualified Data.Map as M
-import qualified Data.Text as T
 import qualified DataFrame as D
 import qualified DataFrame.Functions as F
 import qualified DataFrame.Internal.Column as DI