remove Layout

cbits/haskell_igraph.c

-#include <igraph/igraph.h>
 #include "haskell_attributes.h"
 
 const igraph_attribute_table_t igraph_haskell_attribute_table={

haskell-igraph.cabal

 cabal-version:       2.2
 name:                haskell-igraph
-version:             0.8.0.0
-synopsis:            Bindings to the igraph C library.
+version:             0.8.0
+synopsis:            Bindings to the igraph C library (v0.8.0).
 description:         igraph<"http://igraph.org/c/"> is a library for creating
                      and manipulating large graphs. This package provides the Haskell
                      interface of igraph.
@@ -28,10 +28,6 @@ extra-source-files:
   README.md
   ChangeLog.md
 
-Flag graphics
-  Description: Enable graphics output
-  Default:     False
-
 library
   exposed-modules:
     IGraph.Internal.Initialization
@@ -45,7 +41,7 @@ library
     IGraph.Algorithms.Structure
     IGraph.Algorithms.Community
     IGraph.Algorithms.Clique
-    IGraph.Algorithms.Layout
+    --IGraph.Algorithms.Layout
     IGraph.Algorithms.Motif
     IGraph.Algorithms.Generators
     IGraph.Algorithms.Isomorphism
@@ -62,7 +58,6 @@ library
     , containers
     , data-ordlist
     , primitive
-    , split
     , singletons
 
   extra-libraries:     stdc++

igraph/include/config.h

@@ -11,10 +11,8 @@
 #define HAVE_RINTF 1
 #define HAVE_ROUND 1
 #define HAVE_SNPRINTF 1
-#undef HAVE_ISFINITE
 
 /* libraries */
-#define HAVE_GMP 1
 #define HAVE_MEMORY_H 1
 #define HAVE_STDINT_H 1
 #define HAVE_STRINGS_H 1
@@ -39,4 +37,3 @@
 #define PACKAGE_VERSION "0.8.0"
 #define STDC_HEADERS 1
 #define VERSION "0.8.0"
\ No newline at end of file
-#undef YYTEXT_POINTER

include/bytestring.h

 #ifndef HASKELL_IGRAPH_BYTESTRING
 #define HASKELL_IGRAPH_BYTESTRING
 
-#include <igraph/igraph.h>
+#include "igraph.h"
 
 typedef struct bytestring_t {
   unsigned long int len;

include/haskell_attributes.h

 #ifndef HASKELL_IGRAPH_ATTRIBUTE
 #define HASKELL_IGRAPH_ATTRIBUTE
 
-#include "igraph/igraph.h"
+#include "igraph.h"
 #include "bytestring.h"
 
 #include <string.h>

include/haskell_igraph.h

 #ifndef HASKELL_IGRAPH
 #define HASKELL_IGRAPH
 
-#include <igraph/igraph.h>
+#include "igraph.h"
 
 void haskelligraph_init();
 

src/IGraph/Algorithms.hs

@@ -2,7 +2,7 @@ module IGraph.Algorithms
     ( module IGraph.Algorithms.Structure
     , module IGraph.Algorithms.Community
     , module IGraph.Algorithms.Clique
-    , module IGraph.Algorithms.Layout
+--    , module IGraph.Algorithms.Layout
     , module IGraph.Algorithms.Motif
     , module IGraph.Algorithms.Generators
     , module IGraph.Algorithms.Isomorphism
@@ -12,7 +12,7 @@ module IGraph.Algorithms
 import IGraph.Algorithms.Structure
 import IGraph.Algorithms.Community
 import IGraph.Algorithms.Clique
-import IGraph.Algorithms.Layout
+--import IGraph.Algorithms.Layout
 import IGraph.Algorithms.Motif
 import IGraph.Algorithms.Generators
 import IGraph.Algorithms.Isomorphism

src/IGraph/Algorithms/Layout.chs

@@ -14,7 +14,7 @@ import Foreign
 import           IGraph
 {#import IGraph.Internal #}
 
-#include "igraph/igraph.h"
+#include "haskell_igraph.h"
 
 data LayoutMethod =
     KamadaKawai { kk_seed      :: !(Maybe [(Double, Double)])

src/IGraph/Internal.chs

@@ -132,7 +132,6 @@ import Data.List (transpose)
 import qualified Data.Map.Strict as M
 import           System.IO.Unsafe          (unsafePerformIO)
 import Data.Either (fromRight)
-import Data.List.Split (chunksOf)
 import Data.Serialize (Serialize, decode, encode)
 import           Control.Monad.Primitive
 import Control.Exception (bracket_)
@@ -348,6 +347,9 @@ toColumnLists mptr = do
         igraphMatrixCopyTo mptr ptr
         peekArray (r*c) ptr
     return $ chunksOf r $ map realToFrac xs
+  where
+    chunksOf _ [] = []
+    chunksOf i ls = take i ls : chunksOf i (drop i ls)
 
 {#fun igraph_matrix_null as ^ { castPtr `Ptr Matrix' } -> `()' #}
 

src/IGraph/Internal/Constants.chs

 {-# LANGUAGE ForeignFunctionInterface #-}
 module IGraph.Internal.Constants where
 
-#include "igraph/igraph.h"
+#include "haskell_igraph.h"
 
 {#enum igraph_neimode_t as Neimode {underscoreToCase}
     deriving (Show, Eq) #}

stack.yaml

-flags:
-  haskell-igraph:
-    graphics: false
-
 packages:
     - '.'
 

tools/processIgraph.sh

@@ -19,7 +19,6 @@ cat <<EOT > include/config.h
 #undef HAVE_ISFINITE
 
 /* libraries */
-#define HAVE_GMP 1
 #define HAVE_MEMORY_H 1
 #define HAVE_STDINT_H 1
 #define HAVE_STRINGS_H 1
@@ -95,3 +94,4 @@ ls -d1 $2/src/*.cc
 #define HAVE_TIMES_H 1
 #define HAVE_TIME_H 1
 #define HAVE_UNISTD_H 1
+#define HAVE_GMP 1
\ No newline at end of file