From 1a0ca9ef4270644f8d2193470310c2cd8ab56862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20M=C3=BCller?= Date: Fri, 29 Jan 2016 13:11:05 +0900 Subject: [PATCH] fixed particle example, some more consistency in importing python modules --- examples/particle/config/MakesettingsGeneral | 2 +- hf/machinery/converter.py | 2 +- hf/machinery/parser.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/particle/config/MakesettingsGeneral b/examples/particle/config/MakesettingsGeneral index 52e9a50..6010465 100644 --- a/examples/particle/config/MakesettingsGeneral +++ b/examples/particle/config/MakesettingsGeneral @@ -116,7 +116,7 @@ SOURCE_THIS_AFTER_TESTING= #tests, you can create a run-script in a test-subdirectory together with all the input data you need and you can specify these script paths here. #separate with spaces and surround the list with double quotes. # ! your scripts specified here should take one input argument 'ARCH' and call your executables with _$ARCH postfix in the filename ! -TEST_EXECUTABLES="test/run.sh" +TEST_EXECUTABLES="" # !New in Version 0.9 #OPTIONAL, can be used to specify the naming pattern of files that are being created by your tests, as seen from the respective executable's directory. diff --git a/hf/machinery/converter.py b/hf/machinery/converter.py index 62d1a56..8bbda13 100644 --- a/hf/machinery/converter.py +++ b/hf/machinery/converter.py @@ -25,7 +25,7 @@ from tools.analysis import SymbolDependencyAnalyzer, getAnalysisForSymbol, getArguments from tools.patterns import RegExPatterns from machinery.parser import H90CallGraphAndSymbolDeclarationsParser, getSymbolsByName, currFile, currLineNo -from commons import FortranCodeSanitizer +from machinery.commons import FortranCodeSanitizer def getModuleArraysForCallee(calleeName, symbolAnalysisByRoutineNameAndSymbolName, symbolsByModuleNameAndSymbolName): moduleSymbols = [] diff --git a/hf/machinery/parser.py b/hf/machinery/parser.py index 3fdf350..766e4c4 100644 --- a/hf/machinery/parser.py +++ b/hf/machinery/parser.py @@ -24,7 +24,7 @@ from tools.commons import UsageError, BracketAnalyzer from tools.analysis import SymbolDependencyAnalyzer, getAnalysisForSymbol, getArguments from tools.patterns import RegExPatterns -from commons import FortranRoutineArgumentParser, FortranCodeSanitizer +from machinery.commons import FortranRoutineArgumentParser, FortranCodeSanitizer currFile = None currLineNo = None