JavaCL: moved BridJ implementation to trunk (in main OpenCL directory tree)

Author: ochafik

libraries/OpenCL-JNA/.settings/org.eclipse.jdt.core.prefs renamed to .settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.iam.jdt.core.mavenClasspathContainer"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JavaCL"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

libraries/OpenCL-JNA/.settings/org.maven.ide.eclipse.prefs renamed to .settings/org.maven.ide.eclipse.prefs

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Blas</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.iam.jdt.core.mavenIncrementalBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.iam.jdt.core.mavenNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Blas/.classpath

@@ -0,0 +1,5 @@
+#Thu Jan 28 23:48:19 CET 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6

Blas/.project

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="javacl-bridj" />
+    <orderEntry type="module" module-name="javacl-core-bridj" />
+    <orderEntry type="module" module-name="opencl4java-bridj" />
+    <orderEntry type="library" name="Maven: com.nativelibs4java:bridj:c-only:0.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ujmp:ujmp-core:0.2.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.7" level="project" />
+  </component>
+</module>
+

Blas/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,66 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+  <groupId>com.nativelibs4java</groupId>
+  <artifactId>javacl-blas</artifactId>
+  <name>JavaCL BLAS / BridJ</name>
+  <url>http://code.google.com/p/javacl/</url>
+  <version>1.0.0-RC1</version>
+  <packaging>jar</packaging>
+  
+  <parent>
+	  <groupId>com.nativelibs4java</groupId>
+	  <artifactId>opencl4java-parent</artifactId>
+	  <version>1.0.0-RC1</version>
+	  <relativePath>../Parent</relativePath>
+  </parent>
+
+  <dependencies>
+  	
+	<dependency>
+	  <groupId>com.nativelibs4java</groupId>
+	  <artifactId>javacl</artifactId>
+	  <version>${opencl4java.version}</version>
+	  <!--classifier>shaded</classifier-->
+	  <scope>compile</scope>
+	</dependency>
+	
+	<dependency>
+		<groupId>org.ujmp</groupId>
+		<artifactId>ujmp-core</artifactId>
+		<version>0.2.4</version>
+	    <scope>compile</scope>
+	</dependency>
+
+  </dependencies>
+
+  <build>
+  	<plugins>
+	
+		<plugin>
+			<groupId>com.nativelibs4java</groupId>
+			<artifactId>javacl-generator</artifactId>
+			<version>${opencl4java.version}</version>
+			
+			<!--configuration>
+				<javaOutputDirectory>${project.build.directory}/../src/main/java</javaOutputDirectory>
+			</configuration-->
+			<executions>
+			  <execution>
+				<phase>generate-sources</phase>
+				<goals>
+				  <goal>compile</goal>
+				  <!--goal>test-compile</goal-->
+				</goals>
+				
+			  </execution>
+			</executions>
+		</plugin>
+
+	</plugins>
+  </build>
+</project>
+
+
+

libraries/Mono/.settings/org.maven.ide.eclipse.prefs renamed to Blas/.settings/org.maven.ide.eclipse.prefs

