Commit 1f7535d2 authored by Alexandre Delanoë's avatar Alexandre Delanoë

[WIP]

parent 0bcef269
#!/bin/bash #!/bin/bash
tmux kill-session -t gargantext tmux kill-session -t gargantext
docker ps -a | grep garg | awk '{print $1}' | while read p; do
docker stop $p && docker rm $p
done
{ pkgs ? import ./pinned-21.11.nix {} }: { pkgs ? import ./pinned-22.05.nix {} }:
rec { rec {
inherit pkgs; inherit pkgs;
...@@ -6,6 +6,7 @@ rec { ...@@ -6,6 +6,7 @@ rec {
hsBuildInputs = [ hsBuildInputs = [
ghc ghc
pkgs.cabal-install pkgs.cabal-install
pkgs.haskellPackages.llvm-hs
]; ];
nonhsBuildInputs = with pkgs; [ nonhsBuildInputs = with pkgs; [
bzip2 bzip2
...@@ -30,8 +31,8 @@ rec { ...@@ -30,8 +31,8 @@ rec {
expat expat
icu icu
graphviz graphviz
llvm libffi
libllvm llvmPackages_9.llvm
]; ];
libPaths = pkgs.lib.makeLibraryPath nonhsBuildInputs; libPaths = pkgs.lib.makeLibraryPath nonhsBuildInputs;
shellHook = '' shellHook = ''
......
...@@ -9,5 +9,5 @@ LOGFILE=$FOLDER"/"$FILE ...@@ -9,5 +9,5 @@ LOGFILE=$FOLDER"/"$FILE
mkdir -p $FOLDER mkdir -p $FOLDER
#env LANG=en_US.UTF-8 ~/.local/bin/gargantext-server --ini gargantext.ini --run Dev +RTS > $LOGFILE 2>&1 & tail -F $LOGFILE # -p env LANG=en_US.UTF-8 ~/.local/bin/gargantext-server --ini gargantext.ini --run Dev +RTS > $LOGFILE 2>&1 & tail -F $LOGFILE # -p
env LANG=en_US.UTF-8 stack --docker exec gargantext-server -- --ini gargantext.ini --run Dev +RTS > $LOGFILE 2>&1 & tail -F $LOGFILE # -p #env LANG=en_US.UTF-8 stack --docker exec gargantext-server -- --ini gargantext.ini --run Dev +RTS > $LOGFILE 2>&1 & tail -F $LOGFILE # -p
...@@ -133,8 +133,10 @@ cooc2graphWith' doPartitions distance threshold myCooc = do ...@@ -133,8 +133,10 @@ cooc2graphWith' doPartitions distance threshold myCooc = do
confluence' = confluence (Map.keys bridgeness') 3 True False confluence' = confluence (Map.keys bridgeness') 3 True False
seq bridgeness' $ printDebug "bridgeness OK" () seq bridgeness' $ printDebug "bridgeness OK" ()
seq confluence' $ printDebug "confluence OK" () seq confluence' $ printDebug "confluence OK" ()
pure $ data2graph ti diag bridgeness' confluence' partitions saveAsFileDebug "/tmp/confluence" confluence'
let g = data2graph ti diag bridgeness' confluence' partitions
saveAsFileDebug "/tmp/graph" g
pure g
doDistanceMap :: Distance doDistanceMap :: Distance
-> Threshold -> Threshold
......
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