nodeocc 1.0.10__tar.gz → 1.0.11__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.
Files changed (23) hide show
  1. {nodeocc-1.0.10 → nodeocc-1.0.11}/PKG-INFO +1 -1
  2. {nodeocc-1.0.10 → nodeocc-1.0.11}/pyproject.toml +1 -1
  3. {nodeocc-1.0.10 → nodeocc-1.0.11}/src/controller/controller.py +12 -10
  4. {nodeocc-1.0.10 → nodeocc-1.0.11}/src/nodeocc.egg-info/PKG-INFO +1 -1
  5. {nodeocc-1.0.10 → nodeocc-1.0.11}/README.md +0 -0
  6. {nodeocc-1.0.10 → nodeocc-1.0.11}/setup.cfg +0 -0
  7. {nodeocc-1.0.10 → nodeocc-1.0.11}/setup.py +0 -0
  8. {nodeocc-1.0.10 → nodeocc-1.0.11}/src/__init__.py +0 -0
  9. {nodeocc-1.0.10 → nodeocc-1.0.11}/src/model/infrastructure.py +0 -0
  10. {nodeocc-1.0.10 → nodeocc-1.0.11}/src/model/job.py +0 -0
  11. {nodeocc-1.0.10 → nodeocc-1.0.11}/src/nodeocc.egg-info/SOURCES.txt +0 -0
  12. {nodeocc-1.0.10 → nodeocc-1.0.11}/src/nodeocc.egg-info/dependency_links.txt +0 -0
  13. {nodeocc-1.0.10 → nodeocc-1.0.11}/src/nodeocc.egg-info/entry_points.txt +0 -0
  14. {nodeocc-1.0.10 → nodeocc-1.0.11}/src/nodeocc.egg-info/requires.txt +0 -0
  15. {nodeocc-1.0.10 → nodeocc-1.0.11}/src/nodeocc.egg-info/top_level.txt +0 -0
  16. {nodeocc-1.0.10 → nodeocc-1.0.11}/src/readers/compute_wait_time.py +0 -0
  17. {nodeocc-1.0.10 → nodeocc-1.0.11}/src/readers/slurmreader.py +0 -0
  18. {nodeocc-1.0.10 → nodeocc-1.0.11}/src/view/__init__.py +0 -0
  19. {nodeocc-1.0.10 → nodeocc-1.0.11}/src/view/curses_multiwindow.py +3 -3
  20. {nodeocc-1.0.10 → nodeocc-1.0.11}/src/view/slurm_list.py +0 -0
  21. {nodeocc-1.0.10 → nodeocc-1.0.11}/src/view/slurm_viz.py +0 -0
  22. {nodeocc-1.0.10 → nodeocc-1.0.11}/src/view/styles.py +0 -0
  23. {nodeocc-1.0.10 → nodeocc-1.0.11}/src/view/utils.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: nodeocc
3
- Version: 1.0.10
3
+ Version: 1.0.11
4
4
  Summary: TUI application for viewing the status of GPU allocations on a Slurm cluster
5
5
  Author: Matteo Boschini
6
6
  Maintainer: Lorenzo Bonicelli, Aniello Panariello
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "nodeocc"
7
- version = "1.0.10"
7
+ version = "1.0.11"
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"
@@ -60,7 +60,6 @@ except Exception as e:
60
60
  newest_version = '?.?.?'
61
61
  time.sleep(5)
62
62
 
63
-
64
63
  BEGIN_DELIM = "!{$"
65
64
  END_DELIM_ENCODED = "!}$".encode('utf-8')
66
65
  EXTRA_MSG_BEGIN_DELIM = "!{#"
@@ -81,13 +80,17 @@ assert os.access(args.basepath, os.R_OK), f"Base path {args.basepath} not readab
81
80
  # export args
82
81
  orig_instance = Singleton.getInstance(args)
83
82
 
84
- last_update = os.path.getmtime(conf_path + "/view/slurm_viz.py")
85
- if os.path.getmtime(conf_path + "/view/slurm_list.py") > last_update:
86
- last_update = os.path.getmtime(conf_path + "/view/slurm_list.py")
87
- if os.path.getmtime(conf_path + "/view/styles.py") > last_update:
88
- last_update = os.path.getmtime(conf_path + "/view/styles.py")
89
- if os.path.getmtime(conf_path + "/readers/slurmreader.py") > last_update:
90
- last_update = os.path.getmtime(conf_path + "/readers/slurmreader.py")
83
+ try:
84
+ last_update = os.path.getmtime(conf_path + "/view/slurm_viz.py")
85
+ if os.path.getmtime(conf_path + "/view/slurm_list.py") > last_update:
86
+ last_update = os.path.getmtime(conf_path + "/view/slurm_list.py")
87
+ if os.path.getmtime(conf_path + "/view/styles.py") > last_update:
88
+ last_update = os.path.getmtime(conf_path + "/view/styles.py")
89
+ if os.path.getmtime(conf_path + "/readers/slurmreader.py") > last_update:
90
+ last_update = os.path.getmtime(conf_path + "/readers/slurmreader.py")
91
+ except Exception as e:
92
+ orig_instance.err(f"Could not get last update time: {e}")
93
+ last_update = time.time()
91
94
 
92
95
 
93
96
  def get_avg_wait_time(instance: Singleton):
@@ -301,8 +304,7 @@ def _main():
301
304
  wrapper(display_main)
302
305
 
303
306
 
304
- if __name__ == '__main__':
305
- _main()
307
+ _main()
306
308
 
307
309
  orig_instance.cleanup()
308
310
  exit(0)
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: nodeocc
3
- Version: 1.0.10
3
+ Version: 1.0.11
4
4
  Summary: TUI application for viewing the status of GPU allocations on a Slurm cluster
5
5
  Author: Matteo Boschini
6
6
  Maintainer: Lorenzo Bonicelli, Aniello Panariello
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
@@ -99,6 +99,9 @@ class Singleton:
99
99
  else:
100
100
  Singleton.__instance = self
101
101
 
102
+ self.args = args
103
+ self.setup_logging()
104
+
102
105
  self.try_open_counter = 0
103
106
  self.voff = 0
104
107
  self.mouse_state = {}
@@ -110,7 +113,6 @@ class Singleton:
110
113
  self.fetch_fn = None
111
114
  self.view_mode = 'gpu'
112
115
  self.job_id_type = 'agg'
113
- self.args = args
114
116
 
115
117
  self.show_account = False
116
118
  self.show_prio = False
@@ -147,8 +149,6 @@ class Singleton:
147
149
 
148
150
  self.is_master = not self.check_existing_master_running()
149
151
 
150
- self.setup_logging()
151
-
152
152
  if self.is_master:
153
153
  # clean up old port files
154
154
  self.clean_port_files()
File without changes
File without changes
File without changes