Skip to content

Commit ab27a67

Browse files
[GrCUDA-58] Refactored package hierarchy (#16)
* renamed package gpu to runtime * moved package array inside runtime * moved computation argument inside computation package * moved array computations and stream attach policies to separate package * refactored tests location * fixed merge errors, removed outdated files
1 parent 70436da commit ab27a67

File tree

155 files changed

+613
-6357
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+613
-6357
lines changed

demos/image_pipeline_local/image_pipeline.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ def pipeline_bw(img):
239239
for j, x in enumerate(tmp):
240240
other2[j][:, :, i] = x
241241

242-
fig, axes = plt.subplots(2, 2, figsize=(6, 6))
243-
ax = axes.ravel()
242+
# fig, axes = plt.subplots(2, 2, figsize=(6, 6))
243+
# ax = axes.ravel()
244244

245245
cmap = plt.cm.gray if BW else None
246246
ax[0].imshow(img, cmap=cmap)

projects/com.nvidia.grcuda.test/src/com/nvidia/grcuda/test/BindKernelTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,12 @@
3333
import java.io.IOException;
3434
import java.io.InputStreamReader;
3535
import java.io.PrintWriter;
36-
import java.util.Map;
3736

3837
import static org.junit.Assert.assertEquals;
3938
import static org.junit.Assert.assertNotNull;
4039
import static org.junit.Assert.assertTrue;
40+
41+
import com.nvidia.grcuda.test.util.GrCUDATestUtil;
4142
import org.graalvm.polyglot.Context;
4243
import org.graalvm.polyglot.Value;
4344
import org.junit.BeforeClass;

projects/com.nvidia.grcuda.test/src/com/nvidia/grcuda/test/BindTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636

3737
import static org.junit.Assert.assertNotNull;
3838
import static org.junit.Assert.assertEquals;
39+
40+
import com.nvidia.grcuda.test.util.GrCUDATestUtil;
3941
import org.graalvm.polyglot.Context;
4042
import org.graalvm.polyglot.Value;
4143
import org.junit.BeforeClass;

projects/com.nvidia.grcuda.test/src/com/nvidia/grcuda/test/BuildKernelTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
*/
2828
package com.nvidia.grcuda.test;
2929

30+
import com.nvidia.grcuda.test.util.GrCUDATestUtil;
3031
import org.graalvm.polyglot.Context;
3132
import org.graalvm.polyglot.Value;
3233
import org.junit.Test;

projects/com.nvidia.grcuda.test/src/com/nvidia/grcuda/test/CUDAEventTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.nvidia.grcuda.test;
22

3+
import com.nvidia.grcuda.test.util.GrCUDATestUtil;
34
import org.graalvm.polyglot.Context;
45
import org.graalvm.polyglot.Value;
56
import org.junit.Test;

projects/com.nvidia.grcuda.test/src/com/nvidia/grcuda/test/DeviceTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
import static org.junit.Assert.assertEquals;
3131
import static org.junit.Assert.assertFalse;
3232
import static org.junit.Assert.assertTrue;
33+
34+
import com.nvidia.grcuda.test.util.GrCUDATestUtil;
3335
import org.graalvm.polyglot.Context;
3436
import org.graalvm.polyglot.Value;
3537
import org.junit.Test;

projects/com.nvidia.grcuda.test/src/com/nvidia/grcuda/test/CUBLASTest.java renamed to projects/com.nvidia.grcuda.test/src/com/nvidia/grcuda/test/cudalibraries/CUBLASTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,16 @@
2525
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2626
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2727
*/
28-
package com.nvidia.grcuda.test;
28+
package com.nvidia.grcuda.test.cudalibraries;
2929

3030
import static org.junit.Assert.assertEquals;
3131

3232
import java.util.Arrays;
3333
import java.util.Collection;
3434
import java.util.function.Function;
3535

36-
import com.nvidia.grcuda.gpu.executioncontext.ExecutionPolicyEnum;
36+
import com.nvidia.grcuda.runtime.executioncontext.ExecutionPolicyEnum;
37+
import com.nvidia.grcuda.test.util.GrCUDATestUtil;
3738
import org.junit.Test;
3839
import org.junit.runner.RunWith;
3940
import org.junit.runners.Parameterized;

projects/com.nvidia.grcuda.test/src/com/nvidia/grcuda/test/CUBLASWithScheduleTest.java renamed to projects/com.nvidia.grcuda.test/src/com/nvidia/grcuda/test/cudalibraries/CUBLASWithScheduleTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@
2525
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2626
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2727
*/
28-
package com.nvidia.grcuda.test;
28+
package com.nvidia.grcuda.test.cudalibraries;
2929

3030
import static org.junit.Assert.assertEquals;
3131

3232
import java.util.Collection;
3333
import java.util.function.Function;
3434

35+
import com.nvidia.grcuda.test.util.GrCUDATestOptionsStruct;
36+
import com.nvidia.grcuda.test.util.GrCUDATestUtil;
3537
import org.junit.Test;
3638
import org.junit.runner.RunWith;
3739
import org.junit.runners.Parameterized;

projects/com.nvidia.grcuda.test/src/com/nvidia/grcuda/test/CUMLTest.java renamed to projects/com.nvidia.grcuda.test/src/com/nvidia/grcuda/test/cudalibraries/CUMLTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.nvidia.grcuda.test;
1+
package com.nvidia.grcuda.test.cudalibraries;
22

3-
import com.nvidia.grcuda.GrCUDALanguage;
4-
import com.nvidia.grcuda.gpu.executioncontext.ExecutionPolicyEnum;
3+
import com.nvidia.grcuda.runtime.executioncontext.ExecutionPolicyEnum;
4+
import com.nvidia.grcuda.test.util.GrCUDATestUtil;
55
import org.graalvm.polyglot.Context;
66
import org.graalvm.polyglot.Value;
77
import org.junit.Test;
@@ -11,7 +11,6 @@
1111
import java.util.Arrays;
1212
import java.util.Collection;
1313

14-
import static com.nvidia.grcuda.test.GrCUDATestUtil.buildTestContext;
1514
import static org.junit.Assert.assertEquals;
1615
import static org.junit.Assume.assumeNoException;
1716

@@ -40,8 +39,8 @@ public CUMLTest(String policy, boolean inputPrefetch, char typeChar) {
4039

4140
@Test
4241
public void testDbscan() {
43-
try (Context polyglot = GrCUDATestUtil.buildTestContext()
44-
.option("grcuda.ExecutionPolicy", this.policy).option("grcuda.InputPrefetch", String.valueOf(this.inputPrefetch)).allowAllAccess(true).build()) {
42+
try (Context polyglot = GrCUDATestUtil.buildTestContext().option("grcuda.ExecutionPolicy", this.policy).option("grcuda.InputPrefetch", String.valueOf(this.inputPrefetch)).allowAllAccess(
43+
true).build()) {
4544
Value cu = polyglot.eval("grcuda", "CU");
4645
int numRows = 100;
4746
int numCols = 2;

0 commit comments

Comments
 (0)