Skip to content

Remove OMP_NUM_THREADS if set to empty #8917

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Remove OMP_NUM_THREADS if set to empty #8917

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8d9b81
Remove OMP_NUM_THREADS if set to empty
mrocklin Oct 29, 2024
9d60f00
Merge branch 'main' of https://github.com/dask/distributed into omp-n…
jacobtomlinson Jan 29, 2025
b735ba0
Clean up linting issues
jacobtomlinson Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions distributed/nanny.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ def __init__( # type: ignore[no-untyped-def]
# https://github.com/dask/dask/issues/6640.
self.pre_spawn_env.update({"PYTHONHASHSEED": "6640"})


self.env = merge(
self.pre_spawn_env,
_get_env_variables("distributed.nanny.environ"),
Expand Down Expand Up @@ -1031,4 +1032,9 @@ def _get_env_variables(config_key: str) -> dict[str, str]:
# Override dask config with explicitly defined env variables from the OS
# Allow unsetting a variable in a config override by setting its value to None.
cfg = {k: os.environ.get(k, str(v)) for k, v in cfg.items() if v is not None}

for k, v in list(cfg.items()):
if "_NUM_THREADS" in k and not v:
del cfg[k]

return cfg
13 changes: 13 additions & 0 deletions distributed/tests/test_nanny.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,19 @@ async def test_environment_variable(c, s):
await asyncio.gather(a.close(), b.close())


@gen_cluster(
nthreads=[("", 1)],
client=True,
Worker=Nanny,
config={
"distributed.nanny.pre-spawn-environ": {"OMP_NUM_THREADS": ""},
},
)
async def test_omp_num_threads_off(c, s, a):
results = await c.run(lambda: "OMP_NUM_THREADS" in os.environ)
assert results == {a.worker_address: False}


@gen_cluster(nthreads=[], client=True)
async def test_environment_variable_by_config(c, s, monkeypatch):
with dask.config.set({"distributed.nanny.environ": "456"}):
Expand Down
Loading