@@ -0,0 +1,115 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.nativelibs4java.opencl.blas;
+
+import com.nativelibs4java.opencl.*;
+import com.nativelibs4java.opencl.CLMem.Usage;
+import com.nativelibs4java.opencl.util.Primitive;
+import org.bridj.Pointer;
+
+/**
+ *
+ * @author ochafik
+ */
+public class CLDefaultMatrix2D<T> implements CLMatrix2D<T> {
+    protected final Primitive primitive;
+    protected final Class<T> primitiveClass;
+    protected final long rows, columns, length;
+    
+    protected final CLKernels kernels;
+    protected final CLBuffer<T> buffer;
+    protected final CLQueue queue;
+    protected final CLContext context;
+    protected CLEvents _events = new CLEvents();
+
+    public CLDefaultMatrix2D(Primitive primitive, CLBuffer<T> buffer, long rows, long columns, CLKernels kernels) {
+        this.primitive = primitive;
+        this.primitiveClass = (Class<T>)primitive.primitiveType;
+        this.length = rows * columns;
+        this.buffer = buffer == null ? (CLBuffer)kernels.getContext().createBuffer(Usage.InputOutput, primitive.primitiveType, length) : buffer;
+        this.kernels = kernels;
+        this.rows = rows;
+        this.columns = columns;
+        this.queue = kernels.getQueue();
+        this.context = kernels.getContext();
+    }
+    
+    public CLMatrix2D<T> blankClone() {
+        return blankMatrix(getRowCount(), getColumnCount());
+    }
+    public CLMatrix2D<T> blankMatrix(long rows, long columns) {
+        return new CLDefaultMatrix2D<T>(primitive, null, rows, columns, kernels);
+    }
+
+    public long getRowCount() {
+        return rows;
+    }
+
+    public long getColumnCount() {
+        return columns;
+    }
+
+    public CLEvents getEvents() {
+        return _events;
+    }
+    
+    public void write(final Pointer<T> b) {
+        getEvents().performWrite(new CLEvents.Action() {
+            public CLEvent perform(CLEvent[] events) {
+                return buffer.write(queue, b, false, events);
+            }
+        });
+    }
+
+    public void read(final Pointer<T> b) {
+        getEvents().performRead(new CLEvents.Action() {
+            public CLEvent perform(CLEvent[] events) {
+                return buffer.read(queue, b, true, events);
+            }
+        });
+    }
+    public Pointer<T> read() {
+        Pointer<T> out = Pointer.allocateArray(primitiveClass, length);
+        read(out);
+        return out;
+    }
+    
+    
+    public CLBuffer<T> getBuffer() {
+        return buffer;
+    }
+
+    public CLContext getContext() {
+        return context;
+    }
+
+    public synchronized CLQueue getQueue() {
+        return queue;
+    }
+
+    /*
+    public synchronized void setQueue(CLQueue queue) {
+        if (this.queue != null && queue != null) {
+            if (this.queue.equals(queue))
+                return;
+        }
+        getEvents().waitFor();
+        this.queue = queue;
+    }
+     * */
+
+    public Primitive getPrimitive() {
+        return primitive;
+    }
+
+    public Class<T> getPrimitiveClass() {
+        return primitiveClass;
+    }
+
+    public CLKernels getKernels() {
+        return kernels;
+    }
+    
+}

Blas/javacl-blas-bridj.iml

@@ -0,0 +1,88 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.nativelibs4java.opencl.blas;
+
+import com.nativelibs4java.opencl.CLEvent;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * @author ochafik
+ */
+public class CLEvents {
+    CLEvent lastWriteEvent;
+    List<CLEvent> readEvents = new ArrayList<CLEvent>();
+    
+    List<Listener> listeners = new ArrayList<Listener>();
+    
+    public interface Listener {
+        void writing(CLEvents evts);
+        void reading(CLEvents evts);
+    }
+    public interface Action {
+        CLEvent perform(CLEvent[] events);
+    }
+    
+    public synchronized void addListener(Listener l) {
+        listeners.add(l);
+    }
+    public synchronized void removeListener(Listener l) {
+        listeners.remove(l);
+    }
+    static final CLEvent[] EMPTY_EVENTS = new CLEvent[0];
+    protected synchronized CLEvent clearEvents(Action action) {
+        int nReads = readEvents.size();
+        boolean hasWrite = lastWriteEvent != null;
+        int n = nReads + (hasWrite ? 1 : 0);
+        CLEvent[] evts = n == 0 ? EMPTY_EVENTS : readEvents.toArray(new CLEvent[n]);
+        if (hasWrite)
+            evts[nReads] = lastWriteEvent;
+        CLEvent evt = action.perform(evts);
+        lastWriteEvent = null;
+        readEvents.clear();
+        return evt;
+    }
+    public synchronized CLEvent performRead(Action action) {
+        for (Listener listener : listeners)
+            listener.writing(this);
+        CLEvent evt = action.perform(lastWriteEvent == null ? EMPTY_EVENTS : new CLEvent[] { lastWriteEvent });
+        if (evt != null) {
+            readEvents.add(evt);
+            lastWriteEvent = null; // read completed only if the optional write also completed
+        }
+        return evt;
+    }
+    
+    public synchronized void performRead(Runnable action) {
+        for (Listener listener : listeners)
+            listener.reading(this);
+        waitForRead();
+        action.run();
+    }
+    
+    public synchronized CLEvent performWrite(Action action) {
+        return lastWriteEvent = clearEvents(action);
+    }
+    
+    /**
+     * Wait until all write operations are completed so that the data is readable.
+     */
+    public synchronized void waitForRead() {
+        CLEvent.waitFor(lastWriteEvent);
+        lastWriteEvent = null;
+    }
+    /**
+     * Wait for all associated operations to complete (read or write).
+     */
+    public synchronized void waitFor() {
+        clearEvents(new Action() {
+            public CLEvent perform(CLEvent[] evts) {
+                CLEvent.waitFor(evts);
+                return null;
+            }
+        });
+    }
+}