Skip to content
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.

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

Concurrency implementation using batch processor #106

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/fmu-ensemble.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
strategy:
matrix:
python-version: ['3.6', '3.7', '3.8']
FMU_CONCURRENCY: ['True', 'False']

steps:
- name: 📖 Checkout commit locally
Expand Down
3 changes: 0 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ exclude = docs,
[aliases]
test = pytest

[tool:pytest]
addopts = --verbose -x

[build_sphinx]
all-files = 1
warning-is-error = 1
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

REQUIREMENTS = [
"ecl>=2.9",
"ecl2df",
"numpy",
"pandas",
"pyyaml>=5.1",
Expand Down
51 changes: 51 additions & 0 deletions src/fmu/ensemble/common.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
"""Common functions for fmu.ensemble"""

import os
import logging

logger = logging.getLogger(__name__)

ENV_NAME = "FMU_CONCURRENCY"


def use_concurrent():
"""Determine whether we should use concurrency or not

This is based on both an environment variable
and presence of concurrent.futures, and on Python version

Returns:
bool: True if concurrency mode should be used
"""
if ENV_NAME not in os.environ:
return True
env_var = os.environ[ENV_NAME]
if (
str(env_var) == "0"
or str(env_var).lower() == "false"
or str(env_var).lower() == "no"
):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe this looks better and reduces the usage of str(..) and lower() ?

env_var = str(os.environ[ENV_NAME]).lower()
if( env_var == "0" or env_var == "false" or env_var == "no"):
    ..
    ..

return False
return True


def set_concurrent(concurrent):
"""Set the concurrency mode used by fmu.ensemble.

This is done through modifying the enviroment variable
for the current Python process

If concurrency is asked for by but not possible, a warning
will be printed and the code will continue in sequential mode.

Args:
concurrent (bool): Set to True if concurrent mode is requested,
False if not.
"""
if isinstance(concurrent, bool):
os.environ[ENV_NAME] = str(concurrent)
else:
raise TypeError
# Check for success:
if concurrent and not use_concurrent():
logger.warning("Unable to activate concurrent code")
Loading