hot fix (submits.py) (#833)

updated import and variable namespace to fix bug.
suny-downstate-medical-center · Sep 11, 2024 · a5b7a12 · a5b7a12
1 parent e52e780
commit a5b7a12
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/netpyne/batchtools/search.py b/netpyne/batchtools/search.py
@@ -11,7 +11,7 @@
 from batchtk.utils import get_path
 import numpy
 from typing import Any, Callable, Dict, List, Optional, Tuple, Union
-import submits
+from netpyne.batchtools import submits
 
 choice = tune.choice
 grid = tune.grid_search
@@ -219,10 +219,10 @@ def run(config):
     #('sge', 'unix'): constructors(runtk.dispatchers.UNIXDispatcher, runtk.submits.SGESubmitSOCK), #can't use AF_UNIX sockets on networked machines
     ('sge', 'sfs' ): constructors(runtk.dispatchers.SFSDispatcher , submits.SGESubmitSFS ),
     #('zsh', 'inet'): constructors(runtk.dispatchers.INETDispatcher, runtk.submits.ZSHSubmitSOCK), #TODO preferable to use AF_UNIX sockets on local machines
-    ('slurm', 'socket'): constructors(runtk.dispatchers.INETDispatcher, submits.SLURMSubmitSOCK),
-    ('slurm', 'sfs' ): constructors(runtk.dispatchers.SFSDispatcher , submits.SLURMSubmitSFS ),
-    ('sh', 'socket'): constructors(runtk.dispatchers.UNIXDispatcher, submits.SHSubmitSOCK),
-    ('sh', 'sfs' ): constructors(runtk.dispatchers.SFSDispatcher , submits.SHSubmitSFS ),
+    ('slurm', 'socket'): constructors(runtk.dispatchers.INETDispatcher, submits.SlurmSubmitSOCK),
+    ('slurm', 'sfs' ): constructors(runtk.dispatchers.SFSDispatcher , submits.SlurmSubmitSFS),
+    ('sh', 'socket'): constructors(runtk.dispatchers.UNIXDispatcher, submits.SHSubmitSOCK), #
+    ('sh', 'sfs' ): constructors(runtk.dispatchers.SFSDispatcher , submits.SHSubmitSFS),
 }#TODO, just say "socket"?
 
 """

diff --git a/netpyne/batchtools/submits.py b/netpyne/batchtools/submits.py
@@ -239,7 +239,7 @@ class SlurmSubmitSFS(SlurmSubmit):
                       runtk.SGLOUT: '{output_path}/{label}.sgl',
                       }
 
-class SlurmSubmitSFS(SlurmSubmit):
+class SlurmSubmitSOCK(SlurmSubmit):
     script_args = {'label', 'allocation', 'walltime', 'nodes', 'coresPerNode', 'output_path', 'email', 'reservation', 'custom', 'project_path', 'command'}
     script_template = \
         """\