tomwer 1.3.24__tar.gz → 1.3.25__tar.gz

{tomwer-1.3.24/tomwer.egg-info → tomwer-1.3.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 1.3.24
+Version: 1.3.25
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: data analysis unit
@@ -25,7 +25,7 @@ Requires-Dist: numpy
 Requires-Dist: setuptools
 Requires-Dist: psutil
 Requires-Dist: silx[full]>=2.0
-Requires-Dist: tomoscan>=2.0.0a11
+Requires-Dist: tomoscan<2.1,>=2.0.0a11
 Requires-Dist: nxtomo<1.3,>=1.2.3rc1
 Requires-Dist: nxtomomill<1.1,>=1.0dev
 Requires-Dist: processview>=1.3

{tomwer-1.3.24 → tomwer-1.3.25}/setup.cfg

@@ -32,7 +32,7 @@ install_requires =
 	setuptools
 	psutil
 	silx[full] >= 2.0
-	tomoscan>=2.0.0a11
+	tomoscan>=2.0.0a11, <2.1
 	nxtomo>=1.2.3rc1, <1.3
 	nxtomomill>=1.0dev, <1.1
 	processview>=1.3

{tomwer-1.3.24 → tomwer-1.3.25}/tomwer/app/zstitching.py

@@ -56,7 +56,6 @@ class MainWidget(qt.QTabWidget):
                 "partition": settingsClass.PARTITION,
                 "n_gpus": settingsClass.N_GPUS_PER_WORKER,
                 "job_name": settingsClass.PROJECT_NAME,
-                "walltime": settingsClass.DEFAULT_WALLTIME,
                 "python_venv": settingsClass.PYTHON_VENV,
             }
         )

{tomwer-1.3.24 → tomwer-1.3.25}/tomwer/core/cluster/cluster.py

@@ -48,7 +48,6 @@ class SlurmClusterConfiguration:
         queue=_SlurmSettings.PARTITION,
         n_gpus=_SlurmSettings.N_GPUS_PER_WORKER,
         project_name=_SlurmSettings.PROJECT_NAME,
-        walltime=_SlurmSettings.DEFAULT_WALLTIME,
         python_venv=_SlurmSettings.PYTHON_VENV,
         n_jobs=_SlurmSettings.N_JOBS,
         modules_to_load: tuple = _SlurmSettings.MODULES_TO_LOAD,
@@ -60,7 +59,6 @@ class SlurmClusterConfiguration:
         self._queue = queue
         self._n_gpus = n_gpus
         self._project_name = project_name
-        self._walltime = walltime
         self._python_venv = python_venv
         self._modules_to_load = modules_to_load
         self._n_jobs = n_jobs
@@ -98,10 +96,6 @@ class SlurmClusterConfiguration:
     def project_name(self):
         return self._project_name
 
-    @property
-    def walltime(self):
-        return self._walltime
-
     @property
     def python_venv(self):
         return self._python_venv
@@ -132,7 +126,6 @@ class SlurmClusterConfiguration:
             "partition": self.queue,
             "n_gpus": self.n_gpus,
             "job_name": self.project_name,
-            "walltime": self.walltime,
             "python_venv": self.python_venv,
             "modules": self.modules_to_load,
             "sbatch_extra_params": self.sbatch_extra_params,
@@ -157,8 +150,6 @@ class SlurmClusterConfiguration:
             self._n_gpus = dict_["n_gpus"]
         if "job_name" in dict_:
             self._project_name = dict_["job_name"]
-        if "walltime" in dict_:
-            self._walltime = dict_["walltime"]
         if "python_venv" in dict_:
             self._python_venv = dict_["python_venv"]
         modules = dict_.get("modules", None)

{tomwer-1.3.24 → tomwer-1.3.25}/tomwer/core/process/reconstruction/nabu/utils.py

@@ -128,7 +128,6 @@ def get_nabu_resources_desc(scan: TomwerScanBase, method, workers=1) -> dict:
         "partition": "gpu",
         "memory_per_node": "90%",
         "threads_per_node": "100%",
-        "walltime": "01:00:00",
     }
     return res
 

{tomwer-1.3.24 → tomwer-1.3.25}/tomwer/gui/cluster/slurm.py

@@ -166,7 +166,6 @@ class SlurmSettingsWindow(qt.QMainWindow):
                         "partition": settingsClass.PARTITION,
                         "n_gpus": settingsClass.N_GPUS_PER_WORKER,
                         "job_name": settingsClass.PROJECT_NAME,
-                        "walltime": settingsClass.DEFAULT_WALLTIME,
                         "python_venv": settingsClass.PYTHON_VENV,
                         "modules": settingsClass.MODULES_TO_LOAD,
                     }
@@ -261,11 +260,6 @@ class SlurmSettingsWidget(qt.QWidget):
         self._nJobsLabel.setVisible(jobLimitation is None)
         self._nJobs.setVisible(jobLimitation is None)
 
