Upgrade to LTS 24.34 (GHC 9.10.3), fix all warnings

lostbean · lostbean · commit dc87de28d6f7 · 2026-03-17T16:05:55.000-03:00
- Upgrade stack resolver from lts-22.11 (GHC 9.6.4) to lts-24.34 (GHC 9.10.3)
- Fix all compilation warnings across entire monorepo
- Replace deprecated * with Type from Data.Kind
- Add TypeOperators extension where ~ is used
- Remove redundant imports (foldl' now in Prelude, Data.Monoid, Debug.Trace)
- Replace partial head with safe pattern matching
- Fix deprecated ghc-options (-auto-all, -caf-all, -rtsopts/-threaded for libs)
- Move test functions from library code to test files
- Fix incomplete pattern matches
- Add missing other-modules in executable section
- Widen dependency bounds for GHC 9.10 compatibility
diff --git a/VirMat.cabal b/VirMat.cabal
@@ -19,7 +19,23 @@ flag generator
 executable virmatgen
   hs-source-dirs: src
   main-is:        Main.hs
-  ghc-options:    -Wall -O3 -threaded -rtsopts -auto-all -caf-all
+  ghc-options:    -Wall -O3 -threaded -rtsopts -fprof-auto -fprof-cafs
+  other-modules:
+    VirMat.Core.FlexMicro
+    VirMat.Core.Packer
+    VirMat.Core.Sampling
+    VirMat.Core.VoronoiMicro
+    VirMat.Distributions.GrainSize.GrainDistributionGenerator
+    VirMat.Distributions.GrainSize.GrainQuery
+    VirMat.Distributions.Texture.ODFSampling
+    VirMat.IO.Export.ANG.RasterEngine
+    VirMat.IO.Import.CommandLine
+    VirMat.IO.Import.Types
+    VirMat.PhaseTrans
+    VirMat.Run2D
+    VirMat.Run3D
+    VirMat.Types
+
   build-depends:
       base                    >=4    && <5
     , containers              >=0.5
diff --git a/packages/DeUni b/packages/DeUni
@@ -1 +1 @@
-Subproject commit d0d843d776a782417d73d539ef5bf3e45df2ebf7
+Subproject commit 34823dd78db41f1a2ebbb0baf4c49c33464a563e
diff --git a/packages/SubZero b/packages/SubZero
@@ -1 +1 @@
-Subproject commit 87193519ee677f5b584d5912c54483d2eb5f74a9
+Subproject commit 97a042aa08dadd3c0eeefb115b0449530bfc816f
diff --git a/packages/VTK b/packages/VTK
@@ -1 +1 @@
-Subproject commit b6366773fc5596cbb9189173fb4dd32f0100389b
+Subproject commit 1c21f6928c788c7c5e248d1429332cb0240a3e22
diff --git a/packages/hammer b/packages/hammer
@@ -1 +1 @@
-Subproject commit f3be71c63098de0b8b9cb578c07a537c7df86e18
+Subproject commit 1e73398b0bd30c31bb0bbfcbb62157dcc9ffc92a
diff --git a/packages/linear-vect b/packages/linear-vect
@@ -1 +1 @@
-Subproject commit 200f7fdcb33b1be8d88b25d91001006697eb1266
+Subproject commit c6e38b78a0ee5d496792d29b505484eee0a469fa
diff --git a/packages/mcl b/packages/mcl
@@ -1 +1 @@
-Subproject commit d86c2c559bb51b48a6d2c38218403270907d5713
+Subproject commit 03bff8d61f59e4a945e0dbbc0605686a26beb211
diff --git a/packages/queryforest b/packages/queryforest
@@ -1 +1 @@
-Subproject commit d8b838feb7a667d7bafef10f9c205a8f4ae44c29
+Subproject commit 391ccd7e1625c715b1579bb2e0a099f3af1309b6
diff --git a/packages/sledge b/packages/sledge
@@ -1 +1 @@
-Subproject commit 2a83853d49667cd8d8f270a8bb8c288f75a128c0
+Subproject commit 5998c45ab0e0517452fad8c7eeb58d44685921a2
diff --git a/src/VirMat/Core/FlexMicro.hs b/src/VirMat/Core/FlexMicro.hs
@@ -25,6 +25,7 @@ module VirMat.Core.FlexMicro (
 import qualified Data.HashMap.Strict as HM
 import qualified Data.HashSet as HS
 import qualified Data.IntSet as IS
+import Data.Kind (Type)
 import qualified Data.List as L
 import Data.Maybe
 import Data.Vector (Vector)
@@ -44,7 +45,7 @@ class FlexMicroBuilder v where
     the values are store separately in order to allow fast update of values. The topology is
     represented by @MicroGraph@.
     -}
-    data FlexMicro v a :: *
+    data FlexMicro v a :: Type
 
     {- | This function converts a Voronoi microstructure (convex polygonal geomerty)
     to flexible microstructure where arbitrary shape of grains are allowed.
diff --git a/src/VirMat/Core/Packer.hs b/src/VirMat/Core/Packer.hs
@@ -14,13 +14,11 @@ import Data.IntMap (IntMap)
 import qualified Data.IntMap as IM
 import Data.IntSet (IntSet)
 import qualified Data.IntSet as IS
-import Data.List (foldl')
 import Data.Vector (Vector, (!))
 import qualified Data.Vector as V
 import Linear.Vect
 
 import DeUni.DeWall
-import Hammer.VTK
 
 runPacker ::
     (Packer v, Buildable S2 v, Norm Double v) =>
@@ -208,69 +206,3 @@ instance Packer Vec3 where
             newZ = forceInBox z zMin3D zMax3D
          in
             (Vec3 newX newY newZ)
-
--- ============================= Testing ================================
-
-testForce :: [Double] -> [Double]
-testForce = map (norm . force (WPoint 1 (Vec2 0 0)) . WPoint 5 . Vec2 0.1)
-
-icosahedron :: Double -> Vec3D -> (Vector Vec3D, Vector (Int, Int, Int))
-icosahedron r pos =
-    let
-        t = (1 + sqrt 5) / 2 -- golden ratio
-        k = 1 / sqrt (1 + t * t) -- correct the radius. For (0, 1, phi) the edge
-        -- is 2 then the radius is sqrt(1+phi*phi)
-        points =
-            V.fromList
-                [ (t, 1, 0)
-                , (-t, 1, 0)
-                , (t, -1, 0)
-                , (-t, -1, 0)
-                , (1, 0, t)
-                , (1, 0, -t)
-                , (-1, 0, t)
-                , (-1, 0, -t)
-                , (0, t, 1)
-                , (0, -t, 1)
-                , (0, t, -1)
-                , (0, -t, -1)
-                ]
-        tri =
-            V.fromList
-                [ (0, 8, 4)
-                , (0, 5, 10)
-                , (2, 4, 9)
-                , (2, 11, 5)
-                , (1, 6, 8)
-                , (1, 10, 7)
-                , (3, 9, 6)
-                , (3, 7, 11)
-                , (0, 10, 8)
-                , (1, 8, 10)
-                , (2, 9, 11)
-                , (3, 9, 11)
-                , (4, 2, 0)
-                , (5, 0, 2)
-                , (6, 1, 3)
-                , (7, 3, 1)
-                , (8, 6, 4)
-                , (9, 4, 6)
-                , (10, 5, 7)
-                , (11, 7, 5)
-                ]
-     in
-        (V.map ((pos &+) . (r * k *&) . (\(x, y, z) -> Vec3 x y z)) points, tri)
-
-writeWPointsVTKfile :: String -> SetPoint Vec3 -> IO ()
-writeWPointsVTKfile file points =
-    let
-        vtks = V.imap foo points
-        foo nid x =
-            let
-                (ps, cs) = icosahedron (radius x) (point x)
-                psU = V.convert ps
-                attr = mkCellAttr "GrainID" (\_ _ _ -> nid)
-             in
-                mkUGVTK "WPoint" psU cs [] [attr]
-     in
-        writeMultiVTKfile file True vtks
diff --git a/src/VirMat/Distributions/GrainSize/GrainDistributionGenerator.hs b/src/VirMat/Distributions/GrainSize/GrainDistributionGenerator.hs
@@ -21,6 +21,7 @@ module VirMat.Distributions.GrainSize.GrainDistributionGenerator (
 ) where
 
 import Data.IORef
+import Data.Kind (Type)
 import Data.Random
 import Data.Vector (Vector)
 import qualified Data.Vector as V
@@ -38,8 +39,8 @@ data DistributedPoints a
     }
 
 class GenRandom v where
-    type Ratio v :: *
-    data Extent v :: *
+    type Ratio v :: Type
+    data Extent v :: Type
 
     -- | Bounding box ratio
     defRatio :: Ratio v
diff --git a/src/VirMat/Distributions/GrainSize/GrainQuery.hs b/src/VirMat/Distributions/GrainSize/GrainQuery.hs
@@ -2,6 +2,7 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE TypeOperators #-}
 
 module VirMat.Distributions.GrainSize.GrainQuery (
     Volume (getVolume),
diff --git a/src/VirMat/IO/Export/ANG/RasterEngine.hs b/src/VirMat/IO/Export/ANG/RasterEngine.hs
@@ -16,7 +16,6 @@ import Data.Vector (Vector)
 import qualified Data.Vector as V
 import qualified Data.Vector.Mutable as VM
 import DeUni.Dim2.Base2D
-import DeUni.Types
 import File.ANGReader
 import Hammer.MicroGraph
 import Linear.Vect
@@ -125,7 +124,9 @@ rasterTriangleFaster g p1 p2 p3
                 ++ fillTopFlatTriangle g v2 v4 v3
   where
     -- sort the vertices by y-coordinate, the v1 is the topmost vertice
-    [v1, v2, v3] = sortBy (compare `on` _2) [p1, p2, p3]
+    (v1, v2, v3) = case sortBy (compare `on` _2) [p1, p2, p3] of
+        [a, b, c] -> (a, b, c)
+        _ -> error "rasterTriangleFaster: unexpected number of vertices"
     Vec2 v1x v1y = v1
     Vec2 _ v2y = v2
     Vec2 v3x v3y = v3
@@ -292,26 +293,3 @@ flexmicroToANG n step box fm@FlexMicro2D{..} =
                 V.mapM_ fillTriangle ts
      in
         a0{nodes = V.modify (\m -> mapM_ (func m) gs) (nodes a0)}
-
--- ====================================== testing ========================================
-
-test :: ANGdata
-test =
-    let
-        step = 0.5
-        box = Box2D{xMax2D = 10, xMin2D = 0, yMax2D = 10, yMin2D = 0}
-
-        a0 = angInit step box
-
-        xys = rasterTriangle (grid a0) (Vec2 1 1.2) (Vec2 1.4 8) (Vec2 7.1 8.1)
-        func m =
-            mapM_
-                ( \xy ->
-                    let
-                        pos = toLinPos (grid a0) xy
-                     in
-                        VM.write m pos (mkPoint zerorot 1 xy 1)
-                )
-                xys
-     in
-        a0{nodes = V.modify func (nodes a0)}
diff --git a/src/VirMat/PhaseTrans.hs b/src/VirMat/PhaseTrans.hs
@@ -12,7 +12,6 @@ import qualified Data.Vector as V
 import DeUni.Types
 import File.ANGReader
 import Hammer.MicroGraph
-import Hammer.VTK (writeMultiVTKfile)
 import Linear.Vect
 import Texture.Bingham
 import Texture.Orientation
@@ -89,16 +88,6 @@ getParentProp n microParent simProduct =
 
 -- ================================================================================
 
-testJob :: JobRequest
-testJob =
-    VoronoiJob
-        { dimension = Dimension2D
-        , distrType = RandomDistribution
-        , gsDist = [CombDist distJob]
-        , seed = Just 10
-        , output = Output "" "" []
-        }
-
 modDist :: Double -> [CombDist]
 modDist k = [CombDist $ distJob{normalMean = 5 / k}]
 
@@ -109,12 +98,3 @@ distJob =
         , normalMean = 5
         , normalVar = 1
         }
-
-runTest :: JobRequest -> IO ()
-runTest job = do
-    sim <- generateTransformation job
-    let
-        dir = "/Users/edgar/Desktop/"
-        showTex = RenderGrainProp ("Value", \_ x -> fmap unGrainID x)
-    writeMultiVTKfile (dir ++ "virmat-parent.vtu") True . renderFlexMicro [showGrainID, showTex] 1 . microParent $ sim
-    writeMultiVTKfile (dir ++ "virmat-product2.vtu") True . renderFlexMicro [showGrainID, showTex] 1 . microProduct $ sim
diff --git a/stack.yaml b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-22.11
+resolver: lts-24.34
 
 allow-newer: true
 
diff --git a/stack.yaml.lock b/stack.yaml.lock
@@ -13,7 +13,7 @@ packages:
     hackage: mersenne-random-pure64-0.2.0.5@sha256:8f98b614aeed639713f01155e912aa6ad117073d0863f5783d1577764fd85b1a,2426
 snapshots:
 - completed:
-    sha256: 2fdd7d3e54540062ef75ca0a73ca3a804c527dbf8a4cadafabf340e66ac4af40
-    size: 712469
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/11.yaml
-  original: lts-22.11
+    sha256: 45b164eaf5c16bd220d2c5d7ab9a66ca0cfbcde7753703a5cb3549172adde813
+    size: 728959
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/34.yaml
+  original: lts-24.34
diff --git a/test/PackerTest.hs b/test/PackerTest.hs
@@ -0,0 +1,96 @@
+module PackerTest where
+
+import Data.Vector (Vector)
+import qualified Data.Vector as V
+import DeUni.DeWall
+import Hammer.VTK
+import Linear.Vect
+
+import VirMat.Core.Packer (setForce)
+
+-- | Test force computation for a series of distances
+testForce :: [Double] -> [Double]
+testForce = map (norm . force (WPoint 1 (Vec2 0 0)) . WPoint 5 . Vec2 0.1)
+
+-- | Force between two weighted points
+force :: (Norm Double v, PointND v) => WPoint v -> WPoint v -> v Double
+force ref x
+    | freeDist <= 0 =
+        let
+            f = 4 * freeDist
+         in
+            dir &* (-1 * f * f)
+    | otherwise =
+        let
+            f = freeDist
+         in
+            dir &* f
+  where
+    delta = point x &- point ref
+    dir = normalize delta
+    ldelta = norm delta
+    totalR = radius x + radius ref
+    freeDist = ldelta - totalR
+
+-- | Generate icosahedron vertices and triangles
+icosahedron :: Double -> Vec3D -> (Vector Vec3D, Vector (Int, Int, Int))
+icosahedron r pos =
+    let
+        t = (1 + sqrt 5) / 2 -- golden ratio
+        k = 1 / sqrt (1 + t * t) -- correct the radius. For (0, 1, phi) the edge
+        -- is 2 then the radius is sqrt(1+phi*phi)
+        points =
+            V.fromList
+                [ (t, 1, 0)
+                , (-t, 1, 0)
+                , (t, -1, 0)
+                , (-t, -1, 0)
+                , (1, 0, t)
+                , (1, 0, -t)
+                , (-1, 0, t)
+                , (-1, 0, -t)
+                , (0, t, 1)
+                , (0, -t, 1)
+                , (0, t, -1)
+                , (0, -t, -1)
+                ]
+        tri =
+            V.fromList
+                [ (0, 8, 4)
+                , (0, 5, 10)
+                , (2, 4, 9)
+                , (2, 11, 5)
+                , (1, 6, 8)
+                , (1, 10, 7)
+                , (3, 9, 6)
+                , (3, 7, 11)
+                , (0, 10, 8)
+                , (1, 8, 10)
+                , (2, 9, 11)
+                , (3, 9, 11)
+                , (4, 2, 0)
+                , (5, 0, 2)
+                , (6, 1, 3)
+                , (7, 3, 1)
+                , (8, 6, 4)
+                , (9, 4, 6)
+                , (10, 5, 7)
+                , (11, 7, 5)
+                ]
+     in
+        (V.map ((pos &+) . (r * k *&) . (\(x, y, z) -> Vec3 x y z)) points, tri)
+
+-- | Write weighted points as VTK file using icosahedron approximation
+writeWPointsVTKfile :: String -> SetPoint Vec3 -> IO ()
+writeWPointsVTKfile file points =
+    let
+        vtks = V.imap foo points
+        foo nid x =
+            let
+                (ps, cs) = icosahedron (radius x) (point x)
+                psU = V.convert ps
+                attr = mkCellAttr "GrainID" (\_ _ _ -> nid)
+             in
+                mkUGVTK "WPoint" psU cs [] [attr]
+     in
+        writeMultiVTKfile file True vtks
diff --git a/test/PhaseTransTest.hs b/test/PhaseTransTest.hs
