From 0e313e10ff33b0d8698382f20979563e05c1fa87 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Keck <Jean-Baptiste.Keck@imag.fr>
Date: Fri, 17 Apr 2020 12:33:16 +0200
Subject: [PATCH] fix examples path
---
ci/scripts/test.sh | 2 +-
hysop/core/graph/computational_graph.py | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ci/scripts/test.sh b/ci/scripts/test.sh
index c11527508..8051a5ccd 100755
--- a/ci/scripts/test.sh
+++ b/ci/scripts/test.sh
@@ -70,7 +70,7 @@ DO_LONG_TESTS=${DO_LONG_TESTS:-false}
COMMON_TEST_OPTIONS=''
TEST_DIR="$HYSOP_DIR"
COMMON_EXAMPLE_OPTIONS='-VNC -cp default -maxit 2'
-EXAMPLE_DIR="$HYSOP_DIR/../examples"
+EXAMPLE_DIR="$HYSOP_DIR/../hysop_examples/examples"
hysop_test() {
test=$1
diff --git a/hysop/core/graph/computational_graph.py b/hysop/core/graph/computational_graph.py
index 6aaffae39..d95fde0e6 100644
--- a/hysop/core/graph/computational_graph.py
+++ b/hysop/core/graph/computational_graph.py
@@ -359,14 +359,14 @@ class ComputationalGraph(ComputationalGraphNode):
for field in self.fields:
field_topologies = {}
for (i, node) in enumerate(self.nodes):
- if field in op.input_fields:
- topo = op.input_fields[field]
- field_topologies.setdefault(topo, []).append(op)
- if field in op.output_fields:
- topo = op.output_fields[field]
- field_topologies.setdefault(topo, []).append(op)
+ if field in node.input_fields:
+ topo = node.input_fields[field]
+ field_topologies.setdefault(topo, []).append(node)
+ if field in node.output_fields:
+ topo = node.output_fields[field]
+ field_topologies.setdefault(topo, []).append(node)
for topo in sorted(field_topologies.keys(), key=lambda x: x.tag):
- pnames = set(op.pretty_name.decode('utf-8') for op in field_topologies[topo])
+ pnames = set(node.pretty_name.decode('utf-8') for node in field_topologies[topo])
pnames = sorted(pnames)
nbyline = 4
nentries = len(pnames)//nbyline
--
GitLab