Skip to content

Commit

Permalink
Merge branch 'experimental/warpX' into experimental/aposmm_rc
Browse files Browse the repository at this point in the history
  • Loading branch information
jmlarson1 committed Apr 17, 2020
2 parents 5fd84e5 + b58c58e commit 57ca8c7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
3 changes: 1 addition & 2 deletions .flake8
Expand Up @@ -39,5 +39,4 @@ per-file-ignores =
libensemble/tests/scaling_tests/warpx/run_libensemble_on_warpx.py:E402
libensemble/gen_funcs/persistent_aposmm.py:E402, E501
libensemble/tests/regression_tests/test_persistent_aposmm*:E402
libensemble/tests/regression_tests/test_aposmm*:E402
libensemble/tests/scaling_tests/warpx/run_libensemble_on_warpx.py:E402
libensemble/tests/regression_tests/test_aposmm*:E402
1 change: 1 addition & 0 deletions libensemble/gen_funcs/persistent_aposmm.py
Expand Up @@ -12,6 +12,7 @@
from scipy.spatial.distance import cdist
from math import log, gamma, pi, sqrt
from libensemble.gen_funcs.aposmm_localopt_support import LocalOptInterfacer, ConvergedMsg

from libensemble.message_numbers import STOP_TAG, PERSIS_STOP, FINISHED_PERSISTENT_GEN_TAG
from libensemble.tools.gen_support import send_mgr_worker_msg
from libensemble.tools.gen_support import get_mgr_worker_msg
Expand Down

0 comments on commit 57ca8c7

Please sign in to comment.