diff --git a/excludes.xml b/excludes.xml
new file mode 100644
index 00000000..7a867cd9
--- /dev/null
+++ b/excludes.xml
@@ -0,0 +1,16 @@
+
+ assembly
+
+ jar
+
+ false
+
+
+
+ org.scala-lang:scala-reflect
+
+ true
+
+
+
diff --git a/pom-assembly.xml b/pom-assembly.xml
new file mode 100644
index 00000000..e243a550
--- /dev/null
+++ b/pom-assembly.xml
@@ -0,0 +1,141 @@
+
+ 4.0.0
+ BIDMach
+ BIDMachSpark
+ jar
+ 1.1.0-cuda7.5
+ BIDMachSpark
+ BIDMach is an optimized machine learning library in Scala
+
+ 2.11.7
+ 2.11
+ ${scala.binary.version}
+ UTF-8
+
+
+
+ central
+ Maven Repository Switchboard
+ default
+ http://repo1.maven.org/maven2
+
+ false
+
+
+
+ bintray-biddata-BIDData
+ bintray
+ http://dl.bintray.com/biddata/BIDData
+
+ false
+
+
+
+
+
+ org.scala-lang
+ scala-library
+ ${scala.version}
+ provided
+
+
+ BIDMach
+ BIDMach
+ ${project.version}
+
+
+ org.apache.spark
+ spark-core_2.11
+ 2.0.0
+ provided
+
+
+
+
+
+ net.alchim31.maven
+ scala-maven-plugin
+ 3.2.1
+
+
+
+ compile
+ testCompile
+
+
+
+
+
+ -Xmx8g
+
+
+ -feature
+ -deprecation
+ -target:jvm-1.7
+ -dependencyfile
+ ${project.build.directory}/.scala_dependencies
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.5.1
+
+ 1.7
+ 1.7
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 2.19.1
+
+ true
+
+
+
+ maven-assembly-plugin
+ 2.4.1
+
+
+ excludes.xml
+
+
+
+
+ make-assembly
+ package
+
+ single
+
+
+
+
+
+
+
+ lib/
+ src/main/resources/lib/
+
+ **/*.jar
+
+
+
+
+
+
+ bintray-biddata-BIDData
+ biddata-BIDData
+ https://api.bintray.com/maven/biddata/BIDData/BIDMach/;publish=1;override=1
+
+
+
+
+
+
+
+
diff --git a/pom-standalone.xml b/pom-standalone.xml
new file mode 100644
index 00000000..6babfc57
--- /dev/null
+++ b/pom-standalone.xml
@@ -0,0 +1,145 @@
+
+ 4.0.0
+ BIDMach
+ BIDMachSpark
+ jar
+ 1.1.0-cuda7.5
+ BIDMachSpark
+ BIDMach is an optimized machine learning library in Scala
+
+ 2.11.8
+ 2.11
+ ${scala.binary.version}
+ UTF-8
+
+
+
+ central
+ Maven Repository Switchboard
+ default
+ http://repo1.maven.org/maven2
+
+ false
+
+
+
+ bintray-biddata-BIDData
+ bintray
+ http://dl.bintray.com/biddata/BIDData
+
+ false
+
+
+
+
+ org.scala-lang
+ scala-library
+ ${scala.version}
+
+
+ org.scala-lang
+ scala-compiler
+ ${scala.version}
+
+
+
+ BIDMach
+ BIDMach
+ ${project.version}
+
+
+ org.apache.spark
+ spark-core_2.11
+ 2.0.0
+ provided
+
+
+
+
+
+ net.alchim31.maven
+ scala-maven-plugin
+ 3.2.1
+
+
+
+ compile
+ testCompile
+
+
+
+
+
+ -Xmx8g
+
+
+ -feature
+ -deprecation
+ -target:jvm-1.7
+ -dependencyfile
+ ${project.build.directory}/.scala_dependencies
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.5.1
+
+ 1.7
+ 1.7
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 2.19.1
+
+ true
+
+
+
+ maven-assembly-plugin
+ 2.4.1
+
+
+ jar-with-dependencies
+
+
+
+
+ make-assembly
+ package
+
+ single
+
+
+
+
+
+
+
+ lib/
+ src/main/resources/lib/
+
+ **/*.jar
+
+
+
+
+
+
+ bintray-biddata-BIDData
+ biddata-BIDData
+ https://api.bintray.com/maven/biddata/BIDData/BIDMach/;publish=1;override=1
+
+
+
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 764ee80b..e243a550 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,9 @@
BIDMachSpark
BIDMach is an optimized machine learning library in Scala
- 2.11.4
+ 2.11.7
+ 2.11
+ ${scala.binary.version}
UTF-8
@@ -36,14 +38,10 @@
org.scala-lang
scala-library
- ${scalaVersion}
+ ${scala.version}
+ provided
- org.scala-lang
- scala-compiler
- ${scalaVersion}
-
- z
BIDMach
BIDMach
${project.version}
@@ -51,7 +49,8 @@
org.apache.spark
spark-core_2.11
- 1.6.2
+ 2.0.0
+ provided
@@ -102,9 +101,9 @@
maven-assembly-plugin
2.4.1
-
- jar-with-dependencies
-
+
+ excludes.xml
+
diff --git a/spark-shell b/spark-shell
index 25c1069e..5d7b1fb5 100755
--- a/spark-shell
+++ b/spark-shell
@@ -2,10 +2,21 @@
# export JAVA_HOME="" # Set here if not set in environment
# export CUDA_PATH="" # Set here if not set in environment
# export SPARK_HOME="" # Set here if not set in environment
-BIDMACH_HOME=/opt/BIDMach # Set here if not set in environment
+BIDMACH_ROOT="${BASH_SOURCE[0]}"
+if [ ! `uname` = "Darwin" ]; then
+ BIDMACH_ROOT=`readlink -f "${BIDMACH_ROOT}"`
+else
+ while [ -L "${BIDMACH_ROOT}" ]; do
+ BIDMACH_ROOT=`readlink "${BIDMACH_ROOT}"`
+ done
+fi
+BIDMACH_ROOT=`dirname "$BIDMACH_ROOT"`
+pushd "${BIDMACH_ROOT}" > /dev/null
+BIDMACH_ROOT=`pwd`
+BIDMACH_ROOT="$( echo ${BIDMACH_ROOT} | sed s+/cygdrive/c+c:+ )"
-JCUDA_VERSION="0.7.0a" # Fix if needed
+BIDMACH_JARS=`echo target/BIDMachSpark-*-assembly.jar`
-BIDMACH_JARS=$(find ${BIDMACH_HOME}| grep '\.jar' | grep -vE 'IScala.jar|jline.*\.jar' | tr '\n' ',')
+#${SPARK_HOME}/bin/spark-shell --master spark://${HOSTNAME}:7077 --jars ${BIDMACH_JARS} --executor-memory 10G --driver-memory 8G
-${SPARK_HOME}/bin/spark-shell --master spark://${HOSTNAME}:7077 --jars ${BIDMACH_JARS} --executor-memory 10G --driver-memory 8G
\ No newline at end of file
+${SPARK_HOME}/bin/spark-shell --master local --jars ${BIDMACH_JARS}