tomwer 1.3.24__py3-none-any.whl → 1.3.25__py3-none-any.whl

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/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/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/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/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/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.dist-info → tomwer-1.3.25.dist-info}/METADATA

@@ -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.dist-info → tomwer-1.3.25.dist-info}/RECORD

@@ -1,4 +1,4 @@
-tomwer-1.3.24-py3.12-nspkg.pth,sha256=UYCZtLWueceGiAlmXKRJUZ0TWQEubpPoQ1pVnAAsME0,502
+tomwer-1.3.25-py3.11-nspkg.pth,sha256=UYCZtLWueceGiAlmXKRJUZ0TWQEubpPoQ1pVnAAsME0,502
 orangecontrib/tomwer/__init__.py,sha256=B4DXy1gY_wXmNYa2aOfapmJb2mEuCAjoaNEGnpBs70g,148
 orangecontrib/tomwer/state_summary.py,sha256=5_dPzweL3r0ye4ZfJo6IV2ThJI8fQhWoO2ySdJJajj8,1711
 orangecontrib/tomwer/orange/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -220,7 +220,7 @@ orangecontrib/tomwer/widgets/visualization/icons/volumeviewer.svg,sha256=2uT9_px
 tomwer/__init__.py,sha256=82Jp1abyG4UWdGuT4nNU7LxaUV6xxkOte5pIz3w69Do,1745
 tomwer/__main__.py,sha256=jsDfWA2yl5am0dHQVkYwlKLxxqKNont6VDF-LusuawE,8575
 tomwer/utils.py,sha256=o6TW9xqGYyYLHUGvLiiYEiiDHP6lwWlX63jMLPNh374,8432
-tomwer/version.py,sha256=rd2vlHeWF3189pIaK1GYB5_uwzO0ZQFI-MSeBIbrcdo,4387
+tomwer/version.py,sha256=PNDHR044uzeRANXIRpsABtCh9cCq6sO2BIeGHBhBYjs,4387
 tomwer/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/app/axis.py,sha256=Ax0wlTp9u0Ll_3ax23QP5Ck16_M9Kop7wx0hAbXrXyM,6004
 tomwer/app/canvas.py,sha256=RbQqgE7DuNjv4nGG6BNfnSevQO5_lCl7N71hGcLoxwE,1561
@@ -243,7 +243,7 @@ tomwer/app/scanviewer.py,sha256=yEaJ78p0ZaDVmk9pdKrEC7UqbabT59hzmAudy44jaiU,2708
 tomwer/app/sinogramviewer.py,sha256=EnjcgeRM7-3j8j8tFEWIGL-bRM3lVq8wlGWvBV3uDuI,3677
 tomwer/app/slicestack.py,sha256=YIH4bcOuFri_dHc2EkvYeBL_xv5N9rS8TwLFHaYsYV4,2428
 tomwer/app/stopdatalistener.py,sha256=p5G6sP2DUXEREZzFf0QGowU9C7hX7nexWZHmC0bTIM4,957
-tomwer/app/zstitching.py,sha256=rOc-bwX7A-eMHo0x0dyMsQhzLgcAcyavJlZ3I_D0m5E,12877
+tomwer/app/zstitching.py,sha256=wKwJbLA_ZJ6NUDLmeramEYszUXtAw9gFTZKBRqTAYZQ,12817
 tomwer/app/canvas_launcher/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/app/canvas_launcher/config.py,sha256=vGvyskE-mOLV4PPUverFhx7lQbGuE6E9747ctGcLodY,7164
 tomwer/app/canvas_launcher/environ.py,sha256=t_sgLAugHUA8d9SR6CZ6HfUHmAjS7ZcSf8I5KiwRayA,2501
@@ -257,7 +257,7 @@ tomwer/core/settings.py,sha256=9WUpakWAbnAkgPP2s71oaObK34FIq928ZQvrFkya404,5358
 tomwer/core/signal.py,sha256=I5TUcyeBZzrEh1SFGs-ylJSL1aBs41ZFb3IJo3O_55c,6115
 tomwer/core/tomwer_object.py,sha256=Io2UH9y28_2QjMkkHk0shQ9x15gZ_5xETgLDIqw94vc,1745
 tomwer/core/cluster/__init__.py,sha256=vak-tOR_fqqnNqZ8xw2ecos-HAgKpZBbC7yk4JUjDKk,60
-tomwer/core/cluster/cluster.py,sha256=6xFJ4jpz7qtyrCvoQZ50h-WPu3O_1mYY-5TBQVGWtwA,5744
+tomwer/core/cluster/cluster.py,sha256=1LCZBUJKPUISGgP_O6Ukuzze72Z__KQkLVeyzQAx3wI,5473
 tomwer/core/log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/core/log/logger.py,sha256=KDHLUbaVx3hOuIk8WmzS61x1IkYgAZJ97nVYUI5-PTU,4099
 tomwer/core/log/processlog.py,sha256=0XmoKVUpHjxvaOFEi56eqF1edHPzCfsCmjdMMZP2sxs,3697
@@ -331,7 +331,7 @@ tomwer/core/process/reconstruction/nabu/nabuvolume.py,sha256=z7nyfXhMrp0Q3hAN3NY
 tomwer/core/process/reconstruction/nabu/plane.py,sha256=Cgzth77M0pFgLDULmvmPj4bqFm5MvIMJ7Ien8mRqLsE,134
 tomwer/core/process/reconstruction/nabu/settings.py,sha256=JpHKf0smiXeWC8i9Mj7h3g67teJ3Gqycd-Uwg2yzGOQ,2279
 tomwer/core/process/reconstruction/nabu/target.py,sha256=_Z4gViprjR3Vm4KASqsASStLA9GM1wTyoi3Pg0PUSeg,1481