-        # wall time
-        self._wallTimeQLE = qt.QLineEdit("", self)
-        self._wallTimeLabel = qt.QLabel("wall time", self)
-        self.layout().addRow(self._wallTimeLabel, self._wallTimeQLE)
-
         # python exe / modules
         self._preProcessingGroup = qt.QGroupBox("pre-processing", self)
         self._preProcessingGroup.setLayout(qt.QFormLayout())
@@ -356,8 +350,6 @@ class SlurmSettingsWidget(qt.QWidget):
         self._sbatchAdvancedParameters.layout().addRow("-C (gpu card)", self._gpuCardCB)
 
         # simplify gui
-        self._wallTimeLabel.hide()
-        self._wallTimeQLE.hide()
         self._dashboardPort.hide()
         self._dashboardPortLabel.hide()
         self._jobName.hide()
@@ -376,7 +368,6 @@ class SlurmSettingsWidget(qt.QWidget):
             self._queue.setCurrentText(SlurmSettings.PARTITION)
         self._nGpu.setValue(n_gpu)
         self._jobName.setText(SlurmSettings.PROJECT_NAME)
-        self._wallTimeQLE.setText(SlurmSettings.DEFAULT_WALLTIME)
         self._modulesCB.setChecked(True)  # by default we go for modules
         self._preProcessingModeChanged()
         self._partitionChanged()
@@ -389,7 +380,6 @@ class SlurmSettingsWidget(qt.QWidget):
         self._queue.currentTextChanged.connect(self._configurationChanged)
         self._nGpu.valueChanged.connect(self._configurationChanged)
         self._jobName.editingFinished.connect(self._configurationChanged)
-        self._wallTimeQLE.editingFinished.connect(self._configurationChanged)
         self._pythonVenv.editingFinished.connect(self._configurationChanged)
         self._modulesQLE.editingFinished.connect(self._configurationChanged)
         self._preProcessingButtonGroup.buttonClicked.connect(self._configurationChanged)
@@ -452,12 +442,6 @@ class SlurmSettingsWidget(qt.QWidget):
     def setProjectName(self, name):
         self._jobName.setText(name)
 
-    def getWallTime(self):
-        return self._wallTimeQLE.text()
-
-    def setWallTime(self, walltime):
-        self._wallTimeQLE.setText(walltime)
-
     def getPythonExe(self):
         if self._sourceScriptCB.isChecked():
             return self._pythonVenv.text()
@@ -548,10 +532,6 @@ class SlurmSettingsWidget(qt.QWidget):
             if project_name is not None:
                 self.setProjectName(project_name)
 
-            wall_time = config.get("walltime", None)
-            if wall_time is not None:
-                self.setWallTime(wall_time)
-
             python_venv = config.get("python_venv", None)
             if python_venv is not None:
                 python_venv = python_venv.rstrip("'").rstrip('"')
@@ -582,7 +562,6 @@ class SlurmSettingsWidget(qt.QWidget):
             "partition": self.getQueue(),
             "n_gpus": self.getNGPU(),
             "job_name": self.getProjectName(),
-            "walltime": self.getWallTime(),
             "sbatch_extra_params": self.getSBatchExtraParams(),
         }
         if self._modulesCB.isChecked():

{tomwer-1.3.24 → tomwer-1.3.25}/tomwer/gui/cluster/test/test_cluster.py

@@ -63,7 +63,6 @@ class TestSlurmWidget(TestCaseQt):
             "job_name": "tomwer_{scan}_-_{process}_-_{info}",
             "n_jobs": 1,
             "modules": ("tomotools/stable",),
-            "walltime": "01:00:00",
             "sbatch_extra_params": {
                 "export": "NONE",
                 "gpu_card": None,

{tomwer-1.3.24 → tomwer-1.3.25}/tomwer/version.py

@@ -77,7 +77,7 @@ RELEASE_LEVEL_VALUE = {
 
 MAJOR = 1
 MINOR = 3
-MICRO = 24
+MICRO = 25
 RELEV = "final"  # <16
 SERIAL = 0  # <16
 

{tomwer-1.3.24 → tomwer-1.3.25/tomwer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 1.3.24
+Version: 1.3.25
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: data analysis unit
@@ -25,7 +25,7 @@ Requires-Dist: numpy
 Requires-Dist: setuptools
 Requires-Dist: psutil
 Requires-Dist: silx[full]>=2.0
-Requires-Dist: tomoscan>=2.0.0a11
+Requires-Dist: tomoscan<2.1,>=2.0.0a11
 Requires-Dist: nxtomo<1.3,>=1.2.3rc1
 Requires-Dist: nxtomomill<1.1,>=1.0dev
 Requires-Dist: processview>=1.3

{tomwer-1.3.24 → tomwer-1.3.25}/tomwer.egg-info/requires.txt

@@ -2,7 +2,7 @@ numpy
 setuptools
 psutil
 silx[full]>=2.0
-tomoscan>=2.0.0a11
+tomoscan<2.1,>=2.0.0a11
 nxtomo<1.3,>=1.2.3rc1
 nxtomomill<1.1,>=1.0dev
 processview>=1.3