diff --git a/samples/info/.gitignore b/samples/info/.gitignore
deleted file mode 100644
index 840e7d3120ee3206168d49bf62df2c269c38e17e..0000000000000000000000000000000000000000
--- a/samples/info/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/classes/
diff --git a/samples/info/.project b/samples/info/.project
deleted file mode 100644
index 464357eefdec559ffedac74e13b39f5019b7f5ce..0000000000000000000000000000000000000000
--- a/samples/info/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>info</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/samples/info/build.xml b/samples/info/build.xml
deleted file mode 100644
index 80f1855e4b7ae6347b7dd7ca671df6c5a14a63c2..0000000000000000000000000000000000000000
--- a/samples/info/build.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="info" default="build" basedir=".">
-
- <!-- Ideally this would be the latest version of Java but not everyone is going to have it installed -->
- <!-- Additionally we want to avoid "Class not found: javac1.8" errors from old Ant versions (i.e. Eclipse) -->
- <property name="build.compiler" value="javac1.7" />
- <property name="ant.build.javac.source" value="1.7" />
- <property name="ant.build.javac.target" value="1.7" />
-
- <path id="compiler.class.path">
- <pathelement path="../../com.syncleus.aparapi/dist/aparapi.jar" />
- </path>
-
- <path id="runtime.class.path" cache="true">
- <path refid="compiler.class.path" />
- <pathelement path="${ant.project.name}.jar" />
- </path>
-
- <target name="build" depends="clean">
- <mkdir dir="classes" />
- <javac srcdir="src" destdir="classes" debug="on" includeantruntime="false">
- <classpath>
- <pathelement path="../../com.syncleus.aparapi/dist/aparapi.jar" />
- </classpath>
- </javac>
- <jar jarfile="${ant.project.name}.jar" basedir="classes" />
- </target>
-
- <target name="clean">
- <delete dir="classes" />
- <delete file="${ant.project.name}.jar" />
- </target>
-
- <target name="run-gpu">
- <java classname="com.syncleus.aparapi.sample.info.Main" fork="true">
- <classpath refid="runtime.class.path" />
- <sysproperty key="java.library.path" path="..\..\com.syncleus.aparapi.jni\dist" />
- <sysproperty key="com.syncleus.aparapi.executionMode" value="GPU" />
- </java>
- </target>
-
- <target name="run-jtp">
- <java classname="com.syncleus.aparapi.sample.info.Main" fork="true">
- <classpath refid="runtime.class.path" />
- <sysproperty key="java.library.path" path="..\..\com.syncleus.aparapi.jni\dist" />
- <sysproperty key="com.syncleus.aparapi.executionMode" value="JTP" />
- </java>
- </target>
-
- <target name="run" depends="run-gpu" />
-
-</project>
diff --git a/samples/info/info.bat b/samples/info/info.bat
deleted file mode 100644
index 32c741a06ae6091c86bb7b1fc2599f2cbfd70f12..0000000000000000000000000000000000000000
--- a/samples/info/info.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-java ^
- -Djava.library.path=../../com.syncleus.aparapi.jni/dist ^
- -classpath ../../com.syncleus.aparapi/dist/aparapi.jar;info.jar ^
- com.syncleus.aparapi.sample.info.Main
-
diff --git a/samples/info/info.sh b/samples/info/info.sh
deleted file mode 100644
index 15eff163a111a56515e081842b1991525f040642..0000000000000000000000000000000000000000
--- a/samples/info/info.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-java \
- -Djava.library.path=../../com.syncleus.aparapi.jni/dist \
- -classpath ../../com.syncleus.aparapi/dist/aparapi.jar:info.jar \
- com.syncleus.aparapi.sample.info.Main
diff --git a/src/main/java/com/syncleus/aparapi/examples/All.java b/src/main/java/com/syncleus/aparapi/examples/All.java
index 31f2af8bf13d8289d588ffa5e4ec7c4e0eb80e79..b8120b87c21a58fcf8f85530fe825a972c871127 100644
--- a/src/main/java/com/syncleus/aparapi/examples/All.java
+++ b/src/main/java/com/syncleus/aparapi/examples/All.java
@@ -25,6 +25,7 @@ public class All {
System.out.println(" 8) Squares");
System.out.println(" 9) Multipass swing worker");
System.out.println(" 10) Progress and cancel demo");
+ System.out.println(" 11) info");
System.out.println();
Scanner in = new Scanner(System.in);
@@ -85,6 +86,9 @@ public class All {
case "10":
com.syncleus.aparapi.examples.progress.ProgressAndCancelDemo.main(args);
break;
+ case "11":
+ com.syncleus.aparapi.examples.info.Main.main(args);
+ break;
default:
System.out.println("Invalid selection.");
}
diff --git a/samples/info/src/com/amd/aparapi/sample/info/Main.java b/src/main/java/com/syncleus/aparapi/examples/info/Main.java
similarity index 90%
rename from samples/info/src/com/amd/aparapi/sample/info/Main.java
rename to src/main/java/com/syncleus/aparapi/examples/info/Main.java
index 4e1fb5ccf6f7369462cb07ced41b18e600e400c9..9d560b34926fa1561c8fb1e1896417b3909ce99f 100644
--- a/samples/info/src/com/amd/aparapi/sample/info/Main.java
+++ b/src/main/java/com/syncleus/aparapi/examples/info/Main.java
@@ -1,3 +1,13 @@
+/**
+ * This product currently only contains code developed by authors
+ * of specific components, as identified by the source code files.
+ *
+ * Since product implements StAX API, it has dependencies to StAX API
+ * classes.
+ *
+ * For additional credits (generally to people who reported problems)
+ * see CREDITS file.
+ */
/*
Copyright (c) 2010-2011, Advanced Micro Devices, Inc.
All rights reserved.
@@ -36,7 +46,7 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit
*/
-package com.syncleus.aparapi.sample.info;
+package com.syncleus.aparapi.examples.info;
import com.syncleus.aparapi.device.*;
import com.syncleus.aparapi.internal.kernel.*;
@@ -46,7 +56,7 @@ import java.util.*;
public class Main{
public static void main(String[] _args) {
- System.out.println("com.syncleus.aparapi.sample.info.Main");
+ System.out.println("com.syncleus.aparapi.examples.info.Main");
List<OpenCLPlatform> platforms = (new OpenCLPlatform()).getOpenCLPlatforms();
System.out.println("Machine contains " + platforms.size() + " OpenCL platforms");
int platformc = 0;