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

Use probability sampling over periodic sampling #213

Merged
merged 95 commits into from
May 23, 2024

Commits on Oct 13, 2023

  1. Configuration menu
    Copy the full SHA
    6bfca81 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fab829a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    eeccd10 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d0a24ba View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

  1. Update kp_sampler_skip.cpp: put erase back

    Erase got deleted (there on the develop branch) 
    
    Took it out due to copy-paste
    vlkale authored Oct 23, 2023
    Configuration menu
    Copy the full SHA
    9df6748 View commit details
    Browse the repository at this point in the history
  2. Update kp_sampler_skip.cpp: putting in seed

    User can input seed for RNG for probabilistic sampling
    vlkale authored Oct 23, 2023
    Configuration menu
    Copy the full SHA
    b629300 View commit details
    Browse the repository at this point in the history
  3. kp_sampler: set default seed to -1, tool fence verbosity

    Vivek Kale authored and Vivek Kale committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    df84895 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    624a14d View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. Configuration menu
    Copy the full SHA
    bd237ac View commit details
    Browse the repository at this point in the history
  2. fix readme indent

    vlkale committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    27ea88d View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. kp_sampler: fix name of seed environment varable and else condition f…

    …or seed for user input + README
    vlkale committed Oct 26, 2023
    Configuration menu
    Copy the full SHA
    ad08a5e View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. Configuration menu
    Copy the full SHA
    5c1a272 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2024

  1. Configuration menu
    Copy the full SHA
    9dbd16b View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2024

  1. intitialized pointer

    vlkale committed Jan 29, 2024
    Configuration menu
    Copy the full SHA
    a6dd9dc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    52e3349 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2024

  1. Configuration menu
    Copy the full SHA
    dae1f2c View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. Configuration menu
    Copy the full SHA
    68c1093 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8c56daf View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a2b8577 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. Configuration menu
    Copy the full SHA
    43bd1a2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8021f36 View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. Configuration menu
    Copy the full SHA
    e4e2121 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5b66f90 View commit details
    Browse the repository at this point in the history
  3. Create CMakeLists.txt

    vlkale authored Feb 29, 2024
    Configuration menu
    Copy the full SHA
    d89291e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e1f7c22 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d020036 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Configuration menu
    Copy the full SHA
    d2b0a69 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cc9118d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fc3cc11 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7f519ef View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0df7f5c View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9ee7600 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    4c241a2 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    e6e6545 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    377ffa8 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    74f9196 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Configuration menu
    Copy the full SHA
    e337319 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d74eae7 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. Configuration menu
    Copy the full SHA
    6049952 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0c9ce3f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    64c6a58 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    486ba9e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d509a6e View commit details
    Browse the repository at this point in the history
  6. fix test randomized sampling

    vlkale committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    2c84bcc View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    3cb33b4 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    e4c4f6b View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    fa33166 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    3c1fb93 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    375ebba View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    c19c018 View commit details
    Browse the repository at this point in the history
  13. add cmake

    vlkale committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    8317118 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    5bb8e7d View commit details
    Browse the repository at this point in the history
  15. random sampling

    vlkale committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    9517af5 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. Configuration menu
    Copy the full SHA
    a03955e View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2024

  1. Configuration menu
    Copy the full SHA
    a4285d3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    090245b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    371ae92 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    27e112b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    ceb1e2d View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2024

  1. Configuration menu
    Copy the full SHA
    44f1eb7 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. Configuration menu
    Copy the full SHA
    19cbc2c View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. Working

    masterleinad committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    c309f0e View commit details
    Browse the repository at this point in the history
  2. Almost working

    masterleinad committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    8cab46a View commit details
    Browse the repository at this point in the history
  3. Still working

    masterleinad committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    83d17fb View commit details
    Browse the repository at this point in the history
  4. Use cout in sampler

    masterleinad committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    e683d6f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c93d11c View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Configuration menu
    Copy the full SHA
    9d98e9e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    828597d View commit details
    Browse the repository at this point in the history
  3. More indentation

    masterleinad committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    7f0cd8a View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. Merge pull request #9 from masterleinad/use-probability-sampling

    Fix kokkos#213 - Merge printf conversion to cout in sampler for the sake of Gtest.  We may want to provide an option of std::cout or printf for the user in the future. I am keeping this as is for now.
    vlkale authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    d1b2036 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Configuration menu
    Copy the full SHA
    2a376ca View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. Configuration menu
    Copy the full SHA
    b052594 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ce93309 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0d8e79a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c16004a View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. Prob smplr (#16)

    * CMakeLists.txt: add_library to kp_add_library
    
    Sampler's CMakeLists.txt: add_library to kp_add_library
    
    * kp_core.hpp: remove pointer from ptpi
    
    * kp_sampler_skip.cpp: pass by value kokkosp_p_t_p_i
    
    kp_sampler_skip.cpp: last parameter should be passed by value rather than pointer in kokkosp_p_t_p_i
    
    * kp_sampler_skip.cpp: remove dereference assignment for ptpi callback
    
    * kp_core.hpp: apply clang-format
    
    * Create test_sampler.cpp
    
    * CMakeLists.txt: set up test for sampler
    
    * test_sampler.cpp: put in code for sampler test
    
    * test_sampler.cpp: typo in comment (2 invocation --> 2 invocations)
    
    * CMakeLists.txt: support sampler test
    
    * kp_sampler_skip.cpp: change printf to std::out for ctests
    
    * kp_sampler_skip.cpp: include iostream for std::cout
    
    * Update kp_sampler_skip.cpp: \n instead of std::endl
    
    \n is faster for performance
    
    * kp_sampler_skip.cpp: apply clang format
    
    * kp_sampler_skip.cpp: fix for std::out of tool-invoked fence verbose debug print
    
    * kp_sampler_skip.cpp: apply clang format
    
    * Rename test_sampler.cpp to test_parfor.cpp
    
    * Update CMakeLists.txt: reduce and scan sampling tests
    
    * Create test_parreduce.cpp
    
    * Create test_parscan.cpp
    
    * Update test_parreduce.cpp: parallel_reduce function 
    
    Test based on example shown at: https://kokkos.org/kokkos-core-wiki/API/core/parallel-dispatch/parallel_reduce.html
    
    * test_parscan.cpp: put in test for sampling parallel_scan
    
    Parallel scan sampling test based on example here: 
    
    https://kokkos.org/kokkos-core-wiki/API/core/parallel-dispatch/parallel_scan.html
    
    * Update test_parreduce.cpp: fix x[i] to x(i) 
    
    View  index access of x does not use []
    
    * Update test_parreduce.cpp: Kokkos:: for View
    
    * test_parreduce.cpp: reduce lambda
    
    * Update test_parscan.cpp: operator for cuda/hip build
    
    * test_parscan.cpp: support scan test function
    
    * test_parreduce.cpp: reduction operator second argument 
    
    second argument
    
    * test_parscan.cpp: fix scan test operator
    
    * Update test_parscan.cpp: fix scan test to have to Views
    
    * test_parscan.cpp: policy to size
    
    * Update kp_kernel_logger.cpp: fix typo for scan callback
    
    The typo was kokkospk_end_parallel_scan. This causes the third test for the sampler to fail.
    
    * test_parscan.cpp: apply clang format
    
    * test_parreduce.cpp: apply clang format
    
    * CMakeLists.txt: add_library -> kp_add_library
    
    * kp_sampler_skip.cpp: put in prob samplr
    
    * CMakeLists.txt: sampling prob test
    
    * Create test_parfor_prob.cpp
    
    * Create test_parreduce_prob.cpp
    
    * Create test_parscan_prob.cpp
    
    * test_parfor_prob.cpp: edit matchers for prob sampling
    
    * test_parreduce_prob.cpp: fix matchers
    
    * Update test_parscan_prob.cpp: fix parscan test matchers
    
    * Update test_parscan_prob.cpp: fix test comments
    
    * test_parfor_prob.cpp: fix comments
    
    * Update test_parreduce_prob.cpp: fix comments
    
    * test_parfor.cpp: update matcher
    
    * Update test_parscan.cpp: fix matchers
    
    * test_parreduce.cpp: matchers fix
    
    * Update kp_sampler_skip.cpp: add cout for end_parallel_xxx
    
    * Update test_parfor.cpp: put in finished with end in matchers
    
    * Update test_parscan.cpp: update matchers / comments removal
    
    * test_parreduce.cpp: fix matchers
    
    * Update kp_sampler_skip.cpp: fix elipses
    
    * test_parscan.cpp: apply clang format
    
    * CMakeLists.txt: skip rate is 0
    
    * test_parscan.cpp: apply clang format
    
    * test_parfor_prob.cpp: apply clang format
    
    * Update README.md: add sampler entry
    
    * test_parreduce_prob.cpp: apply clang format
    
    * kp_sampler_skip.cpp: apply clang format
    
    * README.md: sampler README for probability
    
    * test_parreduce.cpp: fix int ref in operator
    
    * test_parscan.cpp: int ref in operator
    
    * test_parscan.cpp: long int in signature
    
    * test_parreduce.cpp: long int in second argument to operator
    
    * Update test_parreduce.cpp: change sum to int type
    
    * Update test_parreduce.cpp: declare sum as long int
    
    * Update kp_kernel_logger.cpp: kokkospk_end_parallel_scan --> kokkosp_end_parallel_scan
    
    * Update README.md
    
    Co-authored-by: Daniel Arndt <arndtd@ornl.gov>
    
    * Update test_parfor.cpp
    
    * test_parfor.cpp: put in fence test
    
    * Update test_parfor.cpp: put in checks for number of calls and Null Ptr fence
    
    * test_parfor.cpp: apply clang format
    
    * fix test par for
    
    * test_parfor.cpp: apply clang format
    
    * kp_sampler_skip.cpp: fix sampler std::cout prints for test
    
    * test_parfor.cpp: apply clang format
    
    * test_parfor.cpp: fixing matcher string for number contains
    
    * Update test_parfor.cpp: not substr
    
    * test_parfor.cpp: apply clang format
    
    * kp_sampler_skip.cpp: apply clang format
    
    * test_parfor.cpp: apply clang format
    
    * test_parfor.cpp: apply clang format
    
    * Update test_parfor.cpp
    
    * test_parfor.cpp: apply clang format
    
    * test_parfor.cpp: Times function
    
    * delete file accidentally put in tests directory
    
    * Update test_parfor.cpp: remove AtMost
    
    * Update test_parfor.cpp: remove using AtMost
    
    * kp_sampler_skip.cpp: put back in
    
    * Update test_parreduce.cpp
    
    * test_parfor.cpp: remove count for number of times
    
    * Update test_parscan.cpp
    
    * Update test_parfor.cpp: removing Contains
    
    * kp_sampler_skip.cpp: apply clang format
    
    * test_parfor.cpp: apply clang format
    
    * test_parreduce.cpp: apply clang format
    
    * test_parscan.cpp: apply clang format
    
    * Update test_parfor.cpp: putting in times
    
    * test_parfor.cpp: apply clang format
    
    * Update test_parreduce.cpp: put in times
    
    * test_parscan.cpp: put in times test
    
    * test_parscan.cpp: apply clang format
    
    * test_parreduce.cpp: apply clang format
    
    * test_parscan.cpp: apply clang format
    
    * test_parscan.cpp: apply clang format
    
    * test_parreduce.cpp: apply clang format
    
    * test_parfor.cpp: apply clang format
    
    * test_parfor.cpp: apply clang format
    
    * test_parreduce.cpp: apply clang format
    
    * test_parscan.cpp: apply clang format
    
    * kp_sampler_skip.cpp: std::cout to std::cerr
    
    Co-authored-by: Daniel Arndt <arndtd@ornl.gov>
    
    * test_parscan.cpp: fix declaration for variable result
    
    Co-authored-by: Damien L-G <dalg24+github@gmail.com>
    
    * test_parfor.cpp: revisions of tests PR review
    
    * test_parreduce.cpp: fix with new tests
    
    * test_parscan.cpp: fix sampler scan
    
    * test_parreduce.cpp: fix with correct samples and comments
    
    * CMakeLists.txt: fix sampler skip rate
    
    * test_parfor.cpp: add string header
    
    * test_parreduce.cpp: add string header
    
    * test_parscan.cpp: add string header
    
    * Update test_parfor.cpp: fix output
    
    * test_parreduce.cpp: fix test
    
    * test_parscan.cpp: fix occurrences variable
    
    * test_parfor.cpp: apply clang format
    
    * test_parreduce.cpp: apply clang format
    
    * test_parscan.cpp: apply clang format
    
    * test_parreduce.cpp: apply clang format
    
    * test_parfor.cpp: fix sampler number from 11 to 12
    
    * test_parreduce.cpp: sample number from 11 to 12
    
    * test_parscan.cpp: change sample from 11 to 12
    
    * kp_sampler_skip.cpp: revert cerr to cout
    
    * CMakeLists.txt: make global fences 0
    
    * CMakeLists.txt: remove setting of global fence environment variable
    
    * Put in tests for sampler  (kokkos#248)
    
    * CMakeLists.txt: tests for prob sampling
    
    Without fence and with fence
    
    * parreduce.hpp: file for parallel reduce
    
    * Update parreduce.hpp: putting once pragma for header
    
    * parfor.hpp: header file for parfor
    
    * parfor.hpp: put in code for Kokkos parallel for test
    
    * Create parscan.hpp: parscan code file
    
    * parscan.hpp: put in code for scan
    
    * test_parreduce.cpp: deleting parreduce header
    
    * test_parscan.cpp: using header for parscan
    
    * test_parfor.cpp: parfor header
    
    * test_parfor_prob.cpp: header
    
    * test_parreduce_prob.cpp: putting in parreduce hpp
    
    * test_parscan_prob.cpp: fix includes
    
    * test_parreduce_prob.cpp: HasSubStr to HasSubstr
    
    * new MatchersProb based on random seed two from CI build test OpenMP
    
    * matchersProb.hpp: update
    
    * test_par*_prob.cpp: apply clang format
    
    * test_parfor.cpp: apply clang format
    
    * matchersProb.hpp: fix to matchers - apply clang format
    
    * matchersProb.hpp: fix to matchers semicolon apply clang format
    
    * matchersProb.hpp: fix to matchers semicolon apply clang format
    
    ---------
    
    Co-authored-by: Christian Trott <crtrott@sandia.gov>
    Co-authored-by: Damien L-G <dalg24@gmail.com>
    Co-authored-by: Daniel Arndt <arndtd@ornl.gov>
    Co-authored-by: Damien L-G <dalg24+github@gmail.com>
    5 people authored Apr 11, 2024
    Configuration menu
    Copy the full SHA
    3178c8b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d280cbb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ca54d35 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    75f9057 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. Configuration menu
    Copy the full SHA
    43868da View commit details
    Browse the repository at this point in the history
  2. Delete matchersProb.hpp

    vlkale authored May 2, 2024
    Configuration menu
    Copy the full SHA
    6f9cd82 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    39db70d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8d28cf6 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. kp_sampler_skip.cpp: Remove small changes not relating to this PR

    Fixing inconsistencies of diff with develop that shouldn't be there. These changes do not belong to this PR. They changes comprise primarily of minor changes with printed output. These unintended changes that I have taken out don't change any core logic or control flow in the program.
    vlkale authored May 3, 2024
    Configuration menu
    Copy the full SHA
    e28dccd View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    367ca77 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    af97417 View commit details
    Browse the repository at this point in the history
  4. CMakeLists.txt for test tools: comment in sampler prob environment va…

    …riable should refer to that variable and not sampler skip
    vlkale committed May 3, 2024
    Configuration menu
    Copy the full SHA
    4c48eb0 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    bb538bb View commit details
    Browse the repository at this point in the history
  6. kp_sampler_skip.cpp: make probability sampling the priority (as before)

    Fix from a previous suggestion from contributed commit  - it may have been misunderstood that probability sampling is the priority here (I should have caught this).
    
    Co-authored-by: Christian Trott <crtrott@sandia.gov>
    vlkale and crtrott authored May 3, 2024
    Configuration menu
    Copy the full SHA
    b03c2c4 View commit details
    Browse the repository at this point in the history
  7. kp_sampler_skip.cpp: fix conditional as per review request

    I put comments to make clear the desired behavior. Note that the conditional shouldn't be needed.
    vlkale authored May 3, 2024
    Configuration menu
    Copy the full SHA
    d571b94 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    a426547 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. Configuration menu
    Copy the full SHA
    1999883 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Configuration menu
    Copy the full SHA
    4cdf85d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f4627df View commit details
    Browse the repository at this point in the history
  3. Fix clang-format

    crtrott committed May 23, 2024
    Configuration menu
    Copy the full SHA
    679ba48 View commit details
    Browse the repository at this point in the history