-tomwer/core/process/reconstruction/nabu/utils.py,sha256=zjEcGS0rET0kXyW26NkIf4aWtKw304DwnvOr1nGXt0E,18465
+tomwer/core/process/reconstruction/nabu/utils.py,sha256=mrIrukLAjnC5S2wM9uz5bHdpZwPDKg5BGAjoK_Bu9_Y,18433
 tomwer/core/process/reconstruction/normalization/__init__.py,sha256=TDtATpMVFkEOT93wLXLpW0A_TOeiQDiM7AWAqX4FIB0,119
 tomwer/core/process/reconstruction/normalization/normalization.py,sha256=G-eAZIct47RvzvHNMbKsG4Dt58vTSKhvH-NnIMzxzOs,13210
 tomwer/core/process/reconstruction/normalization/params.py,sha256=porWC6G5lQWF-4JB03B56uGmuMxjx3u0ZMums-Bh2p8,4790
@@ -437,10 +437,10 @@ tomwer/gui/settings.py,sha256=2Uy0itj8Dg-Owtay852l_oSCop2CQBFqIU11iVj2-nE,244
 tomwer/gui/stackplot.py,sha256=Bz-6Taen3RKAa6FYKeZ81M27r9hahbjAr7Cnx0TsPhE,25517
 tomwer/gui/stacks.py,sha256=iyMDSmVRn4u1Nf7mqIcmYJEVw86GReEK4zepB6DKTmk,8650
 tomwer/gui/cluster/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tomwer/gui/cluster/slurm.py,sha256=mXTAX62V7Nvb8al9HTnDJTOx5aDRzO-bn3o-djkqnog,27688
+tomwer/gui/cluster/slurm.py,sha256=gjWj2PuyuWoRefCdOGy5tkt7gljEFyscK8ZXvsLaigo,26878
 tomwer/gui/cluster/supervisor.py,sha256=afsXoPocymwhKABam1U2o8LshtVuTMdKaJXBWQAhVNY,17117
 tomwer/gui/cluster/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tomwer/gui/cluster/test/test_cluster.py,sha256=qGDSr3GMPo-nhXtaG-O6hQKzXAh7J9LgaHr8a8sUFRc,3937
+tomwer/gui/cluster/test/test_cluster.py,sha256=x-DJQDyo8OW_JghDrRieALyVjhpYcpyZmTOs2z9ibQ8,3901
 tomwer/gui/cluster/test/test_supervisor.py,sha256=0y24z3sAmc4_WMi-30XZGHgnM7ZqWoXRbu4KlTcZfQw,3212
 tomwer/gui/conditions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/gui/conditions/filter.py,sha256=8oKv3zCTzdwjqSjiplXkKkRRKn70vpfgpZRWMwIJ19Q,5549
@@ -776,10 +776,10 @@ tomwer/tests/test_utils.py,sha256=D0rNDSK6csEOYBY_7gD-4A3jp8rYAm8L1_Xg34A9I2s,30
 tomwer/tests/utils.py,sha256=RAXx5A99WD4Vyuv_wjHBdr-Xu7UiThHRKw2eiB5GX10,107
 tomwer/third_part/WaitingOverlay.py,sha256=GnqiytcJDp_24Cmz_2nZAP5HfpL3Yh7AzR2ATIusGsg,3906
 tomwer/third_part/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tomwer-1.3.24.dist-info/LICENSE,sha256=yR_hIZ1MfDh9x2_s23uFqBH7m5DgrBl9nJKkE37YChM,1877
-tomwer-1.3.24.dist-info/METADATA,sha256=kkKZJLl8q714m2WzVRbBDuDDbkQwxTtX1vFIXZdhV8w,10718
-tomwer-1.3.24.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-tomwer-1.3.24.dist-info/entry_points.txt,sha256=fIcDnCxjgwzfIylLYhUsFyiNZjZMxsfRQBxi4f-cJg8,440
-tomwer-1.3.24.dist-info/namespace_packages.txt,sha256=Iut-JTfT11SZHHm77_ZeszD7pZDWXcTweCbvrJpqDyQ,14
-tomwer-1.3.24.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
-tomwer-1.3.24.dist-info/RECORD,,
+tomwer-1.3.25.dist-info/LICENSE,sha256=yR_hIZ1MfDh9x2_s23uFqBH7m5DgrBl9nJKkE37YChM,1877
+tomwer-1.3.25.dist-info/METADATA,sha256=uWH80kDdxy7VDmh-59uJWZNmr64EXWEIFpxymag6Kmk,10723
+tomwer-1.3.25.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+tomwer-1.3.25.dist-info/entry_points.txt,sha256=fIcDnCxjgwzfIylLYhUsFyiNZjZMxsfRQBxi4f-cJg8,440
+tomwer-1.3.25.dist-info/namespace_packages.txt,sha256=Iut-JTfT11SZHHm77_ZeszD7pZDWXcTweCbvrJpqDyQ,14
+tomwer-1.3.25.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
+tomwer-1.3.25.dist-info/RECORD,,

{tomwer-1.3.24.dist-info → tomwer-1.3.25.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any