oafuncs 0.0.98.47__py3-none-any.whl → 0.0.98.48__py3-none-any.whl

oafuncs/oa_linux.py

@@ -54,10 +54,15 @@ def query_queue(need_node=1, queue_list =['dcu','bigmem','cpu_parallel','cpu_sin
     queue_dict = get_queue_node()
     hs = None
     for my_queue in queue_list:
-        if my_queue in queue_dict and queue_dict[my_queue] >= need_node:
-            # slurm_file = f'../run.slurm.{my_queue}'
-            hs = my_queue
-            break
+        if my_queue == 'cpu_parallel':
+            for mq in ['cpu_parallel','cpu_parallel*']:
+                if mq in queue_dict and queue_dict[mq] >= need_node:
+                    hs = 'cpu_parallel'
+                    break
+        else:
+            if my_queue in queue_dict and queue_dict[my_queue] >= need_node:
+                hs = my_queue
+                break
     return hs
 
 def running_jobs():
@@ -116,7 +121,7 @@ def submit_job(working_dir=None, script_tmp='run.slurm', script_run='run.slurm',
         while True:
             if job_id in running_jobs():
                 print(f'Time: {datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")}')
-                print(f'任务{job_id}正在任务队列中...')
+                print(f'任务{job_id}正在队列中...')
                 time.sleep(60)
             else:
                 print(f'任务{job_id}已完成！')

{oafuncs-0.0.98.47.dist-info → oafuncs-0.0.98.48.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oafuncs
-Version: 0.0.98.47
+Version: 0.0.98.48
 Summary: Oceanic and Atmospheric Functions
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu

{oafuncs-0.0.98.47.dist-info → oafuncs-0.0.98.48.dist-info}/RECORD

@@ -6,7 +6,7 @@ oafuncs/oa_draw.py,sha256=zal0Y3RPpN0TCGN4Gw9qLtjQdT6V0ZqpSUBFVOPL0x4,13952
 oafuncs/oa_file.py,sha256=j9NOjxPOeAJsD5Zk4ODmFdVSSgr1CHVPvM1IHXy9RQA,17546
 oafuncs/oa_geo.py,sha256=UbzvUqgT2QP_9B7XSJRL1HDmGu0HnLC5nSP6ZrA5WH4,7177
 oafuncs/oa_help.py,sha256=0J5VaZX-cB0c090KxgmktQJBc0o00FsY-4wB8l5y00k,4178
-oafuncs/oa_linux.py,sha256=reQYcjMff6mHuM5RXzoxM-4lgIYUcOoHp0u2fLY0cnU,5431
+oafuncs/oa_linux.py,sha256=-Bz0frciYl2Eb8YV4QKV7Yc65ice8TuRiRXTneLqnTk,5632
 oafuncs/oa_nc.py,sha256=j501NlTuvrDIwNLXbMfE7nPPXdbbL7u9PGDj2l5AtnI,16277
 oafuncs/oa_python.py,sha256=xYMQnM0cGq9xUCtcoMpnN0LG5Rc_s94tai5nC6CNJ3E,4831
 oafuncs/oa_tool.py,sha256=VHx15VqpbzNlVXh0-3nJqcDgLVaECMD1FvxJ_CrV39E,8046
@@ -39,8 +39,8 @@ oafuncs/oa_sign/__init__.py,sha256=JSx1fcWpmNhQBvX_Bmq3xysfSkkFMrjbJASxV_V6aqE,1
 oafuncs/oa_sign/meteorological.py,sha256=3MSjy7HTcvz2zsITkjUMr_0Y027Gas1LFE9pk99990k,6110
 oafuncs/oa_sign/ocean.py,sha256=3uYEzaq-27yVy23IQoqy-clhWu1I_fhPFBAQyT-OF4M,5562
 oafuncs/oa_sign/scientific.py,sha256=moIl2MEY4uitbXoD596JmXookXGQtQsS-8_1NBBTx84,4689
-oafuncs-0.0.98.47.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.98.47.dist-info/METADATA,sha256=iJT9zUhIKuQGVu3zNAoQvKq9DyB6oMm-mlptyweqRR0,4446
-oafuncs-0.0.98.47.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-oafuncs-0.0.98.47.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.98.47.dist-info/RECORD,,
+oafuncs-0.0.98.48.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.98.48.dist-info/METADATA,sha256=SMLqsAiP_mIAI-Z8i0UadDvIrDamuY91DFM2ddyzPwA,4446
+oafuncs-0.0.98.48.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+oafuncs-0.0.98.48.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.98.48.dist-info/RECORD,,