{"action":"created","comment":{"url":"https://api.github.com/repos/harvard-cs205/cs205-homework/pulls/comments/47865960","id":47865960,"diff_hunk":"@@ -54,39 +54,47 @@ cpdef move_data_serial(np.int32_t[:] counts,\n                        np.int32_t[:] src,\n                        np.int32_t[:] dest,\n                        int repeat):\n-   cdef:\n-       int idx, r\n-\n-   assert src.size == dest.size, \"Sizes of src and dest arrays must match\"\n-   with nogil:\n-       for r in range(repeat):\n-           for idx in range(src.shape[0]):\n-               if counts[src[idx]] > 0:\n-                   counts[dest[idx]] += 1\n-                   counts[src[idx]] -= 1\n+    cdef:\n+        int idx, r\n \n+    assert src.size == dest.size, \"Sizes of src and dest arrays must match\"\n+    with nogil:\n+        for r in range(repeat):\n+            for idx in range(src.shape[0]):                  \n+                if counts[src[idx]] > 0:\n+                    counts[dest[idx]] += 1\n+                    counts[src[idx]] -= 1\n \n cpdef move_data_fine_grained(np.int32_t[:] counts,\n                              np.int32_t[:] src,\n                              np.int32_t[:] dest,\n                              int repeat):\n-   cdef:\n-       int idx, r\n-       omp_lock_t *locks = get_N_locks(counts.shape[0])\n-\n-   ##########\n-   # Your code here\n-   # Use parallel.prange() and a lock for each element of counts to parallelize\n-   # data movement.  Be sure to avoid deadlock, and double-locking.\n-   ##########\n-   with nogil:\n-       for r in range(repeat):\n-           for idx in range(src.shape[0]):\n-               if counts[src[idx]] > 0:\n-                   counts[dest[idx]] += 1\n-                   counts[src[idx]] -= 1\n-\n-   free_N_locks(counts.shape[0], locks)\n+    cdef:\n+        int idx, r\n+        omp_lock_t *locks = get_N_locks(counts.shape[0])\n+\n+    ##########\n+    # Your code here\n+    # Use parallel.prange() and a lock for each element of counts to parallelize\n+    # data movement.  Be sure to avoid deadlock, and double-locking.\n+    ##########\n+    \n+    with nogil:              \n+            for r in range(repeat):\n+                \n+                #Parallelize over 4 threads                \n+                for idx in prange(src.shape[0],num_threads=4):\n+                    if counts[src[idx]] > 0:","path":"HW2/P2/parallel_vector.pyx","position":61,"original_position":61,"commit_id":"b41469a917eb15cf39b2dae11b2381c220278106","original_commit_id":"b41469a917eb15cf39b2dae11b2381c220278106","user":{"login":"zezhouliu","id":3782704,"avatar_url":"https://avatars.githubusercontent.com/u/3782704?v=3","gravatar_id":"","url":"https://api.github.com/users/zezhouliu","html_url":"https://github.com/zezhouliu","followers_url":"https://api.github.com/users/zezhouliu/followers","following_url":"https://api.github.com/users/zezhouliu/following{/other_user}","gists_url":"https://api.github.com/users/zezhouliu/gists{/gist_id}","starred_url":"https://api.github.com/users/zezhouliu/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zezhouliu/subscriptions","organizations_url":"https://api.github.com/users/zezhouliu/orgs","repos_url":"https://api.github.com/users/zezhouliu/repos","events_url":"https://api.github.com/users/zezhouliu/events{/privacy}","received_events_url":"https://api.github.com/users/zezhouliu/received_events","type":"User","site_admin":false},"body":"yes! this happens if counts[src[idx]] changes between now and acquiring the lock. You usually want to check the same condition again after acquiring the lock","created_at":"2015-12-17T03:33:18Z","updated_at":"2015-12-17T03:33:18Z","html_url":"https://github.com/harvard-cs205/cs205-homework/pull/333#discussion_r47865960","pull_request_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/pulls/333","_links":{"self":{"href":"https://api.github.com/repos/harvard-cs205/cs205-homework/pulls/comments/47865960"},"html":{"href":"https://github.com/harvard-cs205/cs205-homework/pull/333#discussion_r47865960"},"pull_request":{"href":"https://api.github.com/repos/harvard-cs205/cs205-homework/pulls/333"}}},"pull_request":{"url":"https://api.github.com/repos/harvard-cs205/cs205-homework/pulls/333","id":49740765,"html_url":"https://github.com/harvard-cs205/cs205-homework/pull/333","diff_url":"https://github.com/harvard-cs205/cs205-homework/pull/333.diff","patch_url":"https://github.com/harvard-cs205/cs205-homework/pull/333.patch","issue_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/issues/333","number":333,"state":"open","locked":false,"title":"HW2 Submission","user":{"login":"apetschek","id":14096871,"avatar_url":"https://avatars.githubusercontent.com/u/14096871?v=3","gravatar_id":"","url":"https://api.github.com/users/apetschek","html_url":"https://github.com/apetschek","followers_url":"https://api.github.com/users/apetschek/followers","following_url":"https://api.github.com/users/apetschek/following{/other_user}","gists_url":"https://api.github.com/users/apetschek/gists{/gist_id}","starred_url":"https://api.github.com/users/apetschek/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/apetschek/subscriptions","organizations_url":"https://api.github.com/users/apetschek/orgs","repos_url":"https://api.github.com/users/apetschek/repos","events_url":"https://api.github.com/users/apetschek/events{/privacy}","received_events_url":"https://api.github.com/users/apetschek/received_events","type":"User","site_admin":false},"body":"","created_at":"2015-11-04T20:27:46Z","updated_at":"2015-12-17T03:33:18Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/pulls/333/commits","review_comments_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/pulls/333/comments","review_comment_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/pulls/comments{/number}","comments_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/issues/333/comments","statuses_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/statuses/b41469a917eb15cf39b2dae11b2381c220278106","head":{"label":"apetschek:HW2","ref":"HW2","sha":"b41469a917eb15cf39b2dae11b2381c220278106","user":{"login":"apetschek","id":14096871,"avatar_url":"https://avatars.githubusercontent.com/u/14096871?v=3","gravatar_id":"","url":"https://api.github.com/users/apetschek","html_url":"https://github.com/apetschek","followers_url":"https://api.github.com/users/apetschek/followers","following_url":"https://api.github.com/users/apetschek/following{/other_user}","gists_url":"https://api.github.com/users/apetschek/gists{/gist_id}","starred_url":"https://api.github.com/users/apetschek/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/apetschek/subscriptions","organizations_url":"https://api.github.com/users/apetschek/orgs","repos_url":"https://api.github.com/users/apetschek/repos","events_url":"https://api.github.com/users/apetschek/events{/privacy}","received_events_url":"https://api.github.com/users/apetschek/received_events","type":"User","site_admin":false},"repo":{"id":41874803,"name":"cs205-homework","full_name":"apetschek/cs205-homework","owner":{"login":"apetschek","id":14096871,"avatar_url":"https://avatars.githubusercontent.com/u/14096871?v=3","gravatar_id":"","url":"https://api.github.com/users/apetschek","html_url":"https://github.com/apetschek","followers_url":"https://api.github.com/users/apetschek/followers","following_url":"https://api.github.com/users/apetschek/following{/other_user}","gists_url":"https://api.github.com/users/apetschek/gists{/gist_id}","starred_url":"https://api.github.com/users/apetschek/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/apetschek/subscriptions","organizations_url":"https://api.github.com/users/apetschek/orgs","repos_url":"https://api.github.com/users/apetschek/repos","events_url":"https://api.github.com/users/apetschek/events{/privacy}","received_events_url":"https://api.github.com/users/apetschek/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/apetschek/cs205-homework","description":"","fork":true,"url":"https://api.github.com/repos/apetschek/cs205-homework","forks_url":"https://api.github.com/repos/apetschek/cs205-homework/forks","keys_url":"https://api.github.com/repos/apetschek/cs205-homework/keys{/key_id}","collaborators_url":"https://api.github.com/repos/apetschek/cs205-homework/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/apetschek/cs205-homework/teams","hooks_url":"https://api.github.com/repos/apetschek/cs205-homework/hooks","issue_events_url":"https://api.github.com/repos/apetschek/cs205-homework/issues/events{/number}","events_url":"https://api.github.com/repos/apetschek/cs205-homework/events","assignees_url":"https://api.github.com/repos/apetschek/cs205-homework/assignees{/user}","branches_url":"https://api.github.com/repos/apetschek/cs205-homework/branches{/branch}","tags_url":"https://api.github.com/repos/apetschek/cs205-homework/tags","blobs_url":"https://api.github.com/repos/apetschek/cs205-homework/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/apetschek/cs205-homework/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/apetschek/cs205-homework/git/refs{/sha}","trees_url":"https://api.github.com/repos/apetschek/cs205-homework/git/trees{/sha}","statuses_url":"https://api.github.com/repos/apetschek/cs205-homework/statuses/{sha}","languages_url":"https://api.github.com/repos/apetschek/cs205-homework/languages","stargazers_url":"https://api.github.com/repos/apetschek/cs205-homework/stargazers","contributors_url":"https://api.github.com/repos/apetschek/cs205-homework/contributors","subscribers_url":"https://api.github.com/repos/apetschek/cs205-homework/subscribers","subscription_url":"https://api.github.com/repos/apetschek/cs205-homework/subscription","commits_url":"https://api.github.com/repos/apetschek/cs205-homework/commits{/sha}","git_commits_url":"https://api.github.com/repos/apetschek/cs205-homework/git/commits{/sha}","comments_url":"https://api.github.com/repos/apetschek/cs205-homework/comments{/number}","issue_comment_url":"https://api.github.com/repos/apetschek/cs205-homework/issues/comments{/number}","contents_url":"https://api.github.com/repos/apetschek/cs205-homework/contents/{+path}","compare_url":"https://api.github.com/repos/apetschek/cs205-homework/compare/{base}...{head}","merges_url":"https://api.github.com/repos/apetschek/cs205-homework/merges","archive_url":"https://api.github.com/repos/apetschek/cs205-homework/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/apetschek/cs205-homework/downloads","issues_url":"https://api.github.com/repos/apetschek/cs205-homework/issues{/number}","pulls_url":"https://api.github.com/repos/apetschek/cs205-homework/pulls{/number}","milestones_url":"https://api.github.com/repos/apetschek/cs205-homework/milestones{/number}","notifications_url":"https://api.github.com/repos/apetschek/cs205-homework/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/apetschek/cs205-homework/labels{/name}","releases_url":"https://api.github.com/repos/apetschek/cs205-homework/releases{/id}","created_at":"2015-09-03T17:48:40Z","updated_at":"2015-09-03T17:48:41Z","pushed_at":"2015-11-19T22:42:49Z","git_url":"git://github.com/apetschek/cs205-homework.git","ssh_url":"git@github.com:apetschek/cs205-homework.git","clone_url":"https://github.com/apetschek/cs205-homework.git","svn_url":"https://github.com/apetschek/cs205-homework","homepage":null,"size":394,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"harvard-cs205:master","ref":"master","sha":"ed6f0167fd1f6097ce9e454c2950c5db00a0c513","user":{"login":"harvard-cs205","id":13456002,"avatar_url":"https://avatars.githubusercontent.com/u/13456002?v=3","gravatar_id":"","url":"https://api.github.com/users/harvard-cs205","html_url":"https://github.com/harvard-cs205","followers_url":"https://api.github.com/users/harvard-cs205/followers","following_url":"https://api.github.com/users/harvard-cs205/following{/other_user}","gists_url":"https://api.github.com/users/harvard-cs205/gists{/gist_id}","starred_url":"https://api.github.com/users/harvard-cs205/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/harvard-cs205/subscriptions","organizations_url":"https://api.github.com/users/harvard-cs205/orgs","repos_url":"https://api.github.com/users/harvard-cs205/repos","events_url":"https://api.github.com/users/harvard-cs205/events{/privacy}","received_events_url":"https://api.github.com/users/harvard-cs205/received_events","type":"Organization","site_admin":false},"repo":{"id":40614104,"name":"cs205-homework","full_name":"harvard-cs205/cs205-homework","owner":{"login":"harvard-cs205","id":13456002,"avatar_url":"https://avatars.githubusercontent.com/u/13456002?v=3","gravatar_id":"","url":"https://api.github.com/users/harvard-cs205","html_url":"https://github.com/harvard-cs205","followers_url":"https://api.github.com/users/harvard-cs205/followers","following_url":"https://api.github.com/users/harvard-cs205/following{/other_user}","gists_url":"https://api.github.com/users/harvard-cs205/gists{/gist_id}","starred_url":"https://api.github.com/users/harvard-cs205/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/harvard-cs205/subscriptions","organizations_url":"https://api.github.com/users/harvard-cs205/orgs","repos_url":"https://api.github.com/users/harvard-cs205/repos","events_url":"https://api.github.com/users/harvard-cs205/events{/privacy}","received_events_url":"https://api.github.com/users/harvard-cs205/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/harvard-cs205/cs205-homework","description":"","fork":false,"url":"https://api.github.com/repos/harvard-cs205/cs205-homework","forks_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/forks","keys_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/keys{/key_id}","collaborators_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/teams","hooks_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/hooks","issue_events_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/issues/events{/number}","events_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/events","assignees_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/assignees{/user}","branches_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/branches{/branch}","tags_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/tags","blobs_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/git/refs{/sha}","trees_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/git/trees{/sha}","statuses_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/statuses/{sha}","languages_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/languages","stargazers_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/stargazers","contributors_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/contributors","subscribers_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/subscribers","subscription_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/subscription","commits_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/commits{/sha}","git_commits_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/git/commits{/sha}","comments_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/comments{/number}","issue_comment_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/issues/comments{/number}","contents_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/contents/{+path}","compare_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/compare/{base}...{head}","merges_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/merges","archive_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/downloads","issues_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/issues{/number}","pulls_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/pulls{/number}","milestones_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/milestones{/number}","notifications_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/labels{/name}","releases_url":"https://api.github.com/repos/harvard-cs205/cs205-homework/releases{/id}","created_at":"2015-08-12T17:18:15Z","updated_at":"2015-10-21T19:21:28Z","pushed_at":"2015-11-21T12:21:39Z","git_url":"git://github.com/harvard-cs205/cs205-homework.git","ssh_url":"git@github.com:harvard-cs205/cs205-homework.git","clone_url":"https://github.com/harvard-cs205/cs205-homework.git","svn_url":"https://github.com/harvard-cs205/cs205-homework","homepage":null,"size":162893,"stargazers_count":5,"watchers_count":5,"language":"C","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":100,"mirror_url":null,"open_issues_count":421,"forks":100,"open_issues":421,"watchers":5,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/harvard-cs205/cs205-homework/pulls/333"},"html":{"href":"https://github.com/harvard-cs205/cs205-homework/pull/333"},"issue":{"href":"https://api.github.com/repos/harvard-cs205/cs205-homework/issues/333"},"comments":{"href":"https://api.github.com/repos/harvard-cs205/cs205-homework/issues/333/comments"},"review_comments":{"href":"https://api.github.com/repos/harvard-cs205/cs205-homework/pulls/333/comments"},"review_comment":{"href":"https://api.github.com/repos/harvard-cs205/cs205-homework/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/harvard-cs205/cs205-homework/pulls/333/commits"},"statuses":{"href":"https://api.github.com/repos/harvard-cs205/cs205-homework/statuses/b41469a917eb15cf39b2dae11b2381c220278106"}}}}