Skip to content

Commit ec14c20

Browse files
committed
feat: update examples to use new column declaration method
1 parent 49244f3 commit ec14c20

7 files changed

Lines changed: 13 additions & 8 deletions

File tree

cabal.project

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
packages:
22
.
3+
examples
34
dataframe-fastcsv
45
dataframe-hasktorch
56
dataframe-persistent

examples/CaliforniaHousing.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import Torch
2424
import Data.Text (Text)
2525
import DataFrame.Operators
2626

27-
$( F.declareColumnsFromCsvWithOpts
27+
$( D.declareColumnsFromCsvWithOpts
2828
(D.defaultReadOptions{D.typeSpec = D.InferFromSample 300})
2929
"../data/housing.csv"
3030
)

examples/Chipotle.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import Data.Text (Text)
1414
import DataFrame.Monad
1515
import DataFrame.Operators
1616

17-
$( F.declareColumnsFromCsvWithOpts
17+
$( D.declareColumnsFromCsvWithOpts
1818
(D.defaultReadOptions{D.columnSeparator = '\t'})
1919
"../data/chipotle.tsv"
2020
)

examples/examples.cabal

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ synopsis: Examples for dataframe library.
77
description: Examples for dataframe library.
88

99
bug-reports: https://github.com/mchav/dataframe/issues
10-
license: GPL-3.0-or-later
11-
license-file: LICENSE
10+
license: MIT
1211
author: Michael Chavinda
1312
maintainer: mschavinda@gmail.com
1413

@@ -68,6 +67,7 @@ executable examples
6867
DataFrame.IO.Parquet.Levels,
6968
DataFrame.IO.Parquet.Page,
7069
DataFrame.IO.Parquet.Seeking,
70+
DataFrame.IO.Parquet.Schema,
7171
DataFrame.IO.Parquet.Thrift,
7272
DataFrame.IO.Parquet.Time,
7373
DataFrame.IO.Parquet.Utils,
@@ -94,6 +94,9 @@ executable examples
9494
DataFrame.Typed.Aggregate,
9595
DataFrame.Typed.TH,
9696
DataFrame.Typed.Expr,
97+
DataFrame.Typed.Generic,
98+
DataFrame.Typed.Record,
99+
DataFrame.TH,
97100
DataFrame.Typed
98101
hs-source-dirs: .,
99102
../src,

src/DataFrame/IO/Parquet.hs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# LANGUAGE CPP #-}
12
{-# LANGUAGE FlexibleContexts #-}
23
{-# LANGUAGE MonoLocalBinds #-}
34
{-# LANGUAGE NumericUnderscores #-}
@@ -17,7 +18,11 @@ import qualified Data.ByteString as BS
1718
import Data.Either (fromRight)
1819
import Data.Functor ((<&>))
1920
import Data.Int (Int32, Int64)
21+
#if !MIN_VERSION_base(4,20,0)
2022
import Data.List (foldl', transpose)
23+
#else
24+
import Data.List (transpose)
25+
#endif
2126
import qualified Data.List as L
2227
import qualified Data.Map as Map
2328
import qualified Data.Text as T

src/DataFrame/IO/Parquet/Encoding.hs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ import Control.Monad.ST (ST, runST)
1616
import Data.Bits
1717
import qualified Data.ByteString as BS
1818
import qualified Data.ByteString.Unsafe as BSU
19-
#if !MIN_VERSION_base(4,20,0)
20-
import Data.List (foldl')
21-
#endif
2219
import qualified Data.Vector.Unboxed as VU
2320
import qualified Data.Vector.Unboxed.Mutable as VUM
2421
import Data.Word

src/DataFrame/IO/Parquet/Utils.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ import DataFrame.Internal.Column (
4747
buildBitmapFromValid,
4848
fromList,
4949
)
50-
import DataFrame.Internal.Types (SBool (..), sUnbox)
5150
import qualified Streamly.Data.Fold as Fold
5251
import Streamly.Data.Stream (Stream)
5352
import qualified Streamly.Data.Stream as Stream

0 commit comments

Comments
 (0)