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

counting argument size of actions, initial pass. #584

Closed
wants to merge 166 commits into from
Closed

counting argument size of actions, initial pass. #584

wants to merge 166 commits into from

Conversation

vamatya
Copy link
Member

@vamatya vamatya commented Oct 24, 2012

The title of commits are off, will fix in next commit.

vamatya and others added 30 commits August 1, 2012 21:06
" ============================================================================
" Netrw Directory Listing                                        (netrw v143)
"   /home/vamatya/packages/src/hpx-git-fork/examples
"   Sorted by      name
"   Sort sequence: [\/]$,\<core\%(\.\d\+\)\=\>,\.h$,\.c$,\.cpp$,\~\=\*$,*,\.o$,\.obj$,\.info$,\.swp$,\.bak$,\~$
"   Quick Help: <F1>:help  -:go up dir  D:delete  R:rename  s:sort-by  x:exec
" ============================================================================
../
1d_hydro/
accumulator/
adaptive1d/
adaptive_dataflow/
allgather/
async_io/
balancing/
bfs/
bright_future/
cancelable_action/
dataflow/
distributed_test/
embarrassingly_parallel/
fortran_threadsafe/
fractal_visualizer/
geometry/
gravity/
gtc/
gtc_optimized/
heartbeat/
hello_world_component/
hplpx/
hpxla/
interpolate1d/
interpolate3d/
jacobi/
nbody/
nqueen/
object_semaphore/
performance_counters/
queue/
quickstart/
random_mem_access/
sheneos/
spell_check/
startup_shutdown/
throttle/
CMakeLists.txt
Adding hpx::start/hpx::stop as an alternative model to write HPX applications (leaving the main thread non-blocking).
Added new example demonstrating the new functions.
brycelelbach and others added 28 commits October 24, 2012 14:09
Revert "Parcels: Get rid of the serialization header."

This reverts commit 5b0709a.
commit arg_counter stuff

merge conflicts
@sithhell
Copy link
Member

Could you please clean the history here?
Using git rebase -i should do the trick. Or checkout a clean branch from master and cherry-pick your commits.

Thanks

P.S.: To avoid this in future pull requests, use "git pull --rebase" when updating to latest trunk. This will keep your history nice and clean

@sithhell sithhell closed this Oct 24, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants