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

Minor changes for APEX support #1783

Merged
merged 24 commits into from Oct 10, 2015
Merged

Minor changes for APEX support #1783

merged 24 commits into from Oct 10, 2015

Commits on Sep 17, 2015

  1. HPX_HAVE_APEX was defined twice. Must have happened with the 

    pull request merge.
    @khuck
    khuck committed Sep 17, 2015
    Copy the full SHA
    d2cfdca View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2015

  1. Merge branch 'master' of github.com:STEllAR-GROUP/hpx

    @khuck
    khuck committed Sep 22, 2015
    Copy the full SHA
    51b0d21 View commit details
    Browse the repository at this point in the history

  2. Changes for APEX+TAU support

    @khuck
    khuck committed Sep 22, 2015
    Copy the full SHA
    3f9fcd0 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2015

  1. Merge branch 'master' of github.com:STEllAR-GROUP/hpx

    @khuck
    khuck committed Sep 23, 2015
    Copy the full SHA
    42814c5 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2015

  1. Cleaning up code related to throttling scheduler

    @hkaiser
    hkaiser committed Sep 26, 2015
    Copy the full SHA
    dd6b1c9 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2015

  1. Merge branch 'master' of github.com:khuck/hpx

    @khuck
    khuck committed Oct 4, 2015
    Copy the full SHA
    2f92f49 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2015

  1. Minor changes to fix include problems - there is an apex.hpp in APEX, 

    and one in HPX. The include paths are now explicit, and the apex.hpp
in HPX was missing "#pragma once".
    @khuck
    khuck committed Oct 5, 2015
    Copy the full SHA
    150c920 View commit details
    Browse the repository at this point in the history

  2. Removed "NO_UPDATE" for APEX git include.

    @khuck
    khuck committed Oct 5, 2015
    Copy the full SHA
    b8eaea1 View commit details
    Browse the repository at this point in the history

  3. Remove include of apex.hpp - only use apex_api.hpp.

    @khuck
    khuck committed Oct 5, 2015
    Copy the full SHA
    170b947 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of github.com:khuck/hpx

    @khuck
    khuck committed Oct 5, 2015
    Copy the full SHA
    1956ce4 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into master

    @khuck
    khuck committed Oct 5, 2015
    Copy the full SHA
    158c369 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of github.com:STEllAR-GROUP/hpx

    @khuck
    khuck committed Oct 5, 2015
    Copy the full SHA
    2837858 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of github.com:khuck/hpx

    @khuck
    khuck committed Oct 5, 2015
    Copy the full SHA
    ce78ef6 View commit details
    Browse the repository at this point in the history

  8. remove apex.hpp - only need apex_api.hpp.

    @khuck
    khuck committed Oct 5, 2015
    Copy the full SHA
    86a975d View commit details
    Browse the repository at this point in the history

  9. Removing apex.hpp includes.

    @khuck
    khuck committed Oct 5, 2015
    Copy the full SHA
    d76b310 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2015

  1. Merge branch 'master' of github.com:STEllAR-GROUP/hpx

    @khuck
    khuck committed Oct 6, 2015
    Copy the full SHA
    c6cfd16 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'throttle_scheduler' of github.com:STEllAR-GROUP/hpx 

    Conflicts:
	hpx/runtime/threads/policies/throttle_queue_scheduler.hpp
    @khuck
    khuck committed Oct 6, 2015
    Copy the full SHA
    89e6eaa View commit details
    Browse the repository at this point in the history

  3. Adding 1d stencil throttle example.

    @khuck
    khuck committed Oct 6, 2015
    Copy the full SHA
    b4d7fe1 View commit details
    Browse the repository at this point in the history

  4. Fixing line limit problem due to missing namespaces.

    @khuck
    khuck committed Oct 6, 2015
    Copy the full SHA
    5f59fc9 View commit details
    Browse the repository at this point in the history

  5. Throttling is all working now. Hooray!

    @khuck
    khuck committed Oct 6, 2015
    Copy the full SHA
    6bbb086 View commit details
    Browse the repository at this point in the history

  6. Adding a brief readme for running the APEX examples.

    @khuck
    khuck committed Oct 6, 2015
    Copy the full SHA
    2e6e214 View commit details
    Browse the repository at this point in the history

  7. Cleaning up files that fail "inspection".

    @khuck
    khuck committed Oct 6, 2015
    Copy the full SHA
    5e405f3 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2015

  1. Merge branch 'master' into master

    @khuck
    khuck committed Oct 7, 2015
    Copy the full SHA
    88f2292 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2015

  1. Merge branch 'master' into master

    @khuck
    khuck committed Oct 9, 2015
    Copy the full SHA
    0b88920 View commit details
    Browse the repository at this point in the history