Skip to content

Commit bedaeaa

Browse files
ochafikochafik
committed
GitHub for Mac: Throw-away commit.
1 parent ab59249 commit bedaeaa

37 files changed

Lines changed: 65408 additions & 81 deletions

File tree

‎libraries/OpenCL-JNA/Core/velocity.log‎

Lines changed: 194 additions & 0 deletions
Large diffs are not rendered by default.

‎libraries/OpenCL/JavaCL/src/test/java/com/nativelibs4java/opencl/util/DiscreteFourierTransformTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*/
55

66
package com.nativelibs4java.opencl.util;
7+
import org.junit.Ignore;
78
import org.apache.commons.math.complex.Complex;
89
import com.nativelibs4java.opencl.util.fft.*;
910
import com.nativelibs4java.opencl.*;
@@ -121,6 +122,8 @@ public void testFloatValues(String title, Transformer<Float, float[]> tr) {
121122
}
122123
}
123124

125+
126+
@Ignore
124127
@Test
125128
public void testDoubleFFTValues() throws IOException {
126129
testDoubleValues("Double FFT", new DoubleFFTPow2());
@@ -145,6 +148,7 @@ public void testDoubleDFTInverse() throws IOException, CLException {
145148
public void testFloatDFTInverse() throws IOException, CLException {
146149
testFloatTransformer("Float DFT Inverse", new FloatDFT());
147150
}
151+
@Ignore
148152
@Test
149153
public void testDoubleFFTInverse() throws IOException, CLException {
150154
testDoubleTransformer("Double FFT Inverse", new DoubleFFTPow2());

‎libraries/OpenCL/ScalaCL/project/build.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
sbt.version=0.11.0

‎libraries/OpenCL/ScalaCLPlugin/TODO‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Failed tests:
2+
simpleSideEffectAssignment(scalacl.test.SideEffectsTest)
3+
simpleMethodCall(scalacl.test.SideEffectsTest)
4+
simpleReduceRight(scalacl.test.Reduce2WhileTest)
5+
simplePrimitiveArrayFilter(scalacl.test.Filter2WhileTest)
6+
simpleRefArrayFilter(scalacl.test.Filter2WhileTest)
7+
tupleArrayFilter(scalacl.test.Filter2WhileTest)
8+
simpleFoldRight(scalacl.test.Fold2WhileTest)
9+
simpleUntilFilterLoop(scalacl.test.IntRangeForeach2WhileTest)
10+
simpleRangeFilter(scalacl.test.IntRangeForeach2WhileTest)
11+
testNestedLoopWithExtRefs(scalacl.test.IntRangeForeach2WhileTest)
12+
yieldTuplesInMap(scalacl.test.PastBugsTest)
13+
lambdaLiftNestedMap(scalacl.test.PastBugsTest)
14+
15+

‎libraries/OpenCL/ScalaCLPlugin/lib/scalacl-0.3-SNAPSHOT-shaded.jar‎

2.01 MB
Binary file not shown.

‎libraries/OpenCL/ScalaCLPlugin/scalac-bugs.scala‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
class Test {
2+
val out = collection.mutable.ArrayBuffer[Int]()
3+
val item: Int = 0
4+
if (item != 0)
5+
out.+=(item) // triggers a "silent" reference to BoxedUnit.UNIT
6+
}
7+
//:javap -c Test

‎libraries/OpenCL/ScalaCLPlugin/scalacl-compiler-plugin.iws‎

Lines changed: 130 additions & 48 deletions
Large diffs are not rendered by default.

‎libraries/OpenCL/ScalaCLPlugin/src/main/scala/scalacl/plugin/StreamSinks.scala‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ trait StreamSinks extends Streams {
192192

193193
val builderGen = createBuilderGen(value)
194194
import builderGen._
195+
195196

196197
val a = newVariable(unit, "out", currentOwner, pos, false, builderCreation)
197198
loop.preOuter += a.definition

‎libraries/OpenCL/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
<module>OpenCL4Java</module>
2424
<module>Demos</module>
2525
<module>JavaCL</module>
26-
<module>ScalaCL</module>
26+
<!--module>ScalaCL</module>
2727
<module>ScalaCLPlugin</module>
28-
<module>ScalaCLTest</module>
28+
<module>ScalaCLTest</module-->
2929
<module>Core</module>
3030
<module>Blas</module>
3131
<module>Parent</module>

‎libraries/Runtime/BridJ/BuildNative‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,32 @@ org.bridj.objc.ObjCJNI
1111
if [[ "$@" != "clean" && "$@" != "fast" ]] ; then
1212
# Generate native sources from Velocity templates
1313
#mvn generate-sources -o
14-
mvn compile -o
14+
#mvn compile -o
1515

1616
# Generate JNI headers
1717
javah -d src/main/cpp/bridj -classpath target/classes $CLASSES ;
1818
fi
19-
2019

21-
cd src/main/cpp/bridj
2220

23-
if [[ "$DEBUG" == "1" ]] ; then
24-
BUILD_CONFIG=debug ./Make.sh $@ || exit 1 ;
25-
else
26-
if [[ "$@" == "fast" ]] ; then
27-
./Make.sh || exit 1 ;
21+
if [[ -z "$TARGETS" ]] ; then
22+
if [[ -d /Applications ]] ; then
23+
TARGETS="default ios android" ;
2824
else
29-
./Make.sh $@ || exit 1 ;
25+
TARGETS="default" ;
3026
fi ;
3127
fi
3228

29+
cd src/main/cpp/bridj
30+
31+
for TARGET in $TARGETS ; do
32+
if [[ "$DEBUG" == "1" ]] ; then
33+
BUILD_CONFIG=debug ./Make.sh $@ || exit 1 ;
34+
else
35+
if [[ "$@" == "fast" ]] ; then
36+
./Make.sh || exit 1 ;
37+
else
38+
./Make.sh $@ || exit 1 ;
39+
fi ;
40+
fi ;
41+
done
42+

0 commit comments

Comments
 (0)