Merge pull request #7 from Multiscale-Genomics/move_dummy_pycompss

Move the dummy_pycompss.py module to utils
Multiscale-Genomics · Mar 19, 2018 · 6e71a79 · 6e71a79
2 parents bae5ed1 + a5a8460
commit 6e71a79
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/apps/pycompssapp.py b/apps/pycompssapp.py
@@ -29,7 +29,7 @@
     print("[Warning] Cannot import \"pycompss\" API packages.")
     print("          Using mock decorators.")
 
-    from dummy_pycompss import compss_wait_on
+    from utils.dummy_pycompss import compss_wait_on
 
 from basic_modules.app import App
 

diff --git a/basic_modules/tool.py b/basic_modules/tool.py
@@ -31,8 +31,8 @@
     print("[Warning] Cannot import \"pycompss\" API packages.")
     print("          Using mock decorators.")
 
-    from dummy_pycompss import FILE_IN, FILE_OUT
-    from dummy_pycompss import task
+    from utils.dummy_pycompss import FILE_IN, FILE_OUT
+    from utils.dummy_pycompss import task
 
 from basic_modules.metadata import Metadata
 from utils import logger
@@ -151,7 +151,7 @@ def run(self, input_files, input_metadata, output_files):
         # 3:
         logger.info("Running task")
         taskStatus = self._taskMethod(input_file, output_file)
-            
+
         # 4: not required
         # 5:
         output_metadata = Metadata(None, None)

diff --git a/tools_demos/simpleTool1.py b/tools_demos/simpleTool1.py
@@ -27,8 +27,8 @@
     print("[Warning] Cannot import \"pycompss\" API packages.")
     print("          Using mock decorators.")
 
-    from dummy_pycompss import FILE_IN, FILE_OUT
-    from dummy_pycompss import task
+    from utils.dummy_pycompss import FILE_IN, FILE_OUT
+    from utils.dummy_pycompss import task
 
 from basic_modules.metadata import Metadata
 from basic_modules.tool import Tool
@@ -77,7 +77,7 @@ def run(self, input_files, metadata, output_files):
         taskStatus = self.inputPlusOne(input_files["input"],
                                        output_files["output"])
         logger.info("SimpleTool1: task inputPlusOne done")
-        
+
         if taskStatus:
             logger.info("SimpleTool1: run successful")
             return ({"output": output_files["output"]},

diff --git a/tools_demos/simpleTool2.py b/tools_demos/simpleTool2.py
@@ -27,8 +27,8 @@
     print("[Warning] Cannot import \"pycompss\" API packages.")
     print("          Using mock decorators.")
 
-    from dummy_pycompss import FILE_IN, FILE_OUT
-    from dummy_pycompss import task
+    from utils.dummy_pycompss import FILE_IN, FILE_OUT
+    from utils.dummy_pycompss import task
 
 from basic_modules.metadata import Metadata
 from basic_modules.tool import Tool
@@ -80,7 +80,7 @@ def run(self, input_files, metadata, output_files):
         taskStatus = self.sumTwoFiles(input_files["input1"],
                                       input_files["input2"],
                                       output_files["output"])
-        
+
         if taskStatus:
             logger.info("SimpleTool2: run successful")
             return (output_files,

diff --git a/tools_demos/simpleTool3.py b/tools_demos/simpleTool3.py
@@ -27,8 +27,8 @@
     print("[Warning] Cannot import \"pycompss\" API packages.")
     print("          Using mock decorators.")
 
-    from dummy_pycompss import FILE_IN, FILE_OUT
-    from dummy_pycompss import task
+    from utils.dummy_pycompss import FILE_IN, FILE_OUT
+    from utils.dummy_pycompss import task
 
 from basic_modules.metadata import Metadata
 from basic_modules.tool import Tool
@@ -80,11 +80,11 @@ def run(self, input_files, metadata, output_files):
         output_files["output"] = []
         output_metadata = {}
         output_metadata["output"] = []
-        
+
         # Iteratively run the task
         previous_input = input_files["input"][0]
         previous_metadata = metadata["input"][0]
-        
+
         for i in range(len(input_files["input"]) - 1):
             logger.info("SimpleTool3: Summing input {}", i)
             # Add next input file:

diff --git a/dummy_pycompss.py → utils/dummy_pycompss.py b/dummy_pycompss.py → utils/dummy_pycompss.py