From 178034a2fc9c579b44b9984c5d11e0c5b266b484 Mon Sep 17 00:00:00 2001
From: Oren <oren_segal@student.uml.edu>
Date: Wed, 2 Sep 2015 14:20:25 -0400
Subject: [PATCH] unified use of get platform list
---
.../src/java/com/amd/aparapi/device/Device.java | 8 ++++----
.../aparapi/internal/opencl/OpenCLPlatform.java | 14 +++++++++-----
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/aparapi/com.amd.aparapi/src/java/com/amd/aparapi/device/Device.java b/src/aparapi/com.amd.aparapi/src/java/com/amd/aparapi/device/Device.java
index f1c2f68e..3799c891 100644
--- a/src/aparapi/com.amd.aparapi/src/java/com/amd/aparapi/device/Device.java
+++ b/src/aparapi/com.amd.aparapi/src/java/com/amd/aparapi/device/Device.java
@@ -39,13 +39,13 @@ public abstract class Device{
public static Device getDevice(String platformName, String deviceTypeName, int deviceId)
{
- List<OpenCLPlatform> platforms = (new OpenCLPlatform()).getOpenCLPlatforms();
+ List<OpenCLPlatform> platforms = (new OpenCLPlatform()).getOpenCLPlatformsFilteredBy(platformName); //getOpenCLPlatforms();
int platformc = 0;
for (OpenCLPlatform platform : platforms)
{
- if(platform.getName().contains(platformName))
- {
+ //if(platform.getName().contains(platformName))
+ //{
System.out.println("Platform " + platformc + "{");
@@ -104,7 +104,7 @@ public abstract class Device{
}
- }
+ //}
// return not found !!!
return null;
}
diff --git a/src/aparapi/com.amd.aparapi/src/java/com/amd/aparapi/internal/opencl/OpenCLPlatform.java b/src/aparapi/com.amd.aparapi/src/java/com/amd/aparapi/internal/opencl/OpenCLPlatform.java
index 178b1a19..99e1b244 100644
--- a/src/aparapi/com.amd.aparapi/src/java/com/amd/aparapi/internal/opencl/OpenCLPlatform.java
+++ b/src/aparapi/com.amd.aparapi/src/java/com/amd/aparapi/internal/opencl/OpenCLPlatform.java
@@ -81,13 +81,17 @@ public class OpenCLPlatform extends OpenCLJNI{
System.out.println("Filtering Platforms using: " + filter );
for (Iterator<OpenCLPlatform> iterator = platformList.iterator(); iterator.hasNext(); )
{
- String platformIName = iterator.next().getName();
- System.out.println("Checking Platform: " + platformIName );
- if (!platformIName.contains(filter))
+ String platformName = iterator.next().getName();
+ if (filter.equals("*") || platformName.contains(filter))
{
- System.out.println("Filtering Out Platform: " + platformIName);
+ System.out.println("Adding Platform: " + platformName );
+ }
+ else
+ {
+ System.out.println("Discarding Platform: " + platformName);
iterator.remove();
- }
+ }
+
}
}
return (platformList);
--
GitLab