From 195acd76e9fdb78683623f522fdc7f720f967e82 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Keck <Jean-Baptiste.Keck@imag.fr>
Date: Wed, 7 Jun 2017 20:17:34 +0200
Subject: [PATCH] fixed cairo graphdraw
---
hysop/__init__.py | 2 +-
hysop/__init__.py.in | 2 +-
hysop/core/graph/graph.py | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/hysop/__init__.py b/hysop/__init__.py
index a589ac754..0c4f302de 100644
--- a/hysop/__init__.py
+++ b/hysop/__init__.py
@@ -77,7 +77,7 @@ from hysop.simulation import Simulation
from hysop.problem import Problem
from hysop.tools.io_utils import IO, IOParams
__all__ = ['Box', 'Field', 'Cartesian', 'Domain', 'Discretization', 'Simulation',
- 'Problem', 'IO', 'IOParams', 'Topology', 'Cartesian', 'TopologyDescriptor]
+ 'Problem', 'IO', 'IOParams', 'Topology', 'Cartesian', 'TopologyDescriptor']
if __MPI_ENABLED__:
__all__ += ['MPI', 'main_rank', 'main_size']
diff --git a/hysop/__init__.py.in b/hysop/__init__.py.in
index 703c23715..8b9ab0ff4 100644
--- a/hysop/__init__.py.in
+++ b/hysop/__init__.py.in
@@ -76,7 +76,7 @@ from hysop.simulation import Simulation
from hysop.problem import Problem
from hysop.tools.io_utils import IO, IOParams
__all__ = ['Box', 'Field', 'Cartesian', 'Domain', 'Discretization', 'Simulation',
- 'Problem', 'IO', 'IOParams', 'Topology', 'Cartesian', 'TopologyDescriptor]
+ 'Problem', 'IO', 'IOParams', 'Topology', 'Cartesian', 'TopologyDescriptor']
if __MPI_ENABLED__:
__all__ += ['MPI', 'main_rank', 'main_size']
diff --git a/hysop/core/graph/graph.py b/hysop/core/graph/graph.py
index 97349cff2..afda85f1f 100644
--- a/hysop/core/graph/graph.py
+++ b/hysop/core/graph/graph.py
@@ -2,8 +2,11 @@
import graph_tool as gt
from graph_tool import Graph, GraphView
from graph_tool import topology, stats, search
-from graph_tool.all import graph_draw as graph_draw
from hysop.tools.decorators import not_implemented, debug, wraps
+try:
+ from graph_tool.all import graph_draw as graph_draw
+except:
+ graph_draw = None
class ComputationalGraphNodeData(object):
"""
--
GitLab