Commit e11115af authored by Grégoire Locqueville's avatar Grégoire Locqueville

Update to our latest version of IGraph

Our IGraph library was updated to fix [this issue](haskell-igraph#5).
parent 0db18836
Pipeline #7602 passed with stages
in 42 minutes and 58 seconds
...@@ -16,8 +16,8 @@ fi ...@@ -16,8 +16,8 @@ fi
# with the `sha256sum` result calculated on the `cabal.project` and # with the `sha256sum` result calculated on the `cabal.project` and
# `cabal.project.freeze`. This ensures the files stay deterministic so that CI # `cabal.project.freeze`. This ensures the files stay deterministic so that CI
# cache can kick in. # cache can kick in.
expected_cabal_project_hash="963418e37a17d4bb67d4b885613144b36d290f612eea80355e82abc7e76b450c" expected_cabal_project_hash="fcbc1b20e5d25b21bcae8a7704d947277c88868286236a6c0220cbd6bab7900d"
expected_cabal_project_freeze_hash="cd52143d3a9d285360b59c6371d3e258552c1bc115bd612024db3de1f7593ff7" expected_cabal_project_freeze_hash="cad171505c2922f5ec84c13915b2803c037b9c770a11471e908db3c417022d80"
cabal --store-dir=$STORE_DIR v2-build --dry-run cabal --store-dir=$STORE_DIR v2-build --dry-run
......
...@@ -87,7 +87,7 @@ source-repository-package ...@@ -87,7 +87,7 @@ source-repository-package
source-repository-package source-repository-package
type: git type: git
location: https://gitlab.iscpif.fr/gargantext/gargantext-graph.git location: https://gitlab.iscpif.fr/gargantext/gargantext-graph.git
tag: a08ceed71b297a811f90cb86c3c61dc0b153036b tag: 8bb4ade850ea96f9664b202672ea65081861e42d
subdir: gargantext-graph-core subdir: gargantext-graph-core
-- Support for GHC 9.6.x -- Support for GHC 9.6.x
...@@ -99,7 +99,7 @@ source-repository-package ...@@ -99,7 +99,7 @@ source-repository-package
source-repository-package source-repository-package
type: git type: git
location: https://gitlab.iscpif.fr/gargantext/haskell-igraph.git location: https://gitlab.iscpif.fr/gargantext/haskell-igraph.git
tag: 9f8a2f4a014539826a4eab3215cc70c0813f20cb tag: 786f459fea3d2ae4445c41af6f72ff7a689084cc
source-repository-package source-repository-package
type: git type: git
......
...@@ -25,8 +25,6 @@ constraints: any.Boolean ==0.2.4, ...@@ -25,8 +25,6 @@ constraints: any.Boolean ==0.2.4,
any.StateVar ==1.2.2, any.StateVar ==1.2.2,
any.accelerate ==1.3.0.0, any.accelerate ==1.3.0.0,
accelerate +bounds-checks -debug -internal-checks -nofib -unsafe-checks, accelerate +bounds-checks -debug -internal-checks -nofib -unsafe-checks,
any.accelerate-arithmetic ==1.0.0.1,
any.accelerate-utility ==1.0.0.1,
any.adjunctions ==4.4.2, any.adjunctions ==4.4.2,
any.aeson ==2.1.2.1, any.aeson ==2.1.2.1,
aeson -cffi +ordered-keymap, aeson -cffi +ordered-keymap,
...@@ -79,6 +77,8 @@ constraints: any.Boolean ==0.2.4, ...@@ -79,6 +77,8 @@ constraints: any.Boolean ==0.2.4,
any.blaze-builder ==0.4.2.3, any.blaze-builder ==0.4.2.3,
any.blaze-html ==0.9.2.0, any.blaze-html ==0.9.2.0,
any.blaze-markup ==0.8.3.0, any.blaze-markup ==0.8.3.0,
any.blaze-textual ==0.2.3.1,
blaze-textual -developer -integer-simple +native,
any.boolexpr ==0.3, any.boolexpr ==0.3,
any.boring ==0.2.2, any.boring ==0.2.2,
boring +tagged, boring +tagged,
...@@ -103,6 +103,7 @@ constraints: any.Boolean ==0.2.4, ...@@ -103,6 +103,7 @@ constraints: any.Boolean ==0.2.4,
cassava-conduit +small_base, cassava-conduit +small_base,
any.cborg ==0.2.10.0, any.cborg ==0.2.10.0,
cborg +optimize-gmp, cborg +optimize-gmp,
any.cborg-json ==0.2.6.0,
any.cereal ==0.5.8.3, any.cereal ==0.5.8.3,
cereal -bytestring-builder, cereal -bytestring-builder,
any.charset ==0.3.11, any.charset ==0.3.11,
...@@ -161,6 +162,8 @@ constraints: any.Boolean ==0.2.4, ...@@ -161,6 +162,8 @@ constraints: any.Boolean ==0.2.4,
any.dense-linear-algebra ==0.1.0.0, any.dense-linear-algebra ==0.1.0.0,
any.digest ==0.0.2.1, any.digest ==0.0.2.1,
digest -have_arm64_crc32c -have_builtin_prefetch -have_mm_prefetch -have_sse42 -have_strong_getauxval -have_weak_getauxval +pkg-config, digest -have_arm64_crc32c -have_builtin_prefetch -have_mm_prefetch -have_sse42 -have_strong_getauxval -have_weak_getauxval +pkg-config,
any.direct-sqlite ==2.3.29,
direct-sqlite +dbstat +fulltextsearch +haveusleep +json1 -mathfunctions -systemlib +urifilenames,
any.directory ==1.3.8.5, any.directory ==1.3.8.5,
any.discrimination ==0.5, any.discrimination ==0.5,
any.distributive ==0.6.2.1, any.distributive ==0.6.2.1,
...@@ -170,7 +173,6 @@ constraints: any.Boolean ==0.2.4, ...@@ -170,7 +173,6 @@ constraints: any.Boolean ==0.2.4,
any.double-conversion ==2.0.5.0, any.double-conversion ==2.0.5.0,
double-conversion -developer +embedded_double_conversion, double-conversion -developer +embedded_double_conversion,
any.easy-file ==0.2.5, any.easy-file ==0.2.5,
any.eigen ==3.3.7.0,
any.either ==5.0.2, any.either ==5.0.2,
any.ekg-core ==0.1.1.8, any.ekg-core ==0.1.1.8,
any.ekg-json ==0.1.1.1, any.ekg-json ==0.1.1.1,
...@@ -300,7 +302,6 @@ constraints: any.Boolean ==0.2.4, ...@@ -300,7 +302,6 @@ constraints: any.Boolean ==0.2.4,
any.linear ==1.23, any.linear ==1.23,
linear -herbie +template-haskell, linear -herbie +template-haskell,
any.list-t ==1.0.5.7, any.list-t ==1.0.5.7,
any.lockfree-queue ==0.2.4,
any.logict ==0.8.2.0, any.logict ==0.8.2.0,
any.loop ==0.3.0, any.loop ==0.3.0,
any.lzma ==0.0.1.1, any.lzma ==0.0.1.1,
...@@ -460,6 +461,7 @@ constraints: any.Boolean ==0.2.4, ...@@ -460,6 +461,7 @@ constraints: any.Boolean ==0.2.4,
any.servant-blaze ==0.9.1, any.servant-blaze ==0.9.1,
any.servant-client ==0.20.2, any.servant-client ==0.20.2,
any.servant-client-core ==0.20.2, any.servant-client-core ==0.20.2,
any.servant-conduit ==0.16.1,
any.servant-ekg ==0.3.1, any.servant-ekg ==0.3.1,
any.servant-openapi3 ==2.0.1.6, any.servant-openapi3 ==2.0.1.6,
any.servant-routes ==0.1.0.0, any.servant-routes ==0.1.0.0,
...@@ -487,6 +489,7 @@ constraints: any.Boolean ==0.2.4, ...@@ -487,6 +489,7 @@ constraints: any.Boolean ==0.2.4,
any.split ==0.2.5, any.split ==0.2.5,
any.splitmix ==0.1.1, any.splitmix ==0.1.1,
splitmix -optimised-mixer, splitmix -optimised-mixer,
any.sqlite-simple ==0.4.19.0,
any.statistics ==0.16.3.0, any.statistics ==0.16.3.0,
statistics -benchpapi, statistics -benchpapi,
any.stemmer ==0.5.2, any.stemmer ==0.5.2,
...@@ -571,7 +574,6 @@ constraints: any.Boolean ==0.2.4, ...@@ -571,7 +574,6 @@ constraints: any.Boolean ==0.2.4,
any.uri-encode ==1.5.0.7, any.uri-encode ==1.5.0.7,
uri-encode +network-uri -tools, uri-encode +network-uri -tools,
any.utf8-string ==1.0.2, any.utf8-string ==1.0.2,
any.utility-ht ==0.0.17.2,
any.uuid ==1.3.16, any.uuid ==1.3.16,
any.uuid-types ==1.0.6, any.uuid-types ==1.0.6,
any.validity ==0.12.1.0, any.validity ==0.12.1.0,
......
...@@ -264,7 +264,7 @@ getCoord ACP labels m n = to2d $ maybe (panic "Graph.Tools no coordinate") ident ...@@ -264,7 +264,7 @@ getCoord ACP labels m n = to2d $ maybe (panic "Graph.Tools no coordinate") ident
-- | KamadaKawai Layout -- | KamadaKawai Layout
-- TODO TEST: check labels, nodeId and coordinates -- TODO TEST: check labels, nodeId and coordinates
layout :: Map (Int, Int) Double -> Int -> Gen -> (Double, Double) layout :: Map (Int, Int) Double -> Int -> Gen s -> (Double, Double)
layout m n gen = maybe (panic "") identity $ Map.lookup n $ coord layout m n gen = maybe (panic "") identity $ Map.lookup n $ coord
where where
coord :: (Map Int (Double,Double)) coord :: (Map Int (Double,Double))
......
...@@ -55,8 +55,7 @@ spinglassAux :: (Serialize v, Serialize e, Show v) ...@@ -55,8 +55,7 @@ spinglassAux :: (Serialize v, Serialize e, Show v)
=> Int -- ^ Random seed => Int -- ^ Random seed
-> IG.Graph 'U v e -- ^ Input graph -> IG.Graph 'U v e -- ^ Input graph
-> IO [[v]] -- ^ List of clusters, in the form of lists of vertex labels -> IO [[v]] -- ^ List of clusters, in the form of lists of vertex labels
spinglassAux seed graph = do spinglassAux seed graph = IG.withSeed seed $ \gen -> do -- initialize random generator
gen <- IG.withSeed seed pure -- initialize random generator
rawClusters <- IG.findCommunity graph Nothing Nothing IG.spinglass gen -- perform clustering rawClusters <- IG.findCommunity graph Nothing Nothing IG.spinglass gen -- perform clustering
-- The clusters we get are composed of vertex IDs corresponding to the internal -- The clusters we get are composed of vertex IDs corresponding to the internal
-- representation of IGraph graphs, so we need to retrieve the vertex labels: -- representation of IGraph graphs, so we need to retrieve the vertex labels:
......
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
git: "https://gitlab.iscpif.fr/gargantext/crawlers/pubmed.git" git: "https://gitlab.iscpif.fr/gargantext/crawlers/pubmed.git"
subdirs: subdirs:
- . - .
- commit: a08ceed71b297a811f90cb86c3c61dc0b153036b - commit: 8bb4ade850ea96f9664b202672ea65081861e42d
git: "https://gitlab.iscpif.fr/gargantext/gargantext-graph.git" git: "https://gitlab.iscpif.fr/gargantext/gargantext-graph.git"
subdirs: subdirs:
- "gargantext-graph-core" - "gargantext-graph-core"
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
git: "https://gitlab.iscpif.fr/gargantext/haskell-gargantext-prelude" git: "https://gitlab.iscpif.fr/gargantext/haskell-gargantext-prelude"
subdirs: subdirs:
- . - .
- commit: 9f8a2f4a014539826a4eab3215cc70c0813f20cb - commit: 786f459fea3d2ae4445c41af6f72ff7a689084cc
git: "https://gitlab.iscpif.fr/gargantext/haskell-igraph.git" git: "https://gitlab.iscpif.fr/gargantext/haskell-igraph.git"
subdirs: subdirs:
- . - .
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment