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.

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

Jump to bottom

Experimental/warp x #425

Merged
merged 98 commits into from
Apr 17, 2020
Merged

Experimental/warp x #425

merged 98 commits into from
Apr 17, 2020

Commits on Dec 17, 2019

  1. Starting a branch for warpX+libE work

    @jmlarson1
    jmlarson1 committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    f4cc233 View commit details
    Browse the repository at this point in the history

  2. Add preliminary input script for WarpX

    @RemiLehe
    RemiLehe committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    dee275a View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2020

  1. Making a warpX directory

    @jmlarson1
    jmlarson1 committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    cc20e63 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #347 from Libensemble/develop 

    Getting warpX branch up-to-date
    @jmlarson1
    jmlarson1 committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    836e133 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2020

  1. Merge branch 'develop' into experimental/warpX

    @jmlarson1
    jmlarson1 committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    adad2aa View commit details
    Browse the repository at this point in the history

  2. Adding example calling script

    @jmlarson1
    jmlarson1 committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    f50a7ec View commit details
    Browse the repository at this point in the history

  3. Updating calling script

    @jmlarson1
    jmlarson1 committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    69335f6 View commit details
    Browse the repository at this point in the history

  4. Updating example

    @jmlarson1
    jmlarson1 committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    8b84987 View commit details
    Browse the repository at this point in the history

  5. Move warpx calling script and sim func

    @shuds13
    shuds13 committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    edcb8c6 View commit details
    Browse the repository at this point in the history

  6. Remove warpX dir in sim_funcs

    @shuds13
    shuds13 committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    8676f46 View commit details
    Browse the repository at this point in the history

  7. Update warpx inputs to new problem

    @shuds13
    shuds13 committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    da46ab2 View commit details
    Browse the repository at this point in the history

  8. Update calling script and sim func for warpx

    @shuds13
    shuds13 committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    a2f81d7 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2020

  1. Add extra_args option to mpi_executor

    @shuds13
    shuds13 committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    1e8eeb3 View commit details
    Browse the repository at this point in the history

  2. Add randsample variant and fix sim dir name

    @shuds13
    shuds13 committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    79dbdf7 View commit details
    Browse the repository at this point in the history

  3. Testing use of extra_args to specify jsrun line

    @shuds13
    shuds13 committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    cfc1503 View commit details
    Browse the repository at this point in the history

  4. Add summit submission script for WarpX

    @shuds13
    shuds13 committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    621ac28 View commit details
    Browse the repository at this point in the history

  5. Slight edit to scripts

    @jmlarson1
    jmlarson1 committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    a5b8440 View commit details
    Browse the repository at this point in the history

  6. Renaming a calling script

    @jmlarson1
    jmlarson1 committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    436a327 View commit details
    Browse the repository at this point in the history

  7. Using field 'input_filename'

    @jmlarson1
    jmlarson1 committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    e75a09b View commit details
    Browse the repository at this point in the history

  8. Clarifying which outputs are libE and which are warpX; also setting u… 

    …p 'fvec' to be filled by warpX
    @jmlarson1
    jmlarson1 committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    a1439bf View commit details
    Browse the repository at this point in the history

  9. Change to store history every 100 evaluations

    @shuds13
    shuds13 committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    a52616e View commit details
    Browse the repository at this point in the history

  10. Change example run lines so both using 3 workers

    @shuds13
    shuds13 committed Apr 2, 2020
    Configuration menu
    Copy the full SHA
    4a75562 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2020

  1. tune run script to run locally or on Summit

    @MaxThevenet
    MaxThevenet committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    49dfa94 View commit details
    Browse the repository at this point in the history

  2. need to pass the input file as app_args

    @MaxThevenet
    MaxThevenet committed Apr 3, 2020
    Configuration menu
    Copy the full SHA
    bca26d9 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2020

  1. run locally with random gen_f

    @MaxThevenet
    MaxThevenet committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    881fd66 View commit details
    Browse the repository at this point in the history

  2. add Summit machine-specific parameter files

    @MaxThevenet
    MaxThevenet committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    28522b1 View commit details
    Browse the repository at this point in the history

  3. files to clean and analyse sim result

    @MaxThevenet
    MaxThevenet committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    b864895 View commit details
    Browse the repository at this point in the history

  4. plotting script

    @MaxThevenet
    MaxThevenet committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    10e191d View commit details
    Browse the repository at this point in the history

  5. minor plotting option

    @MaxThevenet
    MaxThevenet committed Apr 4, 2020
    Configuration menu
    Copy the full SHA
    29e8ad8 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2020

  1. start changes on aposmm calling script

    @MaxThevenet
    MaxThevenet committed Apr 6, 2020
    1 Configuration menu
    Copy the full SHA
    1a5e129 View commit details
    Browse the repository at this point in the history

  2. Method to prevent unnecessary imports in persistent_aposmm

    @shuds13
    shuds13 committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    8c26849 View commit details
    Browse the repository at this point in the history

  3. Add nlopt as aposmm_optimizer to run_libE_on_warpX_aposmm.py

    @shuds13
    shuds13 committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    f102034 View commit details
    Browse the repository at this point in the history

  4. Add scipy and external optimizer rc options

    @shuds13
    shuds13 committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    840cccf View commit details
    Browse the repository at this point in the history

  5. better clean

    @MaxThevenet
    MaxThevenet committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    2dbb722 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #420 from Libensemble/experimental/aposmm_rc 

    Experimental/aposmm rc
    @MaxThevenet
    MaxThevenet committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    71b1573 View commit details
    Browse the repository at this point in the history

  7. use f in in sim_specs['out']

    @MaxThevenet
    MaxThevenet committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    d21c21b View commit details
    Browse the repository at this point in the history

  8. Merge branch 'experimental/warpX' of https://github.com/Libensemble/l… 

    …ibensemble into experimental/warpX
    @MaxThevenet
    MaxThevenet committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    3bdbab3 View commit details
    Browse the repository at this point in the history

  9. WarpX runs with APOSMM, optimize energy spread

    @MaxThevenet
    MaxThevenet committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    6196052 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'develop' into experimental/warpX

    @jmlarson1
    jmlarson1 committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    6c8e1f3 View commit details
    Browse the repository at this point in the history

  11. minor changes in plotting script

    @MaxThevenet
    MaxThevenet committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    31af2dd View commit details
    Browse the repository at this point in the history

  12. Merge branch 'experimental/warpX' of https://github.com/Libensemble/l… 

    …ibensemble into experimental/warpX
    @MaxThevenet
    MaxThevenet committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    818b69c View commit details
    Browse the repository at this point in the history

  13. Fix rc initialisation error

    @shuds13
    shuds13 committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    5a21640 View commit details
    Browse the repository at this point in the history

  14. Update optimizer rc options

    @shuds13
    shuds13 committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    86fcfc5 View commit details
    Browse the repository at this point in the history

  15. update scripts so that both APOSMM and random work locally

    @MaxThevenet
    MaxThevenet committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    e81de3f View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2020

  1. minor fixes to run on Summit

    @MaxThevenet
    MaxThevenet committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    51d67f5 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2020

  1. 4 input parameters to optimize on emittance

    @MaxThevenet
    MaxThevenet committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    cd51180 View commit details
    Browse the repository at this point in the history

  2. Recommending telling APOSMM the number of workers, so that it always … 

    …keeps them busy
    @jmlarson1
    jmlarson1 committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    d8c118f View commit details
    Browse the repository at this point in the history

  3. minor changes for production run on Summit

    @MaxThevenet
    MaxThevenet committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    7c8be17 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'experimental/warpX' of https://github.com/Libensemble/l… 

    …ibensemble into experimental/warpX
    @MaxThevenet
    MaxThevenet committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    d96e8b9 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2020

  1. fix typos and get more output

    @MaxThevenet
    MaxThevenet committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    c34aa64 View commit details
    Browse the repository at this point in the history

  2. delete output files, and other minor changes

    @MaxThevenet
    MaxThevenet committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    7420479 View commit details
    Browse the repository at this point in the history

  3. Adding a comment showing how to load previously evaluated points

    @jmlarson1
    jmlarson1 committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    291c9a1 View commit details
    Browse the repository at this point in the history

  4. set timeout

    @MaxThevenet
    MaxThevenet committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    8251098 View commit details
    Browse the repository at this point in the history

  5. better plotting capabilities

    @MaxThevenet
    MaxThevenet committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    b527d6e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'experimental/warpX' of https://github.com/Libensemble/l… 

    …ibensemble into experimental/warpX
    @MaxThevenet
    MaxThevenet committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    92127c7 View commit details
    Browse the repository at this point in the history

  7. make sure random generation works well too

    @MaxThevenet
    MaxThevenet committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    6572ea7 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'experimental/warpX' of https://github.com/Libensemble/l… 

    …ibensemble into experimental/warpX
    @MaxThevenet
    MaxThevenet committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    a88cc9b View commit details
    Browse the repository at this point in the history

  9. plotting script also works with random sampling

    @MaxThevenet
    MaxThevenet committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    7a6d43c View commit details
    Browse the repository at this point in the history

  10. Merge branch 'experimental/warpX' of https://github.com/Libensemble/l… 

    …ibensemble into experimental/warpX
    @MaxThevenet
    MaxThevenet committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    7633c40 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2020

  1. flake8 changes

    @jmlarson1
    jmlarson1 committed Apr 13, 2020
    Configuration menu
    Copy the full SHA
    b0d4930 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2020

  1. flake8 allowing of imports for new approach for persistent_aposmm loc… 

    …alopt dependencies
    @jmlarson1
    jmlarson1 committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    571296c View commit details
    Browse the repository at this point in the history

  2. Whitespace

    @jmlarson1
    jmlarson1 committed Apr 14, 2020
    Configuration menu
    Copy the full SHA
    3a13f45 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2020

  1. Syntax error

    @jmlarson1
    jmlarson1 committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    46c5336 View commit details
    Browse the repository at this point in the history

  2. flake8

    @jmlarson1
    jmlarson1 committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    54b00b1 View commit details
    Browse the repository at this point in the history

  3. Allowing imports after commands for persistent_aposmm files

    @jmlarson1
    jmlarson1 committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    073b3b2 View commit details
    Browse the repository at this point in the history

  4. Using new functionality in all-but-one test

    @jmlarson1
    jmlarson1 committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    a8d5d10 View commit details
    Browse the repository at this point in the history

  5. Resolving conflict in flake8 file

    @jmlarson1
    jmlarson1 committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    3f189ac View commit details
    Browse the repository at this point in the history

  6. New version of LibEnsemble/WarpX scripts, consistent with WarpX maste… 

    …r branch

