fix conflict (37c1ef3a) · Commits · Azhar Faturahman / SISTER_WE_THE_CLOWN_PART_2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

S

SISTER_WE_THE_CLOWN_PART_2
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Azhar Faturahman
SISTER_WE_THE_CLOWN_PART_2
Commits
37c1ef3a

Commit 37c1ef3a authored 3 years ago by

andhikarei

Downloads
- Plain Diff

fix conflict

parents bd923429 e2a62bbb

Branches

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

result/K01-03-TC1_parallel.txt 1 addition, 1 deletion

result/K01-03-TC1_parallel.txt
result/K01-03-TC1_serial.txt 1 addition, 1 deletion

result/K01-03-TC1_serial.txt
result/K01-03-TC2_parallel.txt 1 addition, 1 deletion

result/K01-03-TC2_parallel.txt
result/K01-03-TC2_serial.txt 6 additions, 0 deletions

result/K01-03-TC2_serial.txt
result/K01-03-TC3_parallel.txt 1 addition, 1 deletion

result/K01-03-TC3_parallel.txt
result/K01-03-TC3_serial.txt 1 addition, 1 deletion

result/K01-03-TC3_serial.txt
result/K01-03-TC4_parallel.txt 1 addition, 1 deletion

result/K01-03-TC4_parallel.txt
result/K01-03-TC4_serial.txt 1 addition, 1 deletion

result/K01-03-TC4_serial.txt
src/lib/bitonic_sort.cu 25 additions, 12 deletions

src/lib/bitonic_sort.cu
src/lib/brick_sort.cu 31 additions, 24 deletions

src/lib/brick_sort.cu
src/lib/brick_sort.cuh 1 addition, 1 deletion

src/lib/brick_sort.cuh
src/parallel_collab.cu 469 additions, 0 deletions

src/parallel_collab.cu

with 539 additions and 44 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment