nodeocc 1.0.13__tar.gz → 1.0.14__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {nodeocc-1.0.13 → nodeocc-1.0.14}/PKG-INFO +1 -1
- {nodeocc-1.0.13 → nodeocc-1.0.14}/pyproject.toml +1 -1
- {nodeocc-1.0.13 → nodeocc-1.0.14}/src/controller/controller.py +5 -4
- {nodeocc-1.0.13 → nodeocc-1.0.14}/src/nodeocc.egg-info/PKG-INFO +1 -1
- {nodeocc-1.0.13 → nodeocc-1.0.14}/README.md +0 -0
- {nodeocc-1.0.13 → nodeocc-1.0.14}/setup.cfg +0 -0
- {nodeocc-1.0.13 → nodeocc-1.0.14}/setup.py +0 -0
- {nodeocc-1.0.13 → nodeocc-1.0.14}/src/__init__.py +0 -0
- {nodeocc-1.0.13 → nodeocc-1.0.14}/src/model/infrastructure.py +0 -0
- {nodeocc-1.0.13 → nodeocc-1.0.14}/src/model/job.py +0 -0
- {nodeocc-1.0.13 → nodeocc-1.0.14}/src/nodeocc.egg-info/SOURCES.txt +0 -0
- {nodeocc-1.0.13 → nodeocc-1.0.14}/src/nodeocc.egg-info/dependency_links.txt +0 -0
- {nodeocc-1.0.13 → nodeocc-1.0.14}/src/nodeocc.egg-info/entry_points.txt +0 -0
- {nodeocc-1.0.13 → nodeocc-1.0.14}/src/nodeocc.egg-info/requires.txt +0 -0
- {nodeocc-1.0.13 → nodeocc-1.0.14}/src/nodeocc.egg-info/top_level.txt +0 -0
- {nodeocc-1.0.13 → nodeocc-1.0.14}/src/readers/compute_wait_time.py +0 -0
- {nodeocc-1.0.13 → nodeocc-1.0.14}/src/readers/slurmreader.py +0 -0
- {nodeocc-1.0.13 → nodeocc-1.0.14}/src/view/__init__.py +0 -0
- {nodeocc-1.0.13 → nodeocc-1.0.14}/src/view/curses_multiwindow.py +0 -0
- {nodeocc-1.0.13 → nodeocc-1.0.14}/src/view/slurm_list.py +0 -0
- {nodeocc-1.0.13 → nodeocc-1.0.14}/src/view/slurm_viz.py +0 -0
- {nodeocc-1.0.13 → nodeocc-1.0.14}/src/view/styles.py +0 -0
- {nodeocc-1.0.13 → nodeocc-1.0.14}/src/view/utils.py +0 -0
|
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "nodeocc"
|
|
7
|
-
version = "1.0.
|
|
7
|
+
version = "1.0.14"
|
|
8
8
|
authors = [{ name = "Matteo Boschini" }]
|
|
9
9
|
maintainers = [{ name = "Lorenzo Bonicelli" }, { name = "Aniello Panariello" }]
|
|
10
10
|
description = "TUI application for viewing the status of GPU allocations on a Slurm cluster"
|
|
@@ -38,15 +38,15 @@ try:
|
|
|
38
38
|
import requests
|
|
39
39
|
newest_version = json.loads(requests.get(url).text)['info']['version']
|
|
40
40
|
print(BBLUE, end='')
|
|
41
|
-
if newest_version.split('.')[0] > version_number.split('.')[0]:
|
|
41
|
+
if int(newest_version.split('.')[0]) > int(version_number.split('.')[0]):
|
|
42
42
|
print(f"New major version available: {newest_version} (current: {version_number})")
|
|
43
43
|
print(f"Please update with 'pip install {program_name} --upgrade'")
|
|
44
44
|
time.sleep(7)
|
|
45
|
-
elif newest_version.split('.')[1] > version_number.split('.')[1]:
|
|
45
|
+
elif int(newest_version.split('.')[1]) > int(version_number.split('.')[1]):
|
|
46
46
|
print(f"New minor version available: {newest_version} (current: {version_number})")
|
|
47
47
|
print(f"Please update with 'pip install {program_name} --upgrade'")
|
|
48
48
|
time.sleep(7)
|
|
49
|
-
elif newest_version.split('.')[2] > version_number.split('.')[2]:
|
|
49
|
+
elif int(newest_version.split('.')[2]) > int(version_number.split('.')[2]):
|
|
50
50
|
print(f"New patch version available: {newest_version} (current: {version_number})")
|
|
51
51
|
print(f"Please update with 'pip install {program_name} --upgrade'")
|
|
52
52
|
time.sleep(7)
|
|
@@ -136,6 +136,7 @@ def update_data_master(instance: Singleton):
|
|
|
136
136
|
queue_jobs = sorted(queue_jobs, key=lambda x: x['priority'], reverse=True)
|
|
137
137
|
maxlen = min(JOB_LIMIT_PER_MSG, len(running_jobs) + len(queue_jobs))
|
|
138
138
|
|
|
139
|
+
|
|
139
140
|
queue_jobs, extra_queue_jobs = queue_jobs[:maxlen - len(running_jobs)], queue_jobs[maxlen - len(running_jobs):]
|
|
140
141
|
cur_timestamp = time.time()
|
|
141
142
|
msg = json.dumps({'inf': inf.to_nested_dict(), 'jobs': running_jobs + queue_jobs, 'ts': str(cur_timestamp)})
|
|
@@ -194,7 +195,7 @@ async def get_data_slave(instance):
|
|
|
194
195
|
# check if timestamp is the same
|
|
195
196
|
if float(new_ts['ts']) != orig_timestamp:
|
|
196
197
|
instance.timeme(f"Timestamp mismatch, skipping")
|
|
197
|
-
return inf, jobs, avg_wait_time
|
|
198
|
+
return inf, jobs, avg_wait_time # return what we have
|
|
198
199
|
|
|
199
200
|
msg_store[msg_idx] += new_jobs
|
|
200
201
|
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|