Co-authored-by: jmlarson1 <jmlarson@anl.gov>
Co-authored-by: shuds13 <shudson@anl.gov>
    @MaxThevenet @jmlarson1 @shuds13
    3 people committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    80a3c10 View commit details
    Browse the repository at this point in the history

  7. Make aposmm_optimizer take a list

    @shuds13
    shuds13 committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    e8293ed View commit details
    Browse the repository at this point in the history

  8. flake8 fix to periodic test

    @shuds13
    shuds13 committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    d3d96e1 View commit details
    Browse the repository at this point in the history

  9. Fixing nonpersistent aposmm calls to use new imports

    @jmlarson1
    jmlarson1 committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    51037fb View commit details
    Browse the repository at this point in the history

  10. Renaming files using aposmm

    @jmlarson1
    jmlarson1 committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    b11ffdb View commit details
    Browse the repository at this point in the history

  11. Resolving conflict

    @jmlarson1
    jmlarson1 committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    6cd7181 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2020

  1. Merge new test into aposmm_rc branch

    @shuds13
    shuds13 committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    a8b00c9 View commit details
    Browse the repository at this point in the history

  2. Remove old files

    @shuds13
    shuds13 committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    397dab5 View commit details
    Browse the repository at this point in the history

  3. Document aposmm_optimizer configuration options

    @shuds13
    shuds13 committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    cd4146c View commit details
    Browse the repository at this point in the history

  4. Fixing persistent_aposmm autodoc

    @jmlarson1
    jmlarson1 committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    a6dbe98 View commit details
    Browse the repository at this point in the history

  5. Adding gen_funcs and some documentation

    @jmlarson1
    jmlarson1 committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    c24b626 View commit details
    Browse the repository at this point in the history

  6. Flake8 changes

    @jmlarson1
    jmlarson1 committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    75133f4 View commit details
    Browse the repository at this point in the history

  7. Minor fixes

    @shuds13
    shuds13 committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    0bd20b6 View commit details
    Browse the repository at this point in the history

  8. Rename aposmm_optimizer to aposmm_optimizers

    @shuds13
    shuds13 committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    756eab1 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'experimental/aposmm_rc' of github.com:Libensemble/liben… 

    …semble into experimental/aposmm_rc
    @shuds13
    shuds13 committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    4022db9 View commit details
    Browse the repository at this point in the history

  10. Fixing broken regression test

    @jmlarson1
    jmlarson1 committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    5bbddf0 View commit details
    Browse the repository at this point in the history

  11. Fixing broken regression test 

    (cherry picked from commit 5bbddf0)
    @jmlarson1
    jmlarson1 committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    b8d30ce View commit details
    Browse the repository at this point in the history

  12. Merge changes in test_aposmm_sim_dirs.py

    @shuds13
    shuds13 committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    ab652ea View commit details
    Browse the repository at this point in the history

  13. Fixing regression test calling petsc for the second run

    @jmlarson1
    jmlarson1 committed Apr 16, 2020
    Configuration menu
    Copy the full SHA
    1fbd6f6 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2020

  1. Merge branch 'experimental/aposmm_rc' into docs/more_gens

    @jmlarson1
    jmlarson1 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    0f14171 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #426 from Libensemble/experimental/aposmm_rc 

    Experimental/aposmm rc
    @shuds13
    shuds13 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    1377972 View commit details
    Browse the repository at this point in the history

  3. Working on APOSMM docs

    @jmlarson1
    jmlarson1 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    119dcb8 View commit details
    Browse the repository at this point in the history

  4. Documenting new localoptinterfacer file

    @jmlarson1
    jmlarson1 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    bdc2be1 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into docs/more_gens

    @jmlarson1
    jmlarson1 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    ff9fe26 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into experimental/warpX

    @jmlarson1
    jmlarson1 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    b58c58e View commit details
    Browse the repository at this point in the history

  7. Merge pull request #428 from Libensemble/docs/more_gens 

    Docs/more gens
    @jmlarson1
    jmlarson1 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    5fd84e5 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'experimental/warpX' into experimental/aposmm_rc

    @jmlarson1
    jmlarson1 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    57ca8c7 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #431 from Libensemble/experimental/aposmm_rc 

    Experimental/aposmm rc
    @shuds13
    shuds13 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    64612b8 View commit details
    Browse the repository at this point in the history

  10. Resolving aposmm merge

    @jmlarson1
    jmlarson1 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    acec898 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'develop' into experimental/warpX

    @jmlarson1
    jmlarson1 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    1e7c6de View commit details
    Browse the repository at this point in the history

  12. Fixing init for new opt_flag arg

    @jmlarson1
    jmlarson1 committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    3183bae View commit details
    Browse the repository at this point in the history