Added specialization of parallel_for for size_t.

Fixes Issue #19. Also modified array_test.cpp to verify this case.
harrism · Dec 22, 2015 · 3adb866 · 3adb866
1 parent afa959a
commit 3adb866
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/hemi/parallel_for.h b/hemi/parallel_for.h
@@ -39,4 +39,17 @@ namespace hemi
 			for (auto idx : grid_stride_range(first, last)) function(idx);
 		});
 	}
+
+	template <typename F>
+	void parallel_for(size_t first, size_t last, F function) {
+		ExecutionPolicy p;
+		parallel_for(p, first, last, function);
+	}
+
+	template <typename F>
+	void parallel_for(const ExecutionPolicy &p, size_t first, size_t last, F function) {
+		hemi::launch(p, [=] HEMI_LAMBDA () {
+			for (auto idx : grid_stride_range(first, last)) function(idx);
+		});
+	}
 }
diff --git a/test/test_array.cpp b/test/test_array.cpp
@@ -43,10 +43,10 @@ TEST(ArrayTest, CreatesAndFillsArrayOnDevice)
 	ASSERT_SUCCESS(hemi::deviceSynchronize());
 }
 
-template <typename T>
-void squareOnDevice(T* ptr, int n) {
-	hemi::parallel_for(0, n, [=] HEMI_LAMBDA (int i) { 
-		ptr[i] = ptr[i]*ptr[i]; 
+void squareOnDevice(hemi::Array<float> &a) {
+	float *ad = a.ptr();
+	hemi::parallel_for(0, a.size(), [=] HEMI_LAMBDA (int i) { 
+		ad[i] = ad[i]*ad[i]; 
 	});
 }
 
@@ -61,7 +61,7 @@ TEST(ArrayTest, FillsOnHostModifiesOnDevice)
 	float *ptr = data.writeOnlyHostPtr();
 	std::fill(ptr, ptr+n, val);
 
-	squareOnDevice(data.ptr(), n);
+	squareOnDevice(data);
 
 	for(int i = 0; i < n; i++) {
 		ASSERT_EQ(val*val, data.readOnlyPtr(hemi::host)[i]);