Skip to content

Commit d2f7512

Browse files
authored
Merge branch 'main' into Py314u
2 parents 093b399 + eb8b739 commit d2f7512

42 files changed

Lines changed: 849 additions & 302 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ci_support/environment-docs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ dependencies:
1515
- jupyter-book =1.0.0
1616
- mpi4py =4.1.1
1717
- python =3.12
18+
- pydantic =2.12.4
1819
- pyzmq =27.1.0

.ci_support/environment-integration.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ dependencies:
1717
- ipython =9.9.0
1818
- matplotlib =3.10.8
1919
- networkx =3.6.1
20+
- pydantic =2.12.4
2021
- pygraphviz =1.14
21-
- pysqa =0.3.4
22+
- pysqa =0.3.5
2223
- pyzmq =27.1.0
2324
- qe =7.5

.ci_support/environment-mpich.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ dependencies:
1111
- ipython =9.9.0
1212
- mpi4py =4.1.1
1313
- networkx =3.6.1
14+
- pydantic =2.12.4
1415
- pygraphviz =1.14
15-
- pysqa =0.3.4
16+
- pysqa =0.3.5
1617
- pyzmq =27.1.0

.ci_support/environment-old.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ dependencies:
1010
- h5py =3.6.0
1111
- networkx =2.8.8
1212
- ipython =7.33.0
13+
- pydantic =2.5.3
1314
- pygraphviz =1.10
1415
- hatchling =1.27.0
1516
- hatch-vcs =0.4.0

.ci_support/environment-openmpi.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ dependencies:
1111
- ipython =9.9.0
1212
- mpi4py =4.1.1
1313
- networkx =3.6.1
14+
- pydantic =2.12.4
1415
- pygraphviz =1.14
15-
- pysqa =0.3.4
16+
- pysqa =0.3.5
1617
- pyzmq =27.1.0

.ci_support/environment-win.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ dependencies:
1111
- ipython =9.9.0
1212
- mpi4py =4.1.1
1313
- networkx =3.6.1
14+
- pydantic =2.12.4
1415
- pygraphviz =1.14
1516
- pyzmq =27.1.0

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.15.0
3+
rev: v0.15.1
44
hooks:
55
- id: ruff
66
name: ruff lint

binder/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ dependencies:
1515
- mpi4py =4.1.1
1616
- networkx =3.6.1
1717
- pygraphviz =1.14
18-
- pysqa =0.3.3
18+
- pysqa =0.3.5
1919
- pyzmq =27.1.0

docs/trouble_shooting.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,26 @@ The resource dictionary parameter `resource_dict` can contain one or more of the
4242
* `threads_per_core` (int): number of OpenMP threads to be used for each function call
4343
* `gpus_per_core` (int): number of GPUs per worker - defaults to 0
4444
* `cwd` (str/None): current working directory where the parallel python task is executed
45-
* `openmpi_oversubscribe` (bool): adds the `--oversubscribe` command line flag (OpenMPI and SLURM only) - default False
45+
* `cache_key` (str): Rather than using the internal hashing of executorlib the user can provide an external `cache_key`
46+
to identify tasks on the file system. The initial file name is going to be `cache_key` + `_i.h5` and the final file
47+
name is going to be `cache_key` + `_o.h5`.
48+
* `num_nodes` (int): number of compute nodes used for the evaluation of the Python function.
49+
* `exclusive` (bool): boolean flag to reserve exclusive access to selected compute nodes - do not allow other tasks to
50+
use the same compute node.
51+
* `error_log_file` (str): path to the error log file, primarily used to merge the log of multiple tasks in one file.
52+
* `run_time_limit` (int): the maximum time the execution of the submitted Python function is allowed to take in seconds.
53+
* `priority` (int): the queuing system priority assigned to a given Python function to influence the scheduling.
4654
* `slurm_cmd_args` (list): Additional command line arguments for the srun call (SLURM only)
4755

4856
For the special case of the [HPC Job Executor](https://executorlib.readthedocs.io/en/latest/3-hpc-job.html)
4957
the resource dictionary parameter `resource_dict` can also include additional parameters define in the submission script
5058
of the [Python simple queuing system adatper (pysqa)](https://pysqa.readthedocs.io) these include but are not limited to:
51-
* `run_time_max` (int): the maximum time the execution of the submitted Python function is allowed to take in seconds.
5259
* `memory_max` (int): the maximum amount of memory the Python function is allowed to use in Gigabytes.
5360
* `partition` (str): the partition of the queuing system the Python function is submitted to.
5461
* `queue` (str): the name of the queue the Python function is submitted to.
5562

56-
All parameters in the resource dictionary `resource_dict` are optional.
63+
All parameters in the resource dictionary `resource_dict` are optional. When `pydantic` is installed as optional
64+
dependency the `resource_dict` is validated using `pydantic`.
5765

5866
## SSH Connection
5967
While the [Python simple queuing system adatper (pysqa)](https://pysqa.readthedocs.io) provides the option to connect to

pyproject.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,17 @@ graphnotebook = [
5353
]
5454
mpi = ["mpi4py==4.1.1"]
5555
cluster = [
56-
"pysqa==0.3.4",
56+
"pysqa==0.3.5",
5757
"h5py==3.15.1",
5858
]
59+
validation = [
60+
"pydantic==2.12.4",
61+
]
5962
all = [
6063
"mpi4py==4.1.1",
61-
"pysqa==0.3.4",
64+
"pysqa==0.3.5",
6265
"h5py==3.15.1",
66+
"pydantic==2.12.4",
6367
"pygraphviz==1.14",
6468
"networkx==3.6.1",
6569
"ipython==9.9.0",

0 commit comments

Comments
 (0)