Merge pull request #30 from felix5572/master

update install

dpdispatcher/__init__.py

@@ -10,7 +10,8 @@
 # dlogf = logging.FileHandler(os.getcwd()+os.sep+SHORT_CMD+'.log')
 # dlogf = logging.FileHandler('./'+os.sep+SHORT_CMD+'.log')
 # dlogf = logging.FileHandler(os.path.join(os.environ['HOME'], SHORT_CMD+'.log'))
-dlogf = logging.FileHandler(os.path.join(os.path.expanduser('~'), SHORT_CMD+'.log'))
+# dlogf = logging.FileHandler(os.path.join(os.path.expanduser('~'), SHORT_CMD+'.log'))
+dlogf = logging.FileHandler(os.path.join("/tmp/", SHORT_CMD+'.log'))
 dlogf_formatter=logging.Formatter('%(asctime)s - %(levelname)s : %(message)s')
 # dlogf_formatter=logging.Formatter('%(asctime)s - %(name)s - [%(filename)s:%(funcName)s - %(lineno)d ] - %(levelname)s \n %(message)s')
 dlogf.setFormatter(dlogf_formatter)
@@ -28,10 +29,23 @@
 except ImportError:
     __date__ = 'unkown'
 
-from .submission import Submission
-from .submission import Task
-from .submission import Job
-from .submission import Resources
+try:
+    from .submission import Submission
+    from .submission import Task
+    from .submission import Job
+    from .submission import Resources
+    from .slurm import Slurm
+    from .pbs import PBS
+    from .shell import Shell
+    from .lsf import LSF
+    from .dp_cloud_server import DpCloudServer
+
+    from .lazy_local_context import LazyLocalContext
+    from .local_context import LocalContext
+    from .ssh_context import SSHContext
+except ImportError:
+    pass
+
 
 def info():
     """

dpdispatcher/ssh_context.py

@@ -294,13 +294,13 @@ def block_checkcall(self,
         exit_status = stdout.channel.recv_exit_status() 
         if exit_status != 0:
             if retry < 3:
+                print('debug:self.block_checkall, retry', self.remote_root, cmd)
                 # sleep 60 s
                 dlog.warning("Get error code %d in calling %s through ssh with job: %s . message: %s" %
                         (exit_status, cmd, self.submission.submission_hash, stderr.read().decode('utf-8')))
                 dlog.warning("Sleep 60 s and retry the command...")
-                time.sleep(60)
+                time.sleep(20)
                 return self.block_checkcall(cmd, asynchronously=asynchronously, retry=retry+1)
-            print('debug:self.remote_root, cmd', self.remote_root, cmd)
             raise RuntimeError("Get error code %d in calling %s through ssh with job: %s . message: %s" %
                                (exit_status, cmd, self.submission.submission_hash, stderr.read().decode('utf-8')))
         return stdin, stdout, stderr    

tests/test_if_cuda_multi_devices/test_dir/out.txt

@@ -1,16 +1,16 @@
 dpdispatcher_unittest_7
 dpdispatcher_unittest_9
 dpdispatcher_unittest_5
+dpdispatcher_unittest_6
 dpdispatcher_unittest_10
 dpdispatcher_unittest_12
 dpdispatcher_unittest_8
 dpdispatcher_unittest_14
-dpdispatcher_unittest_6
 dpdispatcher_unittest_1
 dpdispatcher_unittest_2
-dpdispatcher_unittest_15
 dpdispatcher_unittest_13
-dpdispatcher_unittest_4
-dpdispatcher_unittest_11
+dpdispatcher_unittest_15
 dpdispatcher_unittest_0
 dpdispatcher_unittest_3
+dpdispatcher_unittest_11
+dpdispatcher_unittest_4