add posix shell string split and update license date

Author: yodeng

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022~2023 yodeng <[email protected]>
+Copyright (c) 2023~2024 yodeng <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/dag.py

@@ -124,10 +124,13 @@ def reset_graph(self):
     def ind_nodes(self, graph=None):
         if graph is None:
             graph = self.graph
-        dependent_nodes = set(
-            node for dependents in graph.values() for node in dependents
-        )
-        return [node for node in graph.keys() if node not in dependent_nodes]
+        nodes2 = set(n2 for n2s in graph.values() for n2 in n2s)
+        return [n1 for n1 in graph.keys() if n1 not in nodes2]
+
+    def end_nodes(self, graph=None):
+        if graph is None:
+            graph = self.graph
+        return [n1 for n1, n2 in graph.items() if not n2]
 
     def validate(self, graph=None):
         graph = graph if graph is not None else self.graph
@@ -197,3 +200,5 @@ def dot(self):
 
     def __str__(self):
         return self.dot()
+
+    __repr__ = __str__

src/job.py

@@ -4,6 +4,7 @@
 import os
 import re
 import sys
+import shlex
 import getpass
 import tempfile
 
@@ -282,7 +283,7 @@ def from_cmd(self, sgefile, linenum=None, cmd=None):
         if re.search("\s+//", cmd) or re.search("//\s+", cmd):
             self.rawstring = cmd.rsplit("//", 1)[0].strip()
             try:
-                argstring = cmd.rsplit("//", 1)[1].strip().split()
+                argstring = shlex.split(cmd.rsplit("//", 1)[1].strip())
                 args = shell_job_parser(argstring)
                 for i in ['force', 'local', 'max_timeout_retry', 'workdir', 'jobname',
                           'groups', 'mode', 'queue', 'memory', 'cpu', 'out_maping']:
@@ -320,7 +321,7 @@ def from_cmd(self, sgefile, linenum=None, cmd=None):
                 "_", 1)[0] + "_%d_%05d" % (os.getpid(), self.linenum)
         return self
 
-    def forceToLocal(self, jobname="", removelog=False):
+    def to_local(self, jobname="", removelog=False):
         self.host = "localhost"
         self.name = self.jobname = jobname
         self.logfile = join(self.logdir, basename(

src/run.py

@@ -202,7 +202,7 @@ def init_callback(self):
                 continue
             job = Job(self.conf)
             job = job.from_cmd(self.jfile, linenum=-1, cmd=cmd)
-            job.forceToLocal(jobname=name, removelog=False)
+            job.to_local(jobname=name, removelog=False)
             self.totaljobdict[name] = job
             if name == "init":
                 self.jobs.insert(0, job)
@@ -212,7 +212,7 @@ def init_callback(self):
                     self.jobsgraph.add_edge(name, j)
             else:
                 self.jobs.append(job)
-                f = [i for i, j in self.jobsgraph.graph.items() if not len(j)]
+                f = self.jobsgraph.end_nodes()
                 self.jobsgraph.add_node_if_not_exists(job.jobname)
                 for j in f:
                     self.jobsgraph.add_edge(j